Todo: Highlight error messages
Merge branch 'breaking_point' into electric_dev