Finish demo app, chapter 2 in tutorial