More editor work.