Start of the editor rework