(Re)implemented more of editor