[WIP] Refactor controllers

dot