Adding this to the windows thing, though it's not really related

But it probably hinges on changes and doing it here will avoid conflicts.