[WIP] Refactor controllers

eeeeeee ;P