Initial commit from windows