Finish removing base from everything.
Start adding a test suite.
MOAR TESTS!