More progress.
Merge https://github.com/Cpruce/FaultTolerance