wip/fluxspace/patches
