diff --git a/vim/vimrc b/vim/vimrc
index 5e32c77..9de1576 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -19,9 +19,10 @@ set title
 set list
 set listchars=tab:→\ ,eol:¬,trail:⋅,extends:❯,precedes:❮
 set showbreak=↪
+set timeoutlen=500
 
-let mapleader="\<SPACE>"
-
+let g:mapleader="\<SPACE>"
+let g:maplocallead=','
 
 if has('nvim')
 	set inccommand=split
@@ -46,11 +47,13 @@ Plug 'morhetz/gruvbox'
 Plug 'tpope/vim-fugitive'
 Plug 'mhinz/vim-signify'
 Plug 'tpope/vim-commentary'
+Plug 'mbbill/undotree'
 Plug 'elmcast/elm-vim'
-"
+Plug 'liuchengxu/vim-which-key'
+
 "https://github.com/baverman/vial-http/blob/master/doc/tutorial.rst
-Plug 'baverman/vial'
-Plug 'baverman/vial-http'
+"Plug 'baverman/vial'
+"Plug 'baverman/vial-http'
 
 call plug#end()
 
@@ -64,3 +67,11 @@ let g:airline#extensions#tabline#enabled = 1
 let g:airline_powerline_fonts = 1
 let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
 
+nnoremap <C-U> :UndotreeToggle<cr>
+
+"which-key
+let g:which_key_map =  {}
+autocmd! User vim-which-key call which_key#register('<Space>', 'g:which_key_map')
+call which_key#register('<Space>', "g:which_key_map")
+nnoremap <silent> <leader>      :<c-u>WhichKey '<Space>'<CR>
+nnoremap <silent> <localleader> :<c-u>WhichKey  ','<CR>