Initial work on resolving code with intermediate coordinates.
Fixed merge conflict in edge interface.