Got shortcuts working!!