[WIP] Refactor controllers