Moved to using the keyboardhandler library