diff --git a/VimSetup.rc b/VimSetup.rc
index 4115b50..5036023 100644
--- a/VimSetup.rc
+++ b/VimSetup.rc
@@ -1,6 +1,13 @@
 
+" let g:ycm_path_to_python_interpreter="/usr/local/bin/python3"
+" let g:ycm_path_to_python_interpreter="/usr/bin/python"
+
+let g:python_host_prog = '/usr/bin/python'
+" let g:python_host_prog = '/System/Library/Frameworks/Python.framework/Versions/2.7/bin/python'
+
+
 " Loads bundles
-execute pathogen#infect()
+" execute pathogen#infect()
 
 
 " Make vim behave like vim rather than like vi
@@ -21,9 +28,9 @@
 "
 "set makeprg=xcodebuild
 
-" Ctrl-M shortcut to execute make
+" Shift-M shortcut to execute make
 set makeprg=make
-map <C-M> :make<CR>
+map <S-M> :make<CR>:copen<CR>
 
 " SVN related integration
 "    Ctrl-D  to diff working copy
@@ -32,12 +39,36 @@
 "    Ctrl-S  to list repository status
 "    Ctrl-L  to list current directory
 "    Enter   when over item in the list, it opens it
-map <C-D> :set splitright \| vnew \| r!svn cat #<CR>:windo :diffthis<CR><C-W><C-W>1G
-map <C-E> <C-W><C-W>:q!<CR>
-map <C-C> :!svn commit --editor-cmd vim %:p<CR>
-map <C-S> :new \| r!svn st `svn info --show-item wc-root` \| sort -r<CR>1G
-map <C-L> :new \| r!ls -la<CR>1G
-map <CR> $b<C-W>gf
+map <C-D> :diffthis<CR>:set splitright \| vnew DiffView \| r!svn cat #<CR>:diffthis<CR><C-W>W1G
+map <C-E> <C-W><C-W>:q!<CR>:SideView<CR><C-W><C-W>
+" map <C-C> :!svn commit --editor-cmd vi %:p<CR>
+map <C-C> :term svn commit %:p<CR>
+map <C-A> :!svn add %:p<CR>
+map <C-S> :15new \| r!svn st `svn info --show-item wc-root` \| sort -r<CR>1G
+map <C-L> :SideView<CR>1G<S-V>Gd:r!echo .. && find ./* -maxdepth 0<CR>1G
+map <S-P> :SideView<CR>1G<S-V>Gd:r!make project<CR>1Gdd:set nowrap<CR>:set cursorline<CR>
+
+" Terminal window
+" map ~ :15new<CR>:term bash<CR>
+map ~ :ToggleTerm<CR>
+tnoremap ~ <C-\><C-N>:ToggleTerm<CR><DOWN><UP>
+"tnoremap <ESC>      <C-\><C-N>
+"tnoremap <ESC><ESC> <C-\><C-N>:ToggleTerm<CR>
+
+" set splitright
+" map <CR> $b<C-W>gf:tabprevious<CR>^:tabnext<CR>
+" map <CR> $b<C-W><C-L>:q<CR><C-W><C-H>:set splitright<CR><C-W>vgf<C-W><C-H>^:vert resize 27<CR><C-W><C-L>:set nosplitright<CR>
+" map <CR> $b:exec("Open ".expand(<cfile>))<CR>
+map <CR> $b:exec "Open " . expand("<cfile>")<CR>
+" <C-W><C-L>:q<CR><C-W><C-H>:set splitright<CR><C-W>vgf<C-W><C-H>^:vert resize 27<CR><C-W><C-L>:set nosplitright<CR>
+
+" <C-W>r
+
+"<C-W>w:vert resize 25<CR>:new r!make project<CR>1G:set nowrap<CR><C-W>w
+
+" :tabprevious<CR>^:tabnext<CR>
+" <S-P><C-W><C-W>
+
 
 " Get SVN log on current file:
 "   map <C-L> :new \| r!svn log #<CR>1G
@@ -54,16 +85,24 @@
 let g:BASH_Email        = $USER_EMAIL
 let g:BASH_Company      = $USER_COMPANY
 
+
 "
 " Appearance settings
 "
 set guifont=Monaco:h13
-syn on
-colorscheme obsidian
+" syn on
+" colorscheme obsidian
 " colorscheme chlordane
 " colorscheme colors
+"
 
 
+" Setup the plugin manager, use with :Plug
+call plug#begin('~/.vim/plugged')
+Plug 'dbgx/lldb.nvim'
+call plug#end()
+" UpdateRemotePlugins
+
 
 "  My personal preference on Mac with no PgUp/PgDn
 "  Don't need up,down,left,right mapping if have arrow keys so make these keys more useful
@@ -89,11 +128,75 @@
 map <C-Q> :qa!<CR>
 
 " Next/Prev error in list
-map <C-X> :cn<CR>
-map <C-Z> :cp<CR>
 map <C-N> :cn<CR>
 map <C-P> :cp<CR>
 
+" Next/Prev location of tag
+map <C-X> :tn<CR>
+map <C-Z> :tp<CR>
+
+" Tag navigation
+"
+" preview tag in a split view:
+"  map <C-??> :exec("ptag ".expand("<cword>"))<CR>
+" close preview split view:
+"  :pc
+" lists definitions of a tag to choose between:
+"  map <C-??> :exec("tjump ".expand("<cword>"))<CR>
+" lists definitions and then show selected one in preview window:
+"  map <C-??> :exec("ptjump ".expand("<cword>"))<CR>
+
+" :tselect
+" :stselect
+" :stjump
+" :ptnext
+" :ptprevious
+" :tag /<pattern>
+"
+" CSCOPE:
+" :map <C-??> :cscope find c <C-R><C-W><CR>
+
+set cst   " This replaces tag support with cscope,
+"            but actually want both, 'space' for tags, 'Ctrl-space' for cscope 
+set csto=0
+set nocsverb
+
+" Assuming cscope output is in the current directory
+" add any database in current directory
+if filereadable("cscope.out")
+  cs add cscope.out
+" else add database pointed to by environment
+elseif $CSCOPE_DB != ""
+  cs add $CSCOPE_DB
+endif
+set csverb
+
+" split versions:
+"   nmap <C-_>s :scs find s <C-R>=expand("<cword>")<CR><CR>
+nmap <C-_>s :cs find s <C-R>=expand("<cword>")<CR><CR>
+nmap <C-_>g :cs find g <C-R>=expand("<cword>")<CR><CR>
+nmap <C-_>c :cs find c <C-R>=expand("<cword>")<CR><CR>
+nmap <C-_>t :cs find t <C-R>=expand("<cword>")<CR><CR>
+nmap <C-_>e :cs find e <C-R>=expand("<cword>")<CR><CR>
+nmap <C-_>f :cs find f <C-R>=expand("<cfile>")<CR><CR>
+nmap <C-_>i :cs find i ^<C-R>=expand("<cfile>")<CR>$<CR>
+nmap <C-_>d :cs find d <C-R>=expand("<cword>")<CR><CR>
+nmap <C-_>a :cs find a <C-R>=expand("<cword>")<CR><CR>
+" usage:
+"  :cscope find <option> <pattern>
+" cscope find options:
+" 0 or s: Find this C symbol
+" 1 or g: Find this definition
+" 2 or d: Find functions called by this function
+" 3 or c: Find functions calling this function
+" 4 or t: Find this text string
+" 6 or e: Find this egrep pattern
+" 7 or f: Find this file
+" 8 or i: Find files #including this file
+" 9 or a: Find places where this symbol is assigned a value
+
+
+
 
 " Indentation and tab settings
 set expandtab
@@ -105,15 +208,44 @@
 "cinoptions=[options],:0
 "cinoptions+=:0
 
-set tags=./tags;
 
 map <space> <C-]>
+map <C-space> :cscope find c <C-R><C-W><CR>
 map <tab> <C-O>
 map <s-tab> <C-I>
 " map <tab> <C-T>
 
 " map <s-tab> b<C-V>w<left>g]
 
+
+" Debugging options:
+map <C-b> <Plug>LLBreakSwitch
+map <S-D> :LLsession load lldb-nvim.json<CR>:LLmode debug<CR>
+" map b <Plug>LLBreakSwitch
+map r :LL run<CR>
+map c :LL continue<CR>
+map s :LL step<CR>
+
+"if filereadable("lldb-nvim.json")
+"LLsession load lldb-nvim.json
+"endif
+
+
+" OmniCppComplete
+let OmniCpp_NamespaceSearch = 1
+let OmniCpp_GlobalScopeSearch = 1
+let OmniCpp_ShowAccess = 1
+let OmniCpp_ShowPrototypeInAbbr = 1 " show function parameters
+let OmniCpp_MayCompleteDot = 1 " autocomplete after .
+let OmniCpp_MayCompleteArrow = 1 " autocomplete after ->
+let OmniCpp_MayCompleteScope = 1 " autocomplete after ::
+let OmniCpp_DefaultNamespaces = ["std", "_GLIBCXX_STD"]
+" automatically open and close the popup menu / preview window
+au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif
+set completeopt=menuone,menu,longest,preview
+
+
+
 set shiftround
 set autoindent
 
@@ -196,13 +328,16 @@
 " Why, because some MORON decided that gcc would be better at wordwrapping then anything else, and GOT IT WRONG!
 set errorformat=%A%f:%l:%m,%C\ \ \ %m,%*[^\"]\"%f\"%*\\D%l:\ %m,\"%f\"%*\\D%l:\ %m,%-G%f:%l:\ (Each\ undeclared\ identifier\ is\ reported\ only\ once,%-G%f:%l:\ for\ each\ function\ it\ appears\ in.),%f:%l:%m,\"%f\"\,\ line\ %l%*\\D%c%*[^\ ]\ %m,%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',%DMaking\ %*\\a\ in\ %f
 
+" Spelling
+"  set spell spelllang=en
+" Done below for specific file-types
 if !exists("autocmd_loaded")
     let autocmd_loaded = 1
-"    autocmd BufNewFile,BufRead *.cpp,*.c,*.h,*.txt,*.qdoc,*.doc setlocal spell spelllang=en_us
+    autocmd BufNewFile,BufRead *.cpp,*.c,*.h,*.md,*.txt,*.qdoc,*.doc setlocal spell spelllang=en
     autocmd BufNewFile,BufRead *.doc,*.qdoc,*.book,*.leaf set filetype=doc
-    autocmd BufNewFile,BufRead *.pro,*.pri set filetype=pro
-    autocmd BufNewFile,BufRead *akefile*,*.inc,*.mak set noexpandtab
-    autocmd BufNewFile,BufRead *akefile*,*.inc,*.mak set filetype=make
+    " autocmd BufNewFile,BufRead *.pro,*.pri set filetype=pro
+    autocmd BufNewFile,BufRead *akefile*,*.pro,*.inc,*.mak set noexpandtab
+    autocmd BufNewFile,BufRead *akefile*,*.pro,*.inc,*.mak set filetype=make
 endif
 
 " Remember the position of the cursor from previous edits
@@ -229,7 +364,72 @@
 set ruler
 set number
 
-highlight LineNr ctermfg=5
+set foldmarker=fold-start,fold-end
+set foldmethod=marker
+
+" For help on built-in functions, try:
+"   :help functions
+"   :help funtion-list
+
+
+function! s:win_by_bufname(bufname)
+    let bufmap = map(range(1, winnr('$')), '[bufname(winbufnr(v:val)), v:val]')
+    let thewindow = filter(bufmap, 'v:val[0] =~ a:bufname')[0][1]
+    execute thewindow 'wincmd w'
+endfunction
+command! -nargs=* WinGo call s:win_by_bufname(<q-args>)
+
+
+function! s:GoToSideView()
+    let winnr = bufwinnr("SideView")
+    silent! execute winnr < 0 ? '35vnew ' . fnameescape("SideView") : winnr . 'wincmd w'
+    execute 'vert resize 35'
+endfunction
+command! SideView call s:GoToSideView()
+
+
+function! s:GoToTerminalView()
+    let winnr = bufwinnr("term://*")
+    silent! execute winnr < 0 ? '15new' : winnr . 'wincmd w'
+    silent! execute winnr < 0 ? 'term bash' : 'q!'
+    if winnr < 0
+      execute "normal! i"
+    endif
+endfunction
+command! ToggleTerm call s:GoToTerminalView()
+
+
+function! s:OpenInRightView(filename)
+    let file1 = fnameescape(a:filename)
+    let paths = system('make paths')
+    let syspaths = system('make system_paths')
+    let file = findfile(file1, './ ' . paths . syspaths)
+    if filereadable(file)
+      let count = winnr('$')
+      " map <CR> $b<C-W><C-L>:q<CR><C-W><C-H>:set splitright<CR><C-W>vgf<C-W><C-H>^:vert resize 30<CR><C-W><C-L>:set nosplitright<CR>
+      
+      execute "let ln = line('.')"
+      execute 'echo cursor([ln, 1])'
+      silent! redraw
+      execute 'set splitright'
+      silent! execute count < 2 ? 'vnew' : count . 'wincmd w'
+      let count = winnr('$')
+      execute 'set nosplitright'
+      execute '1wincmd w'
+      execute 'vert resize 35'
+      execute count . 'wincmd w'
+      execute 'edit ' . file
+      execute 'normal! ' . ln . 'G'
+      " execute 'wincmd l'
+    else
+      if isdirectory(file1)
+        execute 'silent normal! 1G'
+        execute 'silent visual! Gd'
+        execute 'r!echo "'. file1 . '/.." && find ' . file1 . '/* -maxdepth 0'
+      endif
+    endif
+endfunction
+command! -nargs=+ Open call s:OpenInRightView(<q-args>)
 
 
 " function! s:ExecuteInShell(command)
@@ -267,13 +467,24 @@
   call append('$', "                                                    ")
   call append('$', "     Editing keys:                                  ")
   call append('$', "        Q         reformat the current function     ")
+  call append('$', "        zg        add word to spelling dictionary   ")
+  call append('$', "                                                    ")
+  call append('$', "     Shell integration:                             ")
+  call append('$', "        ~         to open a terminal in window      ")
+  call append('$', "        Esc-Esc   to exit insert mode in terminal   ")
   call append('$', "                                                    ")
   call append('$', "     Compiling integration:                         ")
-  call append('$', "        Ctrl-M    to execute make                   ")
+  call append('$', "        Shift-M   to execute make                   ")
   call append('$', "        Ctrl-N/X  to jump to next error             ")
   call append('$', "        Ctrl-P/Z  to jump to prev error             ")
   call append('$', "                                                    ")
+  call append('$', "     Debugging integration:                         ")
+  call append('$', "        Shift-D   to start debug session            ") 
+  call append('$', "        Ctrl-B    to set breakpoint                 ")
+  call append('$', "        R/C/S     to run/continue/step              ")
+  call append('$', "                                                    ")
   call append('$', "     SVN related integration:                       ")
+  call append('$', "        Ctrl-A    to mark file for adding           ")
   call append('$', "        Ctrl-D    to diff working copy              ")
   call append('$', "        Ctrl-E    to go back to editing             ")
   call append('$', "        Ctrl-C    to commit working copy            ")
@@ -330,3 +541,98 @@
 autocmd VimEnter * call ShowOnStartHelp()
 
 
+" EasyTags is crap, too slow, don't use
+" let g:easytags_always_enabled = 1
+
+
+" My syntax highlighting magic
+function! CppSyntaxHighlighting()
+  set tags+=./.tags
+  
+  " This is to avoid cpp.vim error when it is a .c buf
+	syn keyword cppStructure class
+
+  runtime after_disable/syntax/cpp.vim
+
+  syn keyword cppOtherKeyword bool class struct void int unsigned float double virtual default const constexpr decltype nullptr noexcept dynamic_cast static_cast reinterpret_cast const_cast return operator override final public private protected for if do while case switch this try catch static_assert sizeof else using
+
+  " ctags kinds:
+  "
+  " C++
+  "     d  macro definitions
+  "     e  enumerators (values inside an enumeration)
+  "     f  function definitions
+  "     g  enumeration names
+  "     l  local variables [off]
+  "     m  class, struct, and union members
+  "     p  function prototypes [off]
+  "     s  structure names
+  "     t  typedefs
+  "     u  union names
+  "     v  variable definitions
+  "     x  external and forward variable declarations [off]
+  "     z  function parameters inside function definitions [off]
+  "     L  goto labels [off]
+  "     c  classes
+  "     n  namespaces
+  "     A  namespace aliases [off]
+  "     N  names imported via using scope::symbol [off]
+  "     U  using namespace statements [off]
+
+  " Read the ctags .tags file and find all the types and add to the cppType syntax for coloring
+  let tags = taglist('^', '.tags')
+  let typeTags = filter(tags, "!empty(matchstr(v:val['kind'], '[csgunt]'))")
+  call map(typeTags, "v:val['name']")
+  exec 'syn keyword cppType ' . join(typeTags, " ")
+
+  " Add the system tags
+  set tags+=~/.vim/tags/system_tags
+endfunction
+
+
+
+function! ShowProjectView()
+  " Map obsidian color scheme
+  runtime colors/obsidian.vim
+
+  normal :SideView
1GVGd:r!make project
1Gdd:set nowrap
:set cursorline
+
+  " Colorize the project list side-view
+  syn keyword ProjectHeading  Target Sources Includes Docs Project
+  let projectFiles = system('make dependancies')
+  let list = split(projectFiles, ' ')
+  for file in list
+    exec 'syn match ProjectFile ' . file
+  endfor
+  hi CursorLine     term=reverse cterm=NONE ctermfg=White ctermbg=Green
+  hi ProjectHeading ctermfg=5
+  hi ProjectFile    ctermfg=3
+ 
+  " Switch to the editor window
+  execute 'wincmd l'
+endfunction
+
+
+" If starting up with a project file, how the project side-view
+autocmd VimEnter *.cpp,*.c,*.h,*.pro call ShowProjectView()
+
+
+" Key short-cuts for switching between views
+nmap <silent> <S-Left> :wincmd h<CR>
+nmap <silent> <S-Right> :wincmd l<CR>
+
+hi clear SpellBad
+
+" Subtly highlight bad spelling in text files
+autocmd BufNewFile,BufRead *.md,*.txt,Makefile hi SpellBad ctermbg=1
+
+" Vim help docs are hard to read/confusing with bad spelling highlighting
+autocmd BufNewFile,BufRead *vim/*doc/*.txt hi clear SpellBad
+
+" Use my custom syntax highlighting for code
+autocmd BufNewFile,BufRead *.cpp,*.c,*.h call CppSyntaxHighlighting()
+
+
+syntax enable
+
+