Some more work on the iteratee side. Needs merging.