Do this on the source_location before converting to draft location? It probably doesn't matter, but that feels cleaner to me.