wip/doorman/patches
