Added the necessary code changes.
Stuff that Visual Studio did, I'll have to look at this tomorrow.