code review -6/19

Looking pretty good. Still a little lacking in test coverage, esp on model unit tests.