(wip) Wave two of iteration

TODO
These are gone now anyway, so no more smell