diff --git a/bundles-init/YouCompleteMe.load.vim b/bundles-init/YouCompleteMe.load.vim
new file mode 100644
index 0000000..6394535
--- /dev/null
+++ b/bundles-init/YouCompleteMe.load.vim
@@ -0,0 +1 @@
+NeoBundle "Valloric/YouCompleteMe"
diff --git a/bundles-init/rust.vim.conf.vim b/bundles-init/rust.vim.conf.vim
new file mode 100644
index 0000000..7ec2b5c
--- /dev/null
+++ b/bundles-init/rust.vim.conf.vim
@@ -0,0 +1 @@
+let g:autofmt_autosave = 1
diff --git a/bundles-init/rust.vim.load.vim b/bundles-init/rust.vim.load.vim
new file mode 100644
index 0000000..89e34c0
--- /dev/null
+++ b/bundles-init/rust.vim.load.vim
@@ -0,0 +1 @@
+NeoBundle 'rust-lang/rust.vim'
diff --git a/bundles-init/vim-lsp.cfg.vim b/bundles-init/vim-lsp.cfg.vim
new file mode 100644
index 0000000..583e363
--- /dev/null
+++ b/bundles-init/vim-lsp.cfg.vim
@@ -0,0 +1,17 @@
+au User lsp_setup call lsp#register_server({
+	\ 'name': 'rust' ,
+	\ 'cmd' : {server_info->[
+		\ &shell,
+		\ &shellcmdflag,
+		\ 'rustup run stable rls']
+	\ } ,
+	\ 'whitelist' : [ 'rust' ] ,
+\ })
+
+noremap <Leader>df :LspDocumentFormat<cr>
+vnoremap <Leader>df :LspDocumentRangeFormat<cr>
+noremap <Leader>dr :LspReferences<cr>
+noremap <F3> :LspDefinition<cr>
+noremap <Leader>dR :LspRename<cr>
+noremap <Leader>dh :LspHover<cr>
+noremap <Leader>ds :LspWorkspaceSymbol<cr>
diff --git a/bundles-init/vim-lsp.load.vim b/bundles-init/vim-lsp.load.vim
new file mode 100644
index 0000000..531b119
--- /dev/null
+++ b/bundles-init/vim-lsp.load.vim
@@ -0,0 +1,2 @@
+NeoBundle 'prabirshrestha/async.vim'
+NeoBundle 'prabirshrestha/vim-lsp'
diff --git a/bundles-init/vim-toml.load.vim b/bundles-init/vim-toml.load.vim
new file mode 100644
index 0000000..ef05c67
--- /dev/null
+++ b/bundles-init/vim-toml.load.vim
@@ -0,0 +1 @@
+NeoBundle 'cespare/vim-toml'
diff --git a/bundles-init/vimmake.cfg.vim b/bundles-init/vimmake.cfg.vim
new file mode 100644
index 0000000..6a4d8e6
--- /dev/null
+++ b/bundles-init/vimmake.cfg.vim
@@ -0,0 +1,44 @@
+if exists( 'g:vim_local_path' )
+	let g:vimmake_path = g:vim_local_path . 'scripts'
+
+	let g:vimmake_mode = {}
+	let g:vimmake_mode['clean'] = 'async'
+	let g:vimmake_mode['build'] = 'async'
+	let g:vimmake_mode['rebuild'] = 'async'
+	let g:vimmake_mode['test'] = 'async'
+
+	function! DoBuild(full)
+		silent call vimmake#toggle_quickfix(12,1)
+		if a:full == 0
+			VimTool build
+		else
+			VimTool rebuild
+		endif
+	endfunc
+
+	function! KillBuild()
+		silent call vimmake#toggle_quickfix(0)
+		VimStop
+	endfunc
+
+	function! RunTest()
+		silent call vimmake#toggle_quickfix(12,1)
+		VimTool test
+	endfunc
+
+	augroup QuickfixStatus
+	    au! BufWinEnter quickfix setlocal 
+		\ statusline=%t\ [%{g:vimmake_build_status}]\ %{exists('w:quickfix_title')?\ '\ '.w:quickfix_title\ :\ ''}\ %=%-15(%l,%c%V%)\ %P
+	augroup END
+
+	noremap <F12> :silent call vimmake#toggle_quickfix(12)<cr>
+	inoremap <F12> <esc>:silent call vimmake#toggle_quickfix(12)<cr>li
+	noremap <F10> :silent call DoBuild(0)<cr>
+	inoremap <F10> <esc>:silent call DoBuild(0)<cr>li
+	noremap <S-F10> :silent call DoBuild(1)<cr>
+	inoremap <S-F10> <esc>:silent call DoBuild(1)<cr>li
+	noremap <C-F10> :silent call KillBuild()<cr>
+	inoremap <C-F10> <esc>:silent call KillBuild()<cr>li
+	noremap <F11> :silent call RunTest()<cr>
+	inoremap <F11> <esc>:silent call RunTest()<cr>li
+endif
diff --git a/bundles-init/vimmake.load.vim b/bundles-init/vimmake.load.vim
new file mode 100644
index 0000000..4de0be2
--- /dev/null
+++ b/bundles-init/vimmake.load.vim
@@ -0,0 +1 @@
+NeoBundle 'skywind3000/vimmake'