First rounds of changes to model and database migration files to incorporate associations and table fields