[REVIEW] Lots of codin', but not enough tests

TODO: Go back and write the tests for this stuff!