Made a start in the vs2026 branch
Made a start in the vs2026 branch