Added keyboard event handler

We need to fix collision