wip/frobtads/patches
