First steps to converting this to vim-mode, not vim-bar.  Kinda broke search