Merge all versions of code from recent changes

[mckartha]

We've made a lot of changes both at the Waterford competition a few weeks ago and since then - merge this code and push to Github before we get completely confused