Improved/fixed dry runs, should still do something about passing a changelist between stages