Need to do tests for failures asap
Restructuring