finished the changes to HashMapController for the new iterator. no tests have been modified yet