Initial commit of uri stuff