Complete assignment 1, part 2