Begin work on unit tests
Rethink work