Add in some basic models (imported from the old OTM)
Update migrations
Update tests to work with new models