Finish demo_app for real