Finish chap01 first pass