fixup! Added events for editor (INCOMPLETE YET)
fixup! fixup! Added events for editor (INCOMPLETE YET)