wip/cw/patches
