Moved edit code back into coordinator, gave up on warning if it failed