Added support ready for keyboard input (testing code has been left in the keyboard class)