Switched to keyboard input and allowed going back 1
Merge branch 'keyboard' into develop