Merge editor work started at school

Pull in the work started at school on ACM's Mac mini back into master.