Making this slightly less fragile of a url