New iterator code compiles...haven't run it yet