HttpConnection refactoring work in progress