New work to add in failure handling.