Implemented failures but not excessively tested
Merge branch 'breaking_point' into electric_dev