Implemented indexes (slight differences to before), and copied across the tests
4 space good, 2 space bad
Extension Methods back in...