Work in progress defining the core data model