wip: retries

Need to merge+tag after some internal stuff is updated. Hold please :-)