Now compiling without error on msvc. No tests run yet.