Almost done
Finished the class using TDD