Replaced existing retry mechanism with a queue. This makes it easier to abort retries if we change route.