included lot of new code
KeyMap integration