wip/cowpatty/patches
