Finish up demo app