Done with the demo app for real