Everything
Merge branch 'Vi' into DEMO
cleanint up for the next stage