A Huge refactor in controller core