Section 2.4 has been written
Sections 2.5 and 2.6 have been written
Merge branch 'master' into planOA