wip/yateclient/patches
