Continue on the controller
Continue on the rewriting of the console