Part 4 and fixes to the first part of the assignment.