diff --git a/.vimrc b/.vimrc
index efa6fdf..9e82a8b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -10,6 +10,7 @@ Bundle 'gmarik/vundle'
 
 Bundle 'airblade/vim-gitgutter'
 Bundle 'bronson/vim-trailing-whitespace'
+Bundle 'FredKSchott/CoVim'
 Bundle 'godlygeek/tabular'
 Bundle 'itchyny/lightline.vim'
 Bundle 'kien/ctrlp.vim'
@@ -108,6 +109,9 @@ map <Leader>te :Tabularize /=<cr>
 map <Leader>bi :BundleInstall<cr>
 map <Leader>bu :BundleInstall!<cr>
 
+" covim
+map <Leader>cvs :CoVim start<cr>
+
 " copy and paste - for Linux
 map <Leader>c "+
 map <Leader>p "+p
@@ -154,6 +158,10 @@ let g:lightline = {
       \ }
       \ }
 
+" covim
+let CoVim_default_name = "atomaka"
+let CoVim_default_port = "5120"
+
 " Functions
 " Toggle relative line numbers and cursorline; useful for long line files
 function! LargeFileToggle()