A somewhat transitioning state but the tests pass.

Moving on to look at Enumerators