Finish demo app (Charapter 2)