Finishing up the demo app