Mostly working now, URI spec issues