Update 1
Finish demo app