Better DRY RUN
Closes #15.