diff --git a/.gitignore b/.gitignore
index 50731db..e8dfa05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@
 /recentf
 /.cache/
 /rime/
+/emms/
+/games/
+/tramp
diff --git a/.gitmodules b/.gitmodules
index addd10b..ab5acf0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -178,3 +178,6 @@
 [submodule "site-lisp/emacs-websocket"]
 	path = site-lisp/emacs-websocket
 	url = https://github.com/ahyatt/emacs-websocket.git
+[submodule "site-lisp/emms"]
+	path = site-lisp/emms
+	url = https://git.savannah.gnu.org/git/emms.git
diff --git a/init.el b/init.el
index 30a4d60..ceb1ec6 100644
--- a/init.el
+++ b/init.el
@@ -131,6 +131,7 @@ If freezing sometimes, decrease it. If stuttering, increase it.")
 (require 'init-mail)
 (require 'init-ace-window)
 (require 'init-markdown)
+(require 'init-media)
 
 
 (setq custom-file (expand-file-name "custom.el" creature/cache-dir))
diff --git a/lisp/init-media.el b/lisp/init-media.el
new file mode 100644
index 0000000..921aeda
--- /dev/null
+++ b/lisp/init-media.el
@@ -0,0 +1,18 @@
+;; -*- coding: utf-8; lexical-binding: t; -*-
+
+(autoload 'emms-all "emms-setup" "" t)
+(autoload 'emms-default-players "" t)
+
+(with-eval-after-load 'emms-lyrics
+  (setq emms-lyrics-dir "/home/zedhugh/.lyrics"))
+
+(with-eval-after-load 'emms-source-file
+  (setq emms-source-file-default-directory "/home/zedhugh/music"))
+
+(defun creature/emms-setup ()
+  (interactive)
+  (emms-all)
+  (emms-default-players))
+
+
+(provide 'init-media)
diff --git a/site-lisp/emms b/site-lisp/emms
new file mode 160000
index 0000000..271427f
--- /dev/null
+++ b/site-lisp/emms
@@ -0,0 +1 @@
+Subproject commit 271427fcb2f4af1495e3527ecde020a5b34e0391