Working on wandows support