need to fix our data model