Revert "Replace client pointers with references"
Merge pull request #10 from acreloaded/revert-9-ptr-to-ref

Revert "Replace client pointers with references"