diff --git a/nvim/init.vim b/nvim/init.vim
index 295078f..352bd5e 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -43,6 +43,7 @@ Plug 'easymotion/vim-easymotion'
 Plug 'yuttie/comfortable-motion.vim'
 Plug 'vim-scripts/restore_view.vim'
 Plug 'ericbn/vim-relativize'
+Plug 'majutsushi/tagbar'
 
 "Other files
 Plug 'elzr/vim-json'
@@ -111,10 +112,18 @@ map <C-m> :UndotreeToggle<CR>
 
 noremap <silent> <ScrollWheelDown> :call comfortable_motion#flick(40)<CR>
 noremap <silent> <ScrollWheelUp>   :call comfortable_motion#flick(-40)<CR>
+nnoremap <Tab> :TagbarToggle<CR>
+
+"Splits
+nnoremap <C-J> <C-W><C-J>
+nnoremap <C-K> <C-W><C-K>
+nnoremap <C-L> <C-W><C-L>
+nnoremap <C-H> <C-W><C-H>
 
 "Other mappings
 nmap <C-p> :Files<CR>
 :tnoremap <Esc> <C-\><C-n>
+nmap , :lclose<CR> :pclose<CR>
 
 "Snippets
 let g:UltiSnipsUsePythonVersion = 3
@@ -123,7 +132,7 @@ let g:UltiSnipsJumpForwardTrigger="<C-S-j>"
 let g:UltiSnipsJumpBackwardTrigger=""
 
 "Formatting
-command! JSONFormatCursor :silent! exe jdaddy#reformat('jdaddy#inner_pos', v:count1)<CR> 
+"command! JSONFormatCursor :silent! exe jdaddy#reformat('jdaddy#inner_pos', v:count1)<CR> 
 
 "Indent stuff
 set tabstop=4
@@ -151,7 +160,7 @@ au Filetype tex
 
 
 let g:indent_guides_enable_on_vim_startup = 1
-let g:indent_guides_exclude_filetypes = ['help', 'nerdtree']
+let g:indent_guides_exclude_filetypes = ['help', 'nerdtree', 'tagbar']
 let g:indent_guides_guide_size = 1
 
 "Syntax
@@ -166,7 +175,6 @@ syntax on
 "let g:syntastic_check_on_open = 1
 "let g:syntastic_check_on_wq = 0
 
-"Install: python-language-server, pylama, autopep8
 let g:ale_open_list = 'on_save'
 let g:ale_list_window_size = 7
 let g:ale_close_preview_on_insert = 1
@@ -175,7 +183,7 @@ let g:ale_lint_on_enter = 0
 let g:ale_completion_enabled = 0
 let g:ale_linters = {'python': ['pyls'], 'tex': ['chktex']}
 let g:ale_fixers = {
-\    'python': ['autopep8', 'remove_trailing_lines', 'trim_whitespace'],
+\    'python': ['yapf', 'isort', 'remove_trailing_lines', 'trim_whitespace'],
 \    'tex': ['latexindent', 'textlint', 'remove_trailing_lines', 'trim_whitespace']
 \}
 let g:airline#extensions#ale#enabled = 1
@@ -208,6 +216,8 @@ let g:airline_powerline_fonts = 1
 highlight! TermCursorNC guibg=red
 
 let g:colorizer_auto_filetype='css,html,python,js'
+let g:tagbar_sort = 0
+let g:tagbar_show_line_numbers = 1
 
 "Rainbow brackets
 let g:rainbow_active = 1
diff --git a/nvim/readme.md b/nvim/readme.md
new file mode 100644
index 0000000..8927406
--- /dev/null
+++ b/nvim/readme.md
@@ -0,0 +1,17 @@
+# Stuff to install
+## Neovim
+https://github.com/junegunn/vim-plug  
+https://github.com/ryanoasis/nerd-fonts#patched-fonts  
+`pip install neovim`  
+`npm i -g neovim`  
+
+## Tagbar
+`git clone https://github.com/universal-ctags/ctags`  
+`apt install autoconf automake`  
+`./autogen.sh`  
+`./configure --prefix=/where/you/want # defaults to /usr/local`  
+`make`  
+`make install # may require extra privileges depending on where to install`  
+
+## Python
+`pip install neovim python-language-servers yapf isort pylama`