Added hotkeys and skip handling

Didn't test it yet, will do before class.  Did not add the control one
as I'm not sure I follow the intention of that one?