Review Only: Features/conditional restart

This PR is mostly for review, hence the lack of rspec updates accompanying it. I mostly hope for feedback regarding the desirability of this as well as the direction I am headed with it (acknowledging it is not finished yet). Tomorrow I should have a finished Jenkins job using this branch to determine what kind of overall time reduction occurs.