wip/seagull/patches
