diff --git a/dot_config/doom/config.el.tmpl b/dot_config/doom/config.el.tmpl
index 67e41e3226af9cceb83bf48c7558dbbdbd45ce54..255405c2b9038425d90cdabcdc58609f7c9ba4a6 100644
--- a/dot_config/doom/config.el.tmpl
+++ b/dot_config/doom/config.el.tmpl
@@ -170,3 +170,20 @@
 (add-hook 'evil-local-mode-hook 'turn-on-undo-tree-mode)
 
 (after! mu4e (load "~/.config/doom/extra/mu4e.el"))
+
+(use-package edit-server
+  :ensure t
+  :commands edit-server-start
+  :init (if after-init-time
+              (edit-server-start)
+            (add-hook 'after-init-hook
+                      #'(lambda() (edit-server-start))))
+  :config (setq edit-server-new-frame-alist
+                '((name . "Edit with Emacs FRAME")
+                  (top . 200)
+                  (left . 200)
+                  (width . 80)
+                  (height . 25)
+                  (minibuffer . t)
+                  (menu-bar-lines . t)
+                  (window-system . x))))
diff --git a/dot_config/doom/packages.el b/dot_config/doom/packages.el
index e63abfe88595a820fc5c79f0bf93cfc9d4c987dd..bcca7eb187a7df5160f7c96f089ac1f44318764f 100644
--- a/dot_config/doom/packages.el
+++ b/dot_config/doom/packages.el
@@ -7,7 +7,7 @@
 
 
 ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
-;(package! some-package)
+;;(package! some-package)
 
 (package! org-bullets)
 (package! smooth-scrolling)
@@ -23,12 +23,13 @@
 (package! writeroom-mode)
 (package! tidal)
 (package! just-mode)
+(package! edit-server)
 
 ;; To install a package directly from a remote git repo, you must specify a
 ;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
 ;; https://github.com/raxod502/straight.el#the-recipe-format
-;(package! another-package
-;  :recipe (:host github :repo "username/repo"))
+;;(package! another-package
+;;  :recipe (:host github :repo "username/repo"))
 
 (package! chordpro-mode
   :recipe (:host github :repo "sciurius/chordpro-mode"))
@@ -55,33 +56,33 @@
 ;; If the package you are trying to install does not contain a PACKAGENAME.el
 ;; file, or is located in a subdirectory of the repo, you'll need to specify
 ;; `:files' in the `:recipe':
-;(package! this-package
-;  :recipe (:host github :repo "username/repo"
-;           :files ("some-file.el" "src/lisp/*.el")))
+;;(package! this-package
+;;  :recipe (:host github :repo "username/repo"
+;;           :files ("some-file.el" "src/lisp/*.el")))
 
 ;; If you'd like to disable a package included with Doom, you can do so here
 ;; with the `:disable' property:
-;(package! builtin-package :disable t)
+;;(package! builtin-package :disable t)
 
 ;; You can override the recipe of a built in package without having to specify
 ;; all the properties for `:recipe'. These will inherit the rest of its recipe
 ;; from Doom or MELPA/ELPA/Emacsmirror:
-;(package! builtin-package :recipe (:nonrecursive t))
-;(package! builtin-package-2 :recipe (:repo "myfork/package"))
+;;(package! builtin-package :recipe (:nonrecursive t))
+;;(package! builtin-package-2 :recipe (:repo "myfork/package"))
 
 ;; Specify a `:branch' to install a package from a particular branch or tag.
 ;; This is required for some packages whose default branch isn't 'master' (which
 ;; our package manager can't deal with; see raxod502/straight.el#279)
-;(package! builtin-package :recipe (:branch "develop"))
+;;(package! builtin-package :recipe (:branch "develop"))
 
 ;; Use `:pin' to specify a particular commit to install.
-;(package! builtin-package :pin "1a2b3c4d5e")
+;;(package! builtin-package :pin "1a2b3c4d5e")
 
 
 ;; Doom's packages are pinned to a specific commit and updated from release to
 ;; release. The `unpin!' macro allows you to unpin single packages...
-;(unpin! pinned-package)
+;;(unpin! pinned-package)
 ;; ...or multiple packages
-;(unpin! pinned-package another-pinned-package)
+;;(unpin! pinned-package another-pinned-package)
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
-;(unpin! t)
+;;(unpin! t)