[OE-2716] initial bash at implementing Bill's contacts refactoring requirements.