Refactored all of run into immaculate gem.  Factored out other stuff.  cleanup.