Second attempt at demo_app