Take further steps towards automated Windows installs

Work in progress.