Did some more work on HyperClient