tentative more generic data model layout
refacture re-create data migration