WIP: Trying to separate controllers and all requires