first commit

windows merge.