Nov12

Creating pull request for code review. See comments in diff.
I have no idea where you go this from, there's no retry count in the CM. It has been abstracted out completely.