Hacked out HttpClient - tests in prgoress