Keyboard input working.
merge