Wave two of iteration

TODO
smell: vendor prefix