Getting closer to a working iterator scheme