Removed stray echo during testing
Merge branch 'master' into website
Round 1 scaffolding done + some cleanup along the way
Merge branch 'master' into website