Changed some stuff to editor, still WIP