More preliminary editor work.