Homework 3 - updated to (and including) exercise 3