broke jiffy client into smaller methods more