Slight fix for 2.066
Major issues with 2.066 and the windows header. Split things up considerably.