Adding emacs to the mix