Feature/data and error collection level2

[y0chanan]

sorry, as the commits are not as loosely coupled as I hoped I have created a single pull request. Most lines are actually the unit tests