Further attempts to improve iterating

Turns out it's pretty slow, which is pretty annoying