Doing the thing with the things

Added cancel to make story.
Merge remote-tracking branch 'origin/master' into design