merge windows client to this solution