moves controller logic to controllers, makes some new controllers