First pass on weaving in retry logic.