Final demo_app commit