Implemented basic domain model and data layer.
Resolved conflicts