Consolidate URL Params

Closes #25