Work in progress commit - more data model progress made