New Editor (probably still things to fix... i'm not that good)