Finished reworking controllers/models.