finishing demo app iteration 1