Massive Changes to get windows to work...  not working yet.