Finish Demo App
Really finished demo app