Making the URL generation tools do their job

instead of making them do everything.

Honestly, it helps to know what we're doing.