Added the Blah helper class
Merge branch 'feature/blah' into develop