Added KeyListener, but still has to be done