Continued work on new HTTP handling.