This is a combination of 3 commits.
The first commit message is:

compiles, unit tests pass, needs some qa work

This is the 2nd commit message:

finally compiling, passing tests and working almost the way it should

This is the 3rd commit message:

fixed unit test error in the last commit; output actually looks sane, but needs
more testing
fixing bad rebase