Iterator Progress

Unit tests working..