wip/vidalia/patches
