Some more work, its late
Merge
Merge branch 'master' of https://github.com/granttimmerman/Narrative