wip/contacts/patches
