Make ApartmentController its own thing