Finish demo app - a scaffoldding mostly