Finished the demo app.. again