Nov12

Creating pull request for code review. See comments in diff.
We don't have to do retry counts, and you could just a Map, we're not keeping track of much, just a bunch of IDs....