ok, I *do* like what the refactor does in terms of cleaning up this hydra-fun :)
still would like to discuss some.