Removed client class; going to re-factor this into request/response/session objects