Refactored code out of WeaverRequestCmd. Updated tests.

All 315 tests pass, 99% coverage.