wip/munge/patches
