Messing around with story
Merge branch 'master' of github.com:despondentdonkey/bpm