wip/manatee/patches
