Finishing the demo app