@bagnell I think this is your code, or @mramato's.  I tried not to change the functionality of the VVLH stuff.  But I'm open to upgrading it as part of this branch.