sorting out some more data model stuff