I have just committed an extensive set of changes to chapters 5 + 6. We are definitely stepping on each others toes. My feet will be out of the way til tomorrow evening Pacific time. It's still pretty ugly, but a new form is beginning to emerge.