WIP changes that passes unit test but doesn't fix windows urls