Closes #127, closes #128, closes #129, closes #130; Chapter 6 completed.