wip/dionysus/patches
