wip/oneloop/patches
