Finish demo app (end of chapter 2)