More TODOs.
Migrated over the MSVC support to the new setup. Now to test...