Wave two of iteration

TODO