Start of work to give HashIter its own file