Added keyevent handling
It works Bitches