major vector work complete
Merge branch 'add-watch' into dev