wip/wmswallow/patches
