Overhaul MVC handling (WIP)