Scheme support
move url chekcs out to method
Refactor url host swap