Finished scheduler, added fault tolerance