Change back to OO Runner, some pylint fixes
Quieten pylint
Structural changes found while adapting other code
Merge remote-tracking branch 'origin/back-to-oo'