refactor for migration over to tenyks.client