Merge branch 'develop'
Refactor Run to Dataset
Merge branch 'refactor/run' into develop
Fix bug where solution would not get written out

Local variable was hiding class variable
Merge branch 'bug/solution-file' into develop