Exit and commit from edit mode - still buggy
Break the keymap and edit features into different files