added data model stuff