wip/taskcoach/patches
