Set 1 is complete and tests pass