Shortcuts

Implement shortcuts mentioned in #55 
No, it should just have its own pull request - it is just tech. debt to make our reviews easier.