Add fault tolerance

We think the code here is ready to go!