Ground work for submitting solutions
Merge branch 'rjtm' into dev