Massive changes, emacs live absorbed