diff --git a/README.md b/README.md
index 7f3c28e..93f5ef4 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,21 @@ The directory structure is as follows:
 3. *installation_instructions* - This file contains a series of command you copy and paste during install of Arch
 4. *nix/* - This contains all the stuff needed to get up and running with my nix configuration
 
+## Vim
+
+Right now I use Neovim.
+
+To install plugins on first run, put the `.config/nvim` folder in your `.config` directory and run `nvim`. Then
+run `PlugInstall`.
+
+Make sure you run `./install.py --all` in the YouCompleteMe Directory. Additionally you will want to run:
+
+```
+pip install pynvim
+```
+
+In order to bring Python integration to Vim for certain plugins.
+
 ## Patched Fonts
 
 There are a series of patched inconsolata fonts designed for work with the plugins I have for
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index a3e0b00..574a380 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -1,34 +1,38 @@
+source ~/.bash_profile
+
 #Portable across both mac and linux now
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
-
-# Test for clang and make it CC if found
-if hash clang 2>/dev/null; then
-   export CC=/usr/bin/clang
-fi
-
-# Test for clang++ and add it to CXX if found
-if hash clang++ 2>/dev/null; then
-   export CXX=/usr/bin/clang++
-fi
-
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
   # Linux
-  export VISUAL="emacs"
-  alias emacs="$VISUAL"
+  export VISUAL="nvim"
+  alias vim="$VISUAL"
 elif [[ "$OSTYPE" == "darwin"* ]]; then
   # Mac OSX
   export VISUAL="/usr/local/bin/nvim"
   alias vim="$VISUAL"
+
+  # Give access to mono (if installed via the .pkg) early on
+  export PATH=/Library/Frameworks/Mono.framework/Versions/Current/bin/:${PATH}
 fi
 export EDITOR="$VISUAL"
 export ITERM_24BIT=1
-export TERM=screen-256color
-export GOPATH=$HOME/go/
-export PATH=$PATH:"$GOPATH/bin"
+export TERM=xterm-256color
+export GOPATH=$HOME/go
+export GOBIN=$GOPATH/bin
+export PATH=$PATH:$GOBIN
+
+# TODO: PUT THIS IN AN IF PYENV EXISTS CHECK
+eval "$(pyenv init -)"
+
+
+# Emacs needs to be setup different on Linux and Mac
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    alias emacs='/Applications/Emacs.app/Contents/MacOS/Emacs -nw'
+else
+    alias emacs='emacs -nw'
+fi
 
-alias emacs='emacs -nw'
-alias vim='nvim'
 alias irssi='TERM=screen-256color irssi'
 alias scheme='rlwrap mit-scheme'
 alias startpg='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'
@@ -37,7 +41,6 @@ alias stoppg='pg_ctl -D /usr/local/var/postgres stop'
 # This is for the mac GUI version of emacs.
 alias emacs-gui='open -a /Applications/Emacs.app $1'
 
-
 # Git specific aliases
 alias gp='git push'
 alias gs='git status'
@@ -56,7 +59,7 @@ gblame() {
 }
 
 parse_git_branch() {
-    gitbranch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
+    git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
 }
 
 HISTFILE=~/.histfile
@@ -74,43 +77,24 @@ promptinit
 plugins=(git brew npm coffee)
 
 # User configuration
-
-
 if [[ "$OSTYPE" == "darwin"* ]]; then
-  export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin":$PATH
-  export PATH="$PATH:$HOME/.rvm/bin:/usr/lib/rstudio/bin" # Add RVM to PATH for scripting
-  . ~/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
+  export MYSQL_PATH=/usr/local/Cellar/mysql/5.6.27
+  export PATH=$PATH:$MYSQL_PATH/bin
+
+  # Brew
+  export PATH=$PATH:/usr/local/bin
 
   # Haskell stuff
   export PATH=~/.cabal/bin:$PATH
   export PATH=.cabal-sandbox/bin:$PATH
 
-  # Git Town
-  export PATH=~/git-town/src:$PATH
-  MANPATH=$MANPATH:~/git-town/man
-
-  # NOTE: 'Whence' is the ZSH idiom for bash's 'type'
-  export PRENPMPATH=$PATH
-  if [ -n "$(whence -f npm)" ];
-  then
-    NPMPATH="$(npm bin)"
+  # Groovy
+  export GROOVY_HOME=/usr/local/opt/groovy/libexec
 
-    if [ -d "$NPMPATH" ]; then
-      PATH=$NPMPATH:$PRENPMPATH
-    else
-      PATH=$PRENPMPATH
-    fi
+  # Gradle
+  export GRADLE_HOME=/usr/local/opt/gradle/4.5/libexec
+  export PATH=$PATH:/usr/local/opt/gradle/4.5/libexec
 
-    export PATH=$PATH
-  fi
-fi
-
-# Android stuff - I develop android on Linux so these are specific to how I have it laid out in Linux
-if [[ "$OSTYPE" == "linux-gnu" ]]; then
-  export PATH=/opt/android-studio:$PATH
-  export ANDROID_HOME=$HOME/Android/Sdk
-  export PATH=$PATH:$ANDROID_HOME/tools
-  export PATH=$PATH:$ANDROID_HOME/platform-tools
 fi
 
 precmd(){
@@ -131,12 +115,5 @@ if hash opam 2>/dev/null; then
   eval `opam config env`
 fi
 
-# Source RVM if it exists
-if [ -f /home/$USER/.rvm/scripts/rvm ]; then
-  source /home/$USER/.rvm/scripts/rvm
-fi
-
-
-#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
-export SDKMAN_DIR="/home/taylor/.sdkman"
-[[ -s "/home/taylor/.sdkman/bin/sdkman-init.sh" ]] && source "/home/taylor/.sdkman/bin/sdkman-init.sh"
+export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
+export PATH="/usr/local/opt/cython/bin:$PATH"
diff --git a/scripts/solutions/ycm.sh b/scripts/solutions/ycm.sh
new file mode 100644
index 0000000..1f9ba7f
--- /dev/null
+++ b/scripts/solutions/ycm.sh
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+# NOTE: Requires clang to be installed for C support, Mono for C#, Go for Go Support, etc.
+
+pushd ~/.config/nvim/plugged/YouCompleteMe
+
+./install.py --all