Just looking over this PR again now, and I'm not actually sure why the whole file has changed, probably VS being a bit screwy. I'll take another look at it tonight and see if I can fix it up.