diff --git a/config.org b/config.org
index b467357..48a157f 100644
--- a/config.org
+++ b/config.org
@@ -1448,3 +1448,9 @@ TRAMP edit files over SSH configuration
     (when (eq window-system 'w32)
       (setq tramp-default-method "plink")))
 #+END_SRC
+
+** Emacs Server
+Start emacs server, this can then be used to open buffers/set the current emacs session as the EDITOR.
+#+BEGIN_SRC emacs-lisp
+  (server-start)
+#+END_SRC
diff --git a/eshell/alias b/eshell/alias
index aae20c2..9691d56 100644
--- a/eshell/alias
+++ b/eshell/alias
@@ -1,2 +1,3 @@
+alias edit emacsclient -n $1
+alias cd z $1
 alias ssh cd /ssh:$1:
-alias cd z $1
\ No newline at end of file