Completed user story 1, tested with unit and functional tests
Completed basic version of user story 2 (with plenty of room for refactoring)