Make distinction between keyValue and substitution

Need to make a distinction between key value parameters and parameters that should be substituted into the url.
Or perhaps not, maybe both passing them in and substituting is acceptable. Or maybe variables that can be substituted aren't added to the uri builder list
