Added more TO DOs and added a fail state