basic iterator works
Merge branch 'iterator'