Now the windows stuff is organized a lot better