Initial work

Iterator is still being used