Prepared a scaffold for the new datamodel from the old one. Have to update the new model to work independently now.