wip/knutclient/patches
