Start adding full uri + scheme/host/port capabilities