Cleaned-up controllers, updated places for upcoming model changes