Bit of cleanup plus add "keypress" socket - to be used for navigation and basically everything in the app