more vi groundwork
Merge branch 'vi' into dev