adding new models
switched everything over to the new datamodel. a bunch of attributes are going to be broken when this gets merged back in, but c'est la vie