Working on the domain model, unit tests.