WIP: URLs are still being added without the host portion.