committing the V2 branch to send up to hub
these are the fixes to V2 which will go out as V2.1
few more changes to V2.1 before we send it to test
fixed the conflicts and can upload the merge into master