diff --git a/vim/plugin/shame.vim b/vim/plugin/shame.vim
index 04fed5d..9068dd6 100644
--- a/vim/plugin/shame.vim
+++ b/vim/plugin/shame.vim
@@ -629,40 +629,6 @@ digraph ss 223
 
 command! HLProgress syntax match Comment /\_.*\ze\n.*\%#/
 
-nnoremap <leader>h :call <SID>toggleWUC()<CR>
-
-function! s:updateWUC()
-	if exists("b:hlwuc")
-		if b:hlwuc > 1
-			call matchdelete(b:hlwuc)
-		end
-	end
-	if exists("b:word_hl")
-		let hl = b:word_hl
-	else
-		let hl = "Underlined"
-	endif
-	let l:str = "\\<".escape(expand("<cword>"), "\\")."\\>"
-	let b:hlwuc = matchadd(hl, l:str)
-endfunc
-
-function! s:toggleWUC()
-	augroup hlwuc
-	if exists("b:hlwuc")
-		autocmd!
-		if b:hlwuc > 1
-			call matchdelete(b:hlwuc)
-		end
-		unlet b:hlwuc
-	else
-		autocmd CursorMoved <buffer> call <SID>updateWUC()
-		autocmd CursorMovedI <buffer> call <SID>updateWUC()
-		call <SID>updateWUC()
-	endif
-	augroup END
-	redraw
-endfunction
-
 vnoremap <leader>g :<C-u>call <SID>GrepOperator(visualmode())<CR>
 nnoremap <leader>g :set operatorfunc=<SID>GrepOperator<CR>g@
 function! s:GrepOperator(type)
diff --git a/vim/plugin/word-under-cursor.vim b/vim/plugin/word-under-cursor.vim
new file mode 100644
index 0000000..56b9d4b
--- /dev/null
+++ b/vim/plugin/word-under-cursor.vim
@@ -0,0 +1,33 @@
+nnoremap <leader>h :call <SID>toggleWUC()<CR>
+
+function! s:updateWUC()
+	if exists("b:hlwuc")
+		if b:hlwuc > 1
+			call matchdelete(b:hlwuc)
+		end
+	end
+	if exists("b:word_hl")
+		let hl = b:word_hl
+	else
+		let hl = "Underlined"
+	endif
+	let l:str = "\\<".escape(expand("<cword>"), "\\")."\\>"
+	let b:hlwuc = matchadd(hl, l:str)
+endfunc
+
+function! s:toggleWUC()
+	augroup hlwuc
+	if exists("b:hlwuc")
+		autocmd!
+		if b:hlwuc > 1
+			call matchdelete(b:hlwuc)
+		end
+		unlet b:hlwuc
+	else
+		autocmd CursorMoved <buffer> call <SID>updateWUC()
+		autocmd CursorMovedI <buffer> call <SID>updateWUC()
+		call <SID>updateWUC()
+	endif
+	augroup END
+	redraw
+endfunction