Refactored Request class.

All 22 tests pass.