Change editing process (in progress)

* Begin using the external iteration