wip/teco/patches
