Second commit, finishing demo app in tutorial