Create domain logic
Add unit tests
Merge branch 'domain' into develop
Front end, fix domain issues, tests
Merge branch 'presentation' into develop
Leftover??
Merge branch 'develop'