Temp workings of adding windows support

Change-Id: I8eab2fac3a656b75a998749e6931cc7add7b1cdb