More work on the 'contacts' functionality.