Finishing up Demo App