Finish my demo app