Also move keyboard input to controller