Re-arrangement of Chapters 3-8, merges, updates - first installment only.