Initial move to http-client