2rd commit
Finish demo_app