Section 3.4 Heavily rearranged

Still needs work....