diff --git a/.vimrc b/.vimrc
index b0a80f3..2050e19 100644
--- a/.vimrc
+++ b/.vimrc
@@ -103,7 +103,10 @@ NeoBundle 'lunaru/vim-less'
 NeoBundle 'terryma/vim-multiple-cursors'
 NeoBundle 'rodjek/vim-puppet'
 NeoBundle 'tpope/vim-unimpaired'
-NeoBundle 'Valloric/YouCompleteMe'
+"NeoBundle 'Valloric/YouCompleteMe'
+NeoBundle 'Shougo/deoplete.nvim'
+NeoBundle 'zchee/deoplete-go', {'build': {'unix': 'make'}}
+NeoBundle 'zchee/deoplete-jedi'
 NeoBundle 'b4winckler/vim-angry'
 NeoBundle 'tristen/vim-sparkup'
 NeoBundle 'vim-airline/vim-airline'
@@ -170,6 +173,8 @@ setlocal cursorline
 
 
 " ** PLUGIN CONFIGURATION **
+"
+let g:deoplete#enable_at_startup = 1
 " * Vim general/Unknown
 let python_highlight_all = 1
 let g:Tb_MaxSize=0