Finish demo app (add some scaffolding)