WIP on updated hfvim