now with ability to edit the world!
fixed merge conflicts I think