Editor WIP
Editor WIP For real
Dat merge