Rewritten VVZ
Various changes
Merge branch 'new-vvz'