Set 1, Challenge 3 now complete, with test.