Initial update of MSVC 2003 solution