wip/tripwire2/patches
