Added VIM to the mix