First cut at parallel runner
fixed merge conflicts