wip
added some marker logic
fixed merge
Merge branch 'master' of github.com:jrcryer/story-newshack