More basic work. Migration to MSVC2012.