Added model associations, migrated two new tables, and edited the controller