The Editor Patch

All the crazy stuff for the editor.