Started to abstract out input, starting with the keymaps