Use functions from vimsync
Merge with Chouffe