Lots of refactoring, moving more stuff over from doctrine, more tests.