wip/tome/patches
