Mostly done with fault tolerance...??
Fixed conflict
Maybe finished fault tolerance implementation?