Add tests for things, add a few more fields