Finish demo app V 1.0