Commenting out stuff that is not yet implemented, and doing keybindings a bit more logically