Added feature DRYRUN

This should be committed to a branch but, alas, I am new to this Github
thing and must sync before I can do that.
Integrated changes. Cleaned up a bit.

Some final cleanup and testing before pushing over to master.

I am less afraid to delete dead code. =)