Structural change prep for C# isolation
Aaarrght
Fixing major mess