Finish demo app
Finish demo 2