Work on the data model in progress...