WIP up to iterators - loose ends!!