Finish demo app
Really Finish the work