Further work on implementing the full keymap
Included a link tot he keymap as a comment