Sorting out command/escape remap
Updating keyremap

need to have a better way of doing lots of this