[WIP] Refactor controllers

#### EVENTS ####