third commit, moving along with TDD & mocks