WIP: Trying to use the full URL rather than string-hacking.