Feature/vim

Closes #2