work in progress on redo of data model