wip/bird/patches
