pull client into own file