Almost completing the Domain Model - First Cut