Finish demo app
Finish demo app, this time with new files added