filling in some more gaps, wishing i'd been more TDD about everything