Started working on the project
TDD, is this even legal?
Merge conflicts sorted