diff --git a/.gitmodules b/.gitmodules
index 15dcca3..22dca8f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "lib/gitignore"]
 	path = lib/gitignore
 	url = https://github.com/github/gitignore
+[submodule "lib/zunit"]
+	path = lib/zunit
+	url = https://github.com/zunit-zsh/zunit
diff --git a/config/zsh/zshrc b/config/zsh/zshrc
index ba94149..221db95 100644
--- a/config/zsh/zshrc
+++ b/config/zsh/zshrc
@@ -5,7 +5,7 @@ export DOTF_CONF="${DOTFILES}/config"    # Config Folder
 export ZSHRCD="${DOTF_CONF}/zsh/zshrc.d" # ZSHRC.D Folder
 
 # Export Path
-export PATH="${HOME}/dotfiles/bin:/opt/android-sdk/build-tools/26.0.0/:${HOME}/.fzf/bin:${PATH}"
+export PATH="${HOME}/dotfiles/bin:/opt/android-sdk/build-tools/26.0.0/:/home/eeleater/.gem/ruby/2.4.0/bin:${HOME}/.fzf/bin:${PATH}"
 
 # Export Editor
 export EDITOR='nano'
diff --git a/install b/install
index 7ff323e..84a8f05 100755
--- a/install
+++ b/install
@@ -2,7 +2,15 @@
 set -e
 BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-cd "${BASEDIR}"
-git submodule update --init --recursive "${DOTBOT_DIR}"
+cd ${BASEDIR}
+git submodule update --init --recursive
 
-"${BASEDIR}/lib/dotbot/bin/dotbot" -d "${BASEDIR}" -c config/dotbot/dotbot.yaml "${@}"
+
+echo "Installing Dotbot and Linking Files"
+${BASEDIR}/lib/dotbot/bin/dotbot -d ${BASEDIR} -c config/dotbot/dotbot.yaml ${@}
+
+echo "Installing ZUnit"
+cd ${BASEDIR}/lib/zunit
+./build.zsh
+cp -f zunit ${BASEDIR}/bin
+cp -f zunit.zsh-completion ${BASEDIR}/lib/local/_zunit
diff --git a/lib/zunit b/lib/zunit
new file mode 160000
index 0000000..99ef8bc
--- /dev/null
+++ b/lib/zunit
@@ -0,0 +1 @@
+Subproject commit 99ef8bc07afed803b461443e0ca7663634c2bb55