More progress on the iterator