Basic Contacts integration
Merge branch 'contact_integration'