wip/oops/patches
