Fix how contacts are done in sample data.  ONLY DONE FOR ARC SO FAR.