attempting to get windows working with these changes, take 2.