added highly experimental vim line at header
started refactor
renaming
plus 2 fns, plus 4 vars