Homework 6, parts 2 and 3.
Merge branch 'develop' into staging