continue work. sqush this commit
more work on the editor