Completed section 5.2 closes #7