Completed Assignment 2, part 6/7