Unit testing

One class down
Cleanup

Code cleanup for presentation. Removing YAGNI, looking around for
anything I've forgotten.