Some more progress. Hopefully only have to make some minor changes, test
some more, and write up my test cases.