[WIP] Creating better controller for modals