HW6, part 2
HW6, part 4
Merge branch 'staging'