Began decoupling keyboard-input from ui