Finish demo app (and Ch. 2)