Fixes up client and requests methods for easier data flow