Changes, plus the addition of a uri_parser.