Initial commit before testing
A couple of changes to get demo running