Completed Section 10.4 closes #31