Shortcuts

Implement shortcuts mentioned in #55 
I think we can work this one out without the comment.