Updating vtm

Pushed an updated branch of vtm for this ... once we merge this I will reset the master branch of vtm.