wip/clfswm/patches
