Refactor
Refactor and rename
Add iteration creation, no tests