#15 initial commit for fault tolerance