Added various relative URL resolution stages, TODOs to make sure they’re all correct