Start of the demo work
Merge branch 'master' of https://github.com/mweschler/SPEng