Finish demo app in ch02