Begun working on the core data model