@bobrich's 2.1M1 branch

Let's get the request / response pairs, scanner updates, and other useful changes.