Second commit

Added more changes to test windows client