All tests passing. Moar tests next