VS branch finished. All tests passing with all compilers, and performance matches