Refactor

Alleviate issues with run stages.