I'm going to close this issue later because I want to add a couple of changes to the code base.