Merged Angela's contacts implementation
Initial merge of Flavio's work