Further musing on where things belong...
Further adjustments on the retry logic