Beginnings of the new editor handling code