Progress on Contacts refactor