Large update to the demoapp