Finished implementing the domain model