Completion of the demo app