Add guards around the hotkeys
Get into edit mode
Get edit mode changes working