diff --git a/.vimrc b/.vimrc
index bebf8d9..1425e86 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,21 +1,28 @@
 
 set nocompatible              " be iMproved, required
 filetype off                  " required
- 
+
+
 call plug#begin()
     Plug 'itchyny/lightline.vim'
     Plug 'vim-scripts/c.vim'
     Plug 'arcticicestudio/nord-vim'
 	Plug 'scrooloose/nerdtree'
 	Plug 'jistr/vim-nerdtree-tabs'
-	Plug 'ervandew/supertab'
 	Plug 'fweep/vim-tabber.git'
 	Plug 'rhysd/vim-clang-format'
 	Plug 'kana/vim-operator-user'
 	Plug 'https://github.com/antoyo/vim-licenses'
-    Plug 'Valloric/YouCompleteMe'
+    Plug 'rust-lang/rust.vim'
+    Plug 'Shougo/deoplete.nvim'
+    Plug 'roxma/nvim-yarp'
+    Plug 'roxma/vim-hug-neovim-rpc'
+    Plug 'tbodt/deoplete-tabnine', { 'do': './install.sh' }
 call plug#end()            " required
+
 filetype plugin indent on    " required
+
+let g:deoplete#enable_at_startup = 1
  
 set tags+=./.tags
  
@@ -27,7 +34,6 @@ set tags+=./.tags
  
 " prevent mouse vanishing
 set nomousehide
-set mousemodel=popup
  
 " toggles menu in graphical mode
 function! ToggleGUICruft()
@@ -102,6 +108,17 @@ set tabstop=4
 set shiftwidth=4
 set expandtab
 
+:command WQ wq
+:command Wq wq
+:command W w
+:command Q q
 
 let g:C_MapLeader = ','
 nnoremap <cr> :noh<CR><CR>:<backspace>
+
+let g:deoplete#enable_smart_case = 1
+imap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
+imap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<S-TAB>"
+imap <expr><CR> pumvisible() ? deoplete#close_popup() : "\<CR>"
+set completeopt=menu,noinsert
+