start on data model refactor