A bit of restructuring and working on the console controller