Editing chapters 1-7