More initial scaffolding.
Merge branch 'master' into develop