whoops, refactor

spoke too soon thinking I was all smart
Merge branch 'gh-pages'
Pull section 3 refactor updates