Changing failure functionality, need to fix bugs

Check TODO’s