Started adding explicity checks for city and zip diffs.