some work before I merge
Merge branch 'develop' into vdev
commiting unfinished work, before working with twpath
unfinish work now compiles
Merge branch 'vdev' into develop