Broken, but starting to remove the iterators class.