Presentation layer's just about done.
Merge branch 'master' into gh-pages