More work on the url builder logic, still need heavy work