Moved the solution assignments into the two-pass group so that a pause from autosolve will stop where expected.