Completed all tests to cover current functionality, on to TDD with RSpec now