Commit 33

Shortcuts implemented