IN_PROGRESS - bug 2: Create the domain model