[Florian Kummer] Adding more windows stuff