Refactor for future
Add Visual Studio toolset XP