domain model in progress
First rev of the domain model complete