Support for ShortcutBadger

// FREEBIE

Closes #1574
Closes #1952

Fixes #1526
Fixes #321