Finished Chapter 5.

Finished Chapter 5 as assigned. Not sure if I should merge pull requests automatically when possible or not.