diff --git a/redirect b/redirect
index fec1164..824f64e 100755
--- a/redirect
+++ b/redirect
@@ -26,11 +26,11 @@ fi
 LOCAL_VIM_SETUP="$HOME/.my_vim_env"
 if [ ! -f "$LOCAL_VIM_SETUP" ]; then
 	touch "$LOCAL_VIM_SETUP";
-	echo 'let $RC_DIR="$HOME/.wryn"' >> $LOCAL_VIM_SETUP
-	echo 'let $VIM_DIR="$RC_DIR/vim"' >> $LOCAL_VIM_SETUP
-	echo 'let $WRYNVIMRC="$VIM_DIR/rc.vim"' >> $LOCAL_VIM_SETUP
-	echo 'let $WRYNBASH="$RC_DIR/bashrc"' >> $LOCAL_VIM_SETUP
-	echo 'let $MYBASHRC="$HOME/.bashrc"' >> $LOCAL_VIM_SETUP
+	echo 'let $RC_DIR=expand("$HOME/.wryn")' >> $LOCAL_VIM_SETUP
+	echo 'let $VIM_DIR=expand("$RC_DIR/vim")' >> $LOCAL_VIM_SETUP
+	echo 'let $WRYNVIMRC=expand("$VIM_DIR/rc.vim")' >> $LOCAL_VIM_SETUP
+	echo 'let $WRYNBASH=expand("$RC_DIR/bashrc")' >> $LOCAL_VIM_SETUP
+	echo 'let $MYBASHRC=expand("$HOME/.bashrc")' >> $LOCAL_VIM_SETUP
 else
 	echo 'vim environment variables already set up'
 fi
diff --git a/vim/en.utf-8.add b/vim/en.utf-8.add
index 46cb936..f5135d4 100644
--- a/vim/en.utf-8.add
+++ b/vim/en.utf-8.add
@@ -13,3 +13,4 @@ Euthyphro
 Crito
 Rawls
 Schur
+Wryn
diff --git a/vim/en.utf-8.add.spl b/vim/en.utf-8.add.spl
index 501eb3a..b9f77fc 100644
Binary files a/vim/en.utf-8.add.spl and b/vim/en.utf-8.add.spl differ
diff --git a/vim/rc.vim b/vim/rc.vim
index bf56be7..a645606 100644
--- a/vim/rc.vim
+++ b/vim/rc.vim
@@ -1,10 +1,9 @@
 " -- Environment Variables --------------------------------------- {{{
 source $HOME/.my_vim_env
-"let $RC_DIR="/home/w0ryn/.wryn"
-"let $VIM_DIR="/home/w0ryn/.wryn/vim"
-"let $WRYNVIMRC="$VIM_DIR/rc.vim"
-"let $WRYNBASH="$RC_DIR/bashrc"
-"let $MYBASHRC="/home/w0ryn/.bashrc"
+"sets the following variables:
+"$RC_DIR $VIM_DIR $WRYNVIMRC $WRYNBASH $MYBASHRC
+" Load Vundle Plugins First
+source $VIM_DIR/vundle.vim
 " }}}
 
 " -- General Settings -------------------------------------------- {{{
diff --git a/vim/vundle.vim b/vim/vundle.vim
new file mode 100644
index 0000000..7136f9b
--- /dev/null
+++ b/vim/vundle.vim
@@ -0,0 +1,76 @@
+set nocompatible              " be iMproved, required
+filetype off                  " required
+
+" set the runtime path to include Vundle and initialize
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+" alternatively, pass a path where Vundle should install plugins
+"call vundle#begin('~/some/path/here')
+
+" let Vundle manage Vundle, required
+Plugin 'VundleVim/Vundle.vim'
+
+" <======================================================>
+" <==== Insert plugins here =============================>
+" command-t (
+	Plugin 'git://git.wincent.com/command-t.git'
+" tpope/surround
+	Plugin 'tpope/vim-surround'
+" nerdtree
+	Plugin 'git://github.com/scrooloose/nerdtree.git'
+" youCompleteMe
+	Plugin 'git://github.com/Valloric/YouCompleteMe.git'
+" leafgarland -- typescript recognition
+"	Plugin 'https://github.com/leafgarland/typescript-vim'
+" ale -- asynchronus error checking
+ 	Plugin 'https://github.com/w0rp/ale'
+" omnisharp (c#)
+	Plugin 'OmniSharp/omnisharp-vim'
+
+" example for local command:
+"	Plugin 'file:///home/gmarik/path/to/plugin'
+" <======================================================>
+" All of your Plugins must be added before the following line
+call vundle#end()            " required
+filetype plugin indent on    " required
+" To ignore plugin indent changes, instead use:
+"filetype plugin on
+"
+" Brief help
+" :PluginList       - lists configured plugins
+" :PluginInstall    - installs plugins; append `!` to update or just :PluginUpdate
+" :PluginSearch foo - searches for foo; append `!` to refresh local cache
+" :PluginClean      - confirms removal of unused plugins; append `!` to auto-approve removal
+"
+" see :h vundle for more details or wiki for FAQ
+" Put your non-Plugin stuff after this line
+
+" ===================================================================================
+" === MY PLUGIN SETTINGS ============================================================
+" ===================================================================================
+
+" --- Nerd Tree ---
+map <C-o> :NERDTreeToggle<CR>
+let g:NERDTreeNodeDelimiter = "\u00a0" " -- Was seeing ^G character, and this should fix that
+
+" --- YouCompleteMe (YCM) ---
+function! ToggleYCM()
+	if g:ycm_auto_trigger
+		let g:ycm_auto_trigger = 0
+		echohl DiffDelete | echo "YouCompleteMe autocompletion disabled" | echohl None
+	else
+		let g:ycm_auto_trigger = 1
+		echohl DiffAdd | echo "YouCompleteMe autocompletion enabled" | echohl None
+	endif
+endfunction
+nnoremap <C-p> :call ToggleYCM()<CR>
+let g:ycm_auto_trigger=0
+
+" --- ALE ---
+let g:ale_linters = {
+\ 'cs' : ['OmniSharp']
+\}
+let g:ale_lint_on_text_changed = 'never'
+
+" --- command t ---
+nnoremap T :CommandT<cr>