improved a lot of my code, made it more modular.  Broke my entire cuke_metrics hash!  Need to fix that now.