Add built int recovery for submission threads
Refactor, bring retries to worker code
Merge branch 'immortal-threads'