DemoApp cleaned up and working great