move parsing into keymap