diff --git a/vimrc b/vimrc
index 5f980f8..e70a6f5 100644
--- a/vimrc
+++ b/vimrc
@@ -27,7 +27,6 @@ Plug 'rhysd/conflict-marker.vim'
 Plug 'airblade/vim-gitgutter'
 
 Plug 'inside/vim-search-pulse'
-Plug 'mileszs/ack.vim'
 
 Plug 'itchyny/lightline.vim'
 
@@ -40,6 +39,9 @@ Plug 'mxw/vim-jsx'
 Plug 'suan/vim-instant-markdown', { 'for': 'markdown' }
 Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' }
 
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+Plug 'junegunn/fzf.vim'
+
 call plug#end()
 
 "" enable local .vimrc
@@ -270,10 +272,13 @@ iab xnow <c-r>=strftime("%Y-%m-%d %H:%M")<cr>
 " Plugin Configuration
 "
 
-"" ACK
-if executable('ag')
-    let g:ackprg = 'ag --vimgrep'
-endif
+"" fzf 
+nmap <leader>f :GFiles<cr>
+nmap <leader>F :Files<cr>
+nmap <leader>a :Ag<space>
+vmap <leader>a y:Ag <c-r>" <cr>
+nmap <leader>A :Ag <c-r><c-w><cr>
+nmap <leader>c :Commits<cr>
 
 "" syntastic
 let g:syntastic_always_populate_loc_list = 1
diff --git a/zshrc b/zshrc
index da37731..2acd7b6 100644
--- a/zshrc
+++ b/zshrc
@@ -80,3 +80,5 @@ bindkey ' ' magic-space
 BASE16_SHELL=$HOME/.base16-shell/
 [ -n "$PS1" ] && dark 
 
+
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh