wip/wsmake/patches
