Finish demo app take 2