Completed Section 11.3 closes #35