Refactored client, removed all calls in favour of __call