Refactoring.
Merge branch 'feature/Domain_hacking' of github.com:TimMurphy/TimeTracker into feature/Domain_hacking