VVWM Input Setup
Merge branch 'jon' into sprint9