Work in progress commit - Data model progress made