Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
Added source code, headers and unit tests for the CLIENTPIDMAP vCard Property for...
[xestiaab/.git] / source / contacteditor / ContactDataObject.cpp
index 05241d2..ffca460 100644 (file)
@@ -78,8 +78,11 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
        bool GenderProcessed = FALSE;
        bool BirthdayProcessed = FALSE;
        bool AnniversaryProcessed = FALSE;
+       bool UIDProcessed = FALSE;
+       bool RevisionProcessed = FALSE;
        int ContactLineLen = 0;
        int QuoteBreakPoint = 0;
+       int SourceCount = 0;
        int GroupCount = 0;
        int FNCount = 0;
        int NicknameCount = 0;
@@ -100,7 +103,14 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
        int PhotoCount = 0;
        int LogoCount = 0;
        int SoundCount = 0;
-       int CalAdrCount = 0;
+       int CalendarCount = 0;
+       int CalendarAddressCount = 0;
+       int FreeBusyAddressCount = 0;
+       int KeyCount = 0;
+       int VendorCount = 0;
+       int XTokenCount = 0;
+       int XMLCount = 0;
+       int ClientPIDCount = 0;
        wxString ContactLine;
        wxString PropertyLine;
        wxString PropertySeg1;
@@ -203,6 +213,26 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
                                
                        ProcessKind(PropertySeg2);
                
+               } else if (Property == wxT("UID") && UIDProcessed == FALSE){
+               
+                       UIDToken = PropertySeg2;
+                       UIDProcessed = TRUE;
+               
+               } else if (Property == wxT("SOURCE")){
+               
+                       ProcessSource(PropertySeg1, PropertySeg2, &SourceCount);
+                       SourceCount++;
+               
+               } else if (Property == wxT("XML")){
+               
+                       ProcessXML(PropertySeg1, PropertySeg2, &XMLCount);
+                       XMLCount++;
+               
+               } else if (Property == wxT("REV") && RevisionProcessed == FALSE){
+               
+                       ProcessRevision(PropertySeg1, PropertySeg2);
+                       RevisionProcessed = TRUE;
+               
                } else if (Property == wxT("MEMBER")){
 
                        ProcessMember(PropertySeg1, PropertySeg2, &GroupCount);
@@ -218,6 +248,11 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
                        ProcessN(PropertySeg1, PropertySeg2);
                        NameProcessed = TRUE;
                
+               } else if (Property == wxT("CLIENTPIDMAP")){
+               
+                       ProcessClientPIDMap(PropertySeg1, PropertySeg2, &ClientPIDCount);
+                       ClientPIDCount++;
+               
                } else if (Property == wxT("NICKNAME")){
                                                
                        ProcessNickname(PropertySeg1, PropertySeg2, &NicknameCount);
@@ -358,8 +393,38 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 
                        // See frmContactEditor-LoadCalendar.cpp
                        
-                       ProcessCalendarURI(PropertySeg1, PropertySeg2, &CalAdrCount);
-                       CalAdrCount++;
+                       ProcessCalendarURI(PropertySeg1, PropertySeg2, &CalendarCount);
+                       CalendarCount++;
+               
+               } else if (Property == wxT("CALADRURI")){
+               
+                       ProcessCalendarAddressURI(PropertySeg1, PropertySeg2, &CalendarAddressCount);
+                       CalendarAddressCount++;
+               
+               } else if (Property == wxT("FBURL")){
+
+                       // See frmContactEditor-LoadCalendar.cpp
+
+                       ProcessCalendarFreeBusy(PropertySeg1, PropertySeg2, &FreeBusyAddressCount);
+                       FreeBusyAddressCount++;
+
+               } else if (Property == wxT("KEY")){
+               
+                       // See frmContactEditor-LoadKey.cpp
+                       
+                       ProcessKey(PropertySeg1, PropertySeg2, &KeyCount);
+                       KeyCount++;
+               
+               } else if (Property.Mid(0, 3) == wxT("VND")){
+               
+                       ProcessVendor(PropertySeg1, PropertySeg2, &VendorCount);
+                       VendorCount++;
+               
+               } else if (Property.Mid(0, 2) == wxT("X-")){
+                       
+                       XTokenList.insert(std::make_pair(XTokenCount, PropertySeg2));
+                       XTokenListTokens.insert(std::make_pair(XTokenCount, PropertySeg1.Mid(2)));
+                       XTokenCount++;
                
                }
                
@@ -394,26 +459,27 @@ void ContactDataObject::ProcessKind(wxString KindType){
 
 }
 
-void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount){
+void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString PropertySeg2){
 
+       size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
-
-       int intPrevValue = 8;
-       int intPref = 0;                        
-       int intType = 0;
-       
-       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-
-       intPrevValue = 7;
-       
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
        wxString PropertyName;
        wxString PropertyValue;
-       wxString PropertyData;
        wxString PropertyTokens;
-       std::map<int,int>::iterator SLiter;
        bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 5;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
+       intPrevValue = 4;
+
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -427,91 +493,80 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
                
                intPrevValue = intiter->second;
                
-               CaptureString(&PropertyValue, FALSE);
-       
-               if (PropertyName == wxT("ALTID")){
-
-                       GroupsListAltID.erase(*GroupCount);
-                       GroupsListAltID.insert(std::make_pair(*GroupCount, PropertyValue));
+               // Process properties.
                
-               } else if (PropertyName == wxT("PID")){
-
-                       GroupsListPID.erase(*GroupCount);
-                       GroupsListPID.insert(std::make_pair(*GroupCount, PropertyValue));
+               size_t intPropertyValueLen = PropertyValue.Len();
                
-               } else if (PropertyName == wxT("PREF")){
-
-                       int PriorityNumber = 0;
-                       bool ValidNumber = TRUE;
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
                        
-                       try{
-                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
-                       }
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
                        
-                       catch(std::invalid_argument &e){
-                               ValidNumber = FALSE;
-                       }
-
-                       if (ValidNumber == TRUE){
-
-                               GroupsListPref.erase(*GroupCount);
-                               GroupsListPref.insert(std::make_pair(*GroupCount, PriorityNumber));
-               
-                       }
-               
-               } else if (PropertyName == wxT("MEDIATYPE")){
-
-                       GroupsListMediaType.erase(*GroupCount);
-                       GroupsListMediaType.insert(std::make_pair(*GroupCount, PropertyValue));
+               }                               
                
-               } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
                        
-                       if (FirstToken == TRUE){
+                       PropertyValue.Remove(0, 1);
+                       
+               }                       
+               
+               CaptureString(&PropertyValue, FALSE);
+                                                               
+               if (FirstToken == TRUE){
                                
-                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                               FirstToken = FALSE;
+                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                       FirstToken = FALSE;
                                
-                       } else {
-                       
-                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+               } else {
+                               
+                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                                
-                       }
-                       
                }
-               
-       }
-
-       GroupsList.insert(std::make_pair(*GroupCount, PropertySeg2));
-
+       
+       }       
+       
+       CaptureString(&PropertySeg2, FALSE);
+       
+       Revision = PropertySeg2;
+       
        if (!PropertyTokens.IsEmpty()){
        
-               GroupsListTokens.insert(std::make_pair(*GroupCount, PropertyTokens));
+               RevisionTokens = PropertyTokens;
        
        }
 
 
 }
 
-void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2, int *FNCount){
+void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySeg2, int *SourceCount){
 
+       size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
-
-       int intPrevValue = 4;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 8;
        int intPref = 0;                        
        int intType = 0;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-
-       intPrevValue = 3;
        
-       wxString PropertyName;
-       wxString PropertyValue;
-       wxString PropertyData;
-       wxString PropertyTokens;
-       std::map<int,int>::iterator SLiter;
-       bool FirstToken = TRUE;
+       intPrevValue = 7;
+       
+       PropertyType PropType = PROPERTY_NONE;
        
+       // Look for type before continuing.                     
+
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 7;
+
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -525,35 +580,37 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2,
                
                intPrevValue = intiter->second;
                
-               CaptureString(&PropertyValue, FALSE);
+               // Process properties.
                
-               if (PropertyName == wxT("TYPE")){
-
-                       if (!PropertyValue.IsEmpty() || PropertyValue == wxT("home") ||
-                               PropertyValue == wxT("work") ){
-
-                               FullNamesListType.erase(*FNCount);
-                               FullNamesListType.insert(std::make_pair(*FNCount, PropertyValue));
+               size_t intPropertyValueLen = PropertyValue.Len();
                
-                       }
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
                
-               } else if (PropertyName == wxT("LANGUAGE")){
-
-                       FullNamesListLanguage.erase(*FNCount);
-                       FullNamesListLanguage.insert(std::make_pair(*FNCount, PropertyValue));
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                       
                
-               } else if (PropertyName == wxT("ALTID")){
+               CaptureString(&PropertyValue, FALSE);
                
-                       FullNamesListAltID.erase(*FNCount);
-                       FullNamesListAltID.insert(std::make_pair(*FNCount, PropertyValue));
+               if (PropertyName == wxT("ALTID")){
+
+                       SourceListAltID.erase(*SourceCount);
+                       SourceListAltID.insert(std::make_pair(*SourceCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       FullNamesListPID.erase(*FNCount);
-                       FullNamesListPID.insert(std::make_pair(*FNCount, PropertyValue));
+                       SourceListPID.erase(*SourceCount);
+                       SourceListPID.insert(std::make_pair(*SourceCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
-
+                       
                        int PriorityNumber = 0;
                        bool ValidNumber = TRUE;
                        
@@ -567,50 +624,84 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2,
 
                        if (ValidNumber == TRUE){
 
-                               FullNamesListPref.erase(*FNCount);
-                               FullNamesListPref.insert(std::make_pair(*FNCount, PriorityNumber));
+                               SourceListPref.erase(*SourceCount);
+                               SourceListPref.insert(std::make_pair(*SourceCount, PriorityNumber));
 
                        }
                
-               } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+               } else if (PropertyName == wxT("MEDIATYPE")){
+               
+                       SourceListMediatype.erase(*SourceCount);
+                       SourceListMediatype.insert(std::make_pair(*SourceCount, PropertyValue));
+
+               } else {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
                        
-                       if (FirstToken == TRUE){
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       
+                               if (FirstToken == TRUE){
                                
-                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                               FirstToken = FALSE;
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
                                
-                       } else {
-                       
-                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               } else {
                                
-                       }
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                               }
                        
-               } 
+                       }
+               
+               }
+       
+       }       
+       
+       intPropertyLen = PropertySeg2.Len();
+       SplitPoints.clear();
+       SplitLength.clear();
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;
        
+       CaptureString(&PropertySeg2, FALSE);
+       
+       // Add the data to the General/Home/Work address variables.
+               
+       switch(PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME:
+                       SourceListType.insert(std::make_pair(*SourceCount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       SourceListType.insert(std::make_pair(*SourceCount, "work"));
+                       break;
        }
-
-       FullNamesList.insert(std::make_pair(*FNCount, PropertySeg2));
-
+       
+       SourceList.insert(std::make_pair(*SourceCount, PropertySeg2));
+       
        if (!PropertyTokens.IsEmpty()){
        
-               FullNamesListTokens.insert(std::make_pair(*FNCount, PropertyTokens));
+               SourceListTokens.insert(std::make_pair(*SourceCount, PropertyTokens));
        
        }
 
 }
 
-void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
+void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2, int *XMLCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
 
-       int intPrevValue = 3;
+       int intPrevValue = 5;
        int intPref = 0;                        
        int intType = 0;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-       
-       intPrevValue = 2;
+
+       intPrevValue = 4;
        
        wxString PropertyName;
        wxString PropertyValue;
@@ -633,190 +724,38 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
                intPrevValue = intiter->second;
                
                CaptureString(&PropertyValue, FALSE);
-               
+       
                if (PropertyName == wxT("ALTID")){
 
-                       NameAltID = PropertyValue;
-               
-               } else if (PropertyName == wxT("LANGUAGE")){
-               
-                       NameLanguage = PropertyValue;
+                       XMLListAltID.erase(*XMLCount);
+                       XMLListAltID.insert(std::make_pair(*XMLCount, PropertyValue));
                
-               } else if (PropertyName == wxT("SORT-AS")){
+               }
                
-                       if (PropertyValue.Left(1) == wxT("\"") && PropertyValue.Right(1) == wxT("\"") &&
-                               PropertyValue.Len() >= 3){
-                               NameDisplayAs = PropertyValue.Mid(1, (PropertyValue.Len() - 2));
-                       }
-               
-               } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
-                       
-                       if (FirstToken == TRUE){
-                               
-                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                               FirstToken = FALSE;
-                               
-                       } else {
-                       
-                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-                       }
-                       
-               }
-       
-       }
-       
-       // Split the name data.
-       
-       int intSplitSeek = 0;           
-       int intSplitsFound = 0;
-       int intSplitSize = 0;
-       int intPropertyLen = PropertySeg2.Len();
-       
-       std::map<int,wxString> NameValues;
-       intPrevValue = 0;                                       
-       
-       for (int i = 0; i <= intPropertyLen; i++){
-       
-               if (PropertySeg2.Mid(i, 1) == wxT(";") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){
-                       
-                       NameValues.insert(std::make_pair(++intSplitsFound, PropertySeg2.Mid(intSplitSeek, intSplitSize)));
-                       
-                       intSplitSeek = i;
-                       intSplitSeek++;
-                       
-                       if (intSplitsFound == 4){
-                       
-                               NameValues.insert(std::make_pair(++intSplitsFound, PropertySeg2.Mid(intSplitSeek, wxString::npos)));
-                               break;
-                       
-                       }
-                       
-                       intSplitSize = 0;
-                       continue;
-       
-               }
-               
-               intSplitSize++;
-
        }
-       
-       // Split the data into several parts.
-                       
-       for (std::map<int, wxString>::iterator iter = NameValues.begin(); 
-       iter != NameValues.end(); ++iter){
-       
-               if (iter->first == 1){
-               
-                       // Deal with family name.
-                       
-                       NameSurname = iter->second;
-               
-               } else if (iter->first == 2){
-               
-                       // Deal with given names.
-                       
-                       NameForename = iter->second;
-               
-               } else if (iter->first == 3){
-               
-                       // Deal with additional names.
-                       
-                       NameOtherNames = iter->second;
-               
-               } else if (iter->first == 4){
-               
-                       // Deal with honorifix prefixes and suffixes.
 
-                       NameTitle = iter->second;
-               
-                       iter++;
-                       
-                       if (iter == NameValues.end()){
-                       
-                               break;
-                       
-                       }
-               
-                       NameSuffix = iter->second;
-               
-               }
-       
-       }
-       
-       // Add the name token data.
-       
-       if (!PropertyTokens.IsEmpty()){
-       
-               NameTokens = PropertyTokens;
-       
-       }
+       XMLList.insert(std::make_pair(*XMLCount, PropertySeg2));
 
 }
 
-void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount){
+void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
 
-       int intPrevValue = 10;
+       int intPrevValue = 8;
        int intPref = 0;                        
+       int intType = 0;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+       intPrevValue = 7;
        
-       intPrevValue = 9;
-       
-       PropertyType PropType = PROPERTY_NONE;
-       
-       // Look for type before continuing.
-       
-       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
-       
-       intPrevValue = 9;
-       
-       std::map<int, wxString> *NicknamesList = NULL;
-       std::map<int, wxString> *NicknamesListType = NULL;
-       std::map<int, wxString> *NicknamesListLanguage = NULL;
-       std::map<int, wxString> *NicknamesListAltID = NULL;
-       std::map<int, wxString> *NicknamesListPID = NULL;
-       std::map<int, wxString> *NicknamesListTokens = NULL;            
-       std::map<int, int> *NicknamesListPref = NULL;
-       
-       switch(PropType){
-               case PROPERTY_NONE:
-                       NicknamesList = &GeneralNicknamesList;
-                       NicknamesListType = &GeneralNicknamesListType;
-                       NicknamesListLanguage = &GeneralNicknamesListLanguage;
-                       NicknamesListAltID = &GeneralNicknamesListAltID;
-                       NicknamesListPID = &GeneralNicknamesListPID;
-                       NicknamesListTokens = &GeneralNicknamesListTokens;
-                       NicknamesListPref = &GeneralNicknamesListPref;
-                       break;
-               case PROPERTY_HOME:
-                       NicknamesList = &HomeNicknamesList;
-                       NicknamesListType = &HomeNicknamesListType;
-                       NicknamesListLanguage = &HomeNicknamesListLanguage;
-                       NicknamesListAltID = &HomeNicknamesListAltID;
-                       NicknamesListPID = &HomeNicknamesListPID;
-                       NicknamesListTokens = &HomeNicknamesListTokens;
-                       NicknamesListPref = &HomeNicknamesListPref;
-                       break;
-               case PROPERTY_WORK:
-                       NicknamesList = &BusinessNicknamesList;
-                       NicknamesListType = &BusinessNicknamesListType;
-                       NicknamesListLanguage = &BusinessNicknamesListLanguage;
-                       NicknamesListAltID = &BusinessNicknamesListAltID;
-                       NicknamesListPID = &BusinessNicknamesListPID;
-                       NicknamesListTokens = &BusinessNicknamesListTokens;
-                       NicknamesListPref = &BusinessNicknamesListPref;
-                       break;
-       }
-       
-       std::map<int, int>::iterator SLiter;    
-       wxString PropertyData;
        wxString PropertyName;
        wxString PropertyValue;
+       wxString PropertyData;
        wxString PropertyTokens;
+       std::map<int,int>::iterator SLiter;
        bool FirstToken = TRUE;
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
@@ -833,17 +772,17 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property
                intPrevValue = intiter->second;
                
                CaptureString(&PropertyValue, FALSE);
-               
+       
                if (PropertyName == wxT("ALTID")){
 
-                       NicknamesListAltID->erase(*NicknameCount);
-                       NicknamesListAltID->insert(std::make_pair(*NicknameCount, PropertyValue));
+                       GroupsListAltID.erase(*GroupCount);
+                       GroupsListAltID.insert(std::make_pair(*GroupCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       NicknamesListPID->erase(*NicknameCount);
-                       NicknamesListPID->insert(std::make_pair(*NicknameCount, PropertyValue));        
-
+                       GroupsListPID.erase(*GroupCount);
+                       GroupsListPID.insert(std::make_pair(*GroupCount, PropertyValue));
+               
                } else if (PropertyName == wxT("PREF")){
 
                        int PriorityNumber = 0;
@@ -859,67 +798,63 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property
 
                        if (ValidNumber == TRUE){
 
-                               NicknamesListPref->erase(*NicknameCount);
-                               NicknamesListPref->insert(std::make_pair(*NicknameCount, PriorityNumber));
-
+                               GroupsListPref.erase(*GroupCount);
+                               GroupsListPref.insert(std::make_pair(*GroupCount, PriorityNumber));
+               
                        }
                
-               } else if (PropertyName == wxT("LANGUAGE")){
-
-                       NicknamesListLanguage->erase(*NicknameCount);
-                       NicknamesListLanguage->insert(std::make_pair(*NicknameCount, PropertyValue));   
+               } else if (PropertyName == wxT("MEDIATYPE")){
 
-               } else {
-               
-                       // Something else we don't know about so append
-                       // to the tokens variable.
-               
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       GroupsListMediaType.erase(*GroupCount);
+                       GroupsListMediaType.insert(std::make_pair(*GroupCount, PropertyValue));
                
-                               if (FirstToken == TRUE){
-                       
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                       
-                               } else {
+               } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
                        
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                       if (FirstToken == TRUE){
+                               
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+                               
+                       } else {
                        
-                               }
-               
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
                        }
-               
+                       
                }
                
        }
-       
-       NicknamesList->insert(std::make_pair(*NicknameCount, PropertySeg2));
-       
-       // Add the name token data.
-       
+
+       GroupsList.insert(std::make_pair(*GroupCount, PropertySeg2));
+
        if (!PropertyTokens.IsEmpty()){
        
-               NicknamesListTokens->insert(std::make_pair(*NicknameCount, PropertyTokens));
+               GroupsListTokens.insert(std::make_pair(*GroupCount, PropertyTokens));
        
        }
 
+
 }
 
-void ContactDataObject::ProcessGender(wxString PropertySeg1, wxString PropertySeg2){
+void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2, int *FNCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
-       std::map<int, int>::iterator SLiter;                    
-       wxString PropertyData;
+
+       int intPrevValue = 4;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+       intPrevValue = 3;
+       
        wxString PropertyName;
        wxString PropertyValue;
+       wxString PropertyData;
        wxString PropertyTokens;
+       std::map<int,int>::iterator SLiter;
        bool FirstToken = TRUE;
-       int intPrevValue = 8;
-
-       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-
-       intPrevValue = 7;                       
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -934,328 +869,330 @@ void ContactDataObject::ProcessGender(wxString PropertySeg1, wxString PropertySe
                
                intPrevValue = intiter->second;
                
-               // Process properties.
+               CaptureString(&PropertyValue, FALSE);
                
-               size_t intPropertyValueLen = PropertyValue.Len();
+               if (PropertyName == wxT("TYPE")){
+
+                       if (!PropertyValue.IsEmpty() || PropertyValue == wxT("home") ||
+                               PropertyValue == wxT("work") ){
+
+                               FullNamesListType.erase(*FNCount);
+                               FullNamesListType.insert(std::make_pair(*FNCount, PropertyValue));
                
-               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
-                       
-                       PropertyValue.Trim();
-                       PropertyValue.RemoveLast();
-                       
-               }                               
+                       }
                
-               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+               } else if (PropertyName == wxT("LANGUAGE")){
+
+                       FullNamesListLanguage.erase(*FNCount);
+                       FullNamesListLanguage.insert(std::make_pair(*FNCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("ALTID")){
+               
+                       FullNamesListAltID.erase(*FNCount);
+                       FullNamesListAltID.insert(std::make_pair(*FNCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       FullNamesListPID.erase(*FNCount);
+                       FullNamesListPID.insert(std::make_pair(*FNCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PREF")){
+
+                       int PriorityNumber = 0;
+                       bool ValidNumber = TRUE;
                        
-                       PropertyValue.Remove(0, 1);
+                       try{
+                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
+                       }
                        
-               }                               
-               
-               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+                       catch(std::invalid_argument &e){
+                               ValidNumber = FALSE;
+                       }
+
+                       if (ValidNumber == TRUE){
 
+                               FullNamesListPref.erase(*FNCount);
+                               FullNamesListPref.insert(std::make_pair(*FNCount, PriorityNumber));
+
+                       }
+               
+               } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+                       
                        if (FirstToken == TRUE){
-       
+                               
                                PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
                                FirstToken = FALSE;
-       
+                               
                        } else {
-       
+                       
                                PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-       
+                               
                        }
-
-               }
-       
-       }       
-
-       wxStringTokenizer GenderData (PropertySeg2, wxT(";"));
-       
-       wxString GenderComponent;
-       
-       if (GenderData.CountTokens() >= 2){
-       
-               Gender = GenderData.GetNextToken();
-               GenderDetails = GenderData.GetString();
-       
-               CaptureString(&GenderDetails, FALSE);
-                                               
-       } else {
-       
-               Gender = GenderData.GetNextToken();
+                       
+               } 
        
        }
-       
+
+       FullNamesList.insert(std::make_pair(*FNCount, PropertySeg2));
+
        if (!PropertyTokens.IsEmpty()){
        
-               GenderTokens = PropertyTokens;
+               FullNamesListTokens.insert(std::make_pair(*FNCount, PropertyTokens));
        
        }
 
 }
 
-void ContactDataObject::ProcessBirthday(wxString PropertySeg1, wxString PropertySeg2){
-
-       // Process date. Preserve the remainder in the string.
+void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
-       std::map<int, int>::iterator SLiter;                    
-       wxString PropertyData;
-       wxString PropertyName;
-       wxString PropertyValue;
-       wxString PropertyTokens;
-       bool BirthdayText = FALSE;
-       int intPrevValue = 6;
-
-       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-
-       intPrevValue = 5;
-
-       // Look for type before continuing.
-
-       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
-       intiter != SplitPoints.end(); ++intiter){
-
-               SLiter = SplitLength.find(intiter->first);
 
-               PropertyData = PropertySeg1.Mid(intPrevValue, SLiter->second);
-       
-               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
-               PropertyName = PropertyElement.GetNextToken();                          
-               PropertyValue = PropertyElement.GetNextToken();
-       
-               intPrevValue = intiter->second;
-       
-               if (PropertyName == wxT("VALUE") && PropertyValue == wxT("text") && BirthdayText == FALSE){
+       int intPrevValue = 3;
+       int intPref = 0;                        
+       int intType = 0;
        
-                       CaptureString(&PropertySeg2, FALSE);
-                       Birthday = PropertySeg2;
-                       BirthdayText = TRUE;
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-               }
-
-       }
-
-       // Setup blank lines for later on.
+       intPrevValue = 2;
        
-       intPrevValue = 5;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyData;
+       wxString PropertyTokens;
+       std::map<int,int>::iterator SLiter;
        bool FirstToken = TRUE;
-
+       
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
-
+       
                SLiter = SplitLength.find(intiter->first);
-
-               PropertyData = PropertySeg1.Mid(intPrevValue, SLiter->second);
        
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
                wxStringTokenizer PropertyElement (PropertyData, wxT("="));
                PropertyName = PropertyElement.GetNextToken();                          
                PropertyValue = PropertyElement.GetNextToken();
-       
+               
                intPrevValue = intiter->second;
-       
-               // Process properties.
-       
+               
                CaptureString(&PropertyValue, FALSE);
-       
-               if (PropertyValue.Mid((PropertyValue.Len() - 1), 1) == wxT("\"")){
                
-                       PropertyValue.Trim();
-                       PropertyValue.RemoveLast();
+               if (PropertyName == wxT("ALTID")){
+
+                       NameAltID = PropertyValue;
                
-               }                               
-       
-               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+               } else if (PropertyName == wxT("LANGUAGE")){
                
-                       PropertyValue.Remove(0, 1);
+                       NameLanguage = PropertyValue;
                
-               }                               
-       
-               if (PropertyName == wxT("ALTID")){
-
-                       BirthdayAltID = PropertyValue;
-       
-               } else if (PropertyName == wxT("CALSCALE")){
-       
-                       BirthdayCalScale = PropertyValue;
-       
-               } else if (PropertyName != wxT("VALUE")) {
-       
-                       // Something else we don't know about so append
-                       // to the tokens variable.
+               } else if (PropertyName == wxT("SORT-AS")){
                
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+                       if (PropertyValue.Left(1) == wxT("\"") && PropertyValue.Right(1) == wxT("\"") &&
+                               PropertyValue.Len() >= 3){
+                               NameDisplayAs = PropertyValue.Mid(1, (PropertyValue.Len() - 2));
+                       }
                
-                               if (FirstToken == TRUE){
-       
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-       
-                               } else {
-       
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-       
-                               }
+               } else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+                       
+                       if (FirstToken == TRUE){
+                               
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+                               
+                       } else {
+                       
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                                
                        }
                        
                }
-
-       }       
-
-       // Add the data to the variables and form.
-       
-       if (BirthdayText == FALSE){
-       
-               Birthday = PropertySeg2;
-
-       }
-       
-       if (!PropertyTokens.IsEmpty()){
        
-               BirthdayTokens = PropertyTokens;
-
        }
-
-}
-
-void ContactDataObject::ProcessAnniversary(wxString PropertySeg1, wxString PropertySeg2){
-
-       // Process date. Preserve the remainder in the string.
-
-       std::map<int, int> SplitPoints;
-       std::map<int, int> SplitLength;
-       std::map<int, int>::iterator SLiter;                    
-       wxString PropertyData;
-       wxString PropertyName;
-       wxString PropertyValue;
-       wxString PropertyTokens;
-       bool AnniversaryText = FALSE;
-       int intPrevValue = 13;
-
-       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-
-       intPrevValue = 12;
-
-       // Look for type before continuing.
-
-       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
-       intiter != SplitPoints.end(); ++intiter){
-
-               SLiter = SplitLength.find(intiter->first);
-
-               PropertyData = PropertySeg1.Mid(intPrevValue, SLiter->second);
        
-               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
-               PropertyName = PropertyElement.GetNextToken();                          
-               PropertyValue = PropertyElement.GetNextToken();
+       // Split the name data.
        
-               intPrevValue = intiter->second;
+       int intSplitSeek = 0;           
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPropertyLen = PropertySeg2.Len();
        
-               if (PropertyName == wxT("VALUE") && PropertyValue == wxT("text") && AnniversaryText == FALSE){
+       std::map<int,wxString> NameValues;
+       intPrevValue = 0;                                       
        
-                       CaptureString(&PropertySeg2, FALSE);
-                       Anniversary = PropertySeg2;
-                       AnniversaryText = TRUE;
+       for (int i = 0; i <= intPropertyLen; i++){
        
-               }
-
+               if (PropertySeg2.Mid(i, 1) == wxT(";") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){
+                       
+                       NameValues.insert(std::make_pair(++intSplitsFound, PropertySeg2.Mid(intSplitSeek, intSplitSize)));
+                       
+                       intSplitSeek = i;
+                       intSplitSeek++;
+                       
+                       if (intSplitsFound == 4){
+                       
+                               NameValues.insert(std::make_pair(++intSplitsFound, PropertySeg2.Mid(intSplitSeek, wxString::npos)));
+                               break;
+                       
+                       }
+                       
+                       intSplitSize = 0;
+                       continue;
+       
+               }
+               
+               intSplitSize++;
+
        }
+       
+       // Split the data into several parts.
+                       
+       for (std::map<int, wxString>::iterator iter = NameValues.begin(); 
+       iter != NameValues.end(); ++iter){
+       
+               if (iter->first == 1){
+               
+                       // Deal with family name.
+                       
+                       NameSurname = iter->second;
+               
+               } else if (iter->first == 2){
+               
+                       // Deal with given names.
+                       
+                       NameForename = iter->second;
+               
+               } else if (iter->first == 3){
+               
+                       // Deal with additional names.
+                       
+                       NameOtherNames = iter->second;
+               
+               } else if (iter->first == 4){
+               
+                       // Deal with honorifix prefixes and suffixes.
 
-       // Setup blank lines for later on.
+                       NameTitle = iter->second;
+               
+                       iter++;
+                       
+                       if (iter == NameValues.end()){
+                       
+                               break;
+                       
+                       }
+               
+                       NameSuffix = iter->second;
+               
+               }
        
-       intPrevValue = 12;
+       }
+       
+       // Add the name token data.
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               NameTokens = PropertyTokens;
+       
+       }
+
+}
+
+void ContactDataObject::ProcessClientPIDMap(wxString PropertySeg1, wxString PropertySeg2, int *ClientPIDCount){
+
+       size_t intPropertyLen = PropertySeg1.Len();
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
        bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 14;
+       int intPref = 0;                        
+       int intType = 0;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 13;
 
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
-
+       
                SLiter = SplitLength.find(intiter->first);
-
-               PropertyData = PropertySeg1.Mid(intPrevValue, SLiter->second);
        
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
                wxStringTokenizer PropertyElement (PropertyData, wxT("="));
                PropertyName = PropertyElement.GetNextToken();                          
                PropertyValue = PropertyElement.GetNextToken();
-       
+               
                intPrevValue = intiter->second;
-       
+               
                // Process properties.
-       
-               CaptureString(&PropertyValue, FALSE);
-       
-               if (PropertyValue.Mid((PropertyValue.Len() - 1), 1) == wxT("\"")){
                
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
                        PropertyValue.Trim();
                        PropertyValue.RemoveLast();
-               
+                       
                }                               
-       
-               if (PropertyValue.Mid(0, 1) == wxT("\"")){
                
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
                        PropertyValue.Remove(0, 1);
+                       
+               }                       
                
-               }                               
-       
-               if (PropertyName == wxT("ALTID")){
-
-                       AnniversaryAltID = PropertyValue;
-       
-               } else if (PropertyName == wxT("CALSCALE")){
-       
-                       AnniversaryCalScale = PropertyValue;
-       
-               } else if (PropertyName != wxT("VALUE")) {
-       
-                       // Something else we don't know about so append
-                       // to the tokens variable.
+               CaptureString(&PropertyValue, FALSE);
                
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+               if (PropertyName.IsEmpty() || PropertyName.IsEmpty()){
                
-                               if (FirstToken == TRUE){
-       
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-       
-                               } else {
-       
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-       
-                               }
+                       continue;
+               
+               }
+                                                       
+               if (FirstToken == TRUE){
+                               
+                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                       FirstToken = FALSE;
+                               
+               } else {
+                               
+                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                                
-                       }
-                       
                }
-
+       
        }       
-
-       // Add the data to the variables and form.
        
-       if (AnniversaryText == FALSE){
+       CaptureString(&PropertySeg2, FALSE);
        
-               Anniversary = PropertySeg2;
-
-       }
+       ClientPIDList.insert(std::make_pair(*ClientPIDCount, PropertySeg2));
        
        if (!PropertyTokens.IsEmpty()){
        
-               AnniversaryTokens = PropertyTokens;
-
+               ClientPIDListTokens.insert(std::make_pair(*ClientPIDCount, PropertyTokens));
+       
        }
 
 }
 
-void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString PropertySeg2, int *TimeZoneCount){
+void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
 
-       int intPrevValue = 4;
+       int intPrevValue = 10;
        int intPref = 0;                        
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 3;
+       intPrevValue = 9;
        
        PropertyType PropType = PROPERTY_NONE;
        
@@ -1263,43 +1200,43 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
        
        CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
        
-       intPrevValue = 3;
+       intPrevValue = 9;
        
-       std::map<int, wxString> *TZList = NULL;
-       std::map<int, wxString> *TZListType = NULL;
-       std::map<int, wxString> *TZListMediatype = NULL;
-       std::map<int, wxString> *TZListAltID = NULL;
-       std::map<int, wxString> *TZListPID = NULL;
-       std::map<int, wxString> *TZListTokens = NULL;           
-       std::map<int, int> *TZListPref = NULL;
+       std::map<int, wxString> *NicknamesList = NULL;
+       std::map<int, wxString> *NicknamesListType = NULL;
+       std::map<int, wxString> *NicknamesListLanguage = NULL;
+       std::map<int, wxString> *NicknamesListAltID = NULL;
+       std::map<int, wxString> *NicknamesListPID = NULL;
+       std::map<int, wxString> *NicknamesListTokens = NULL;            
+       std::map<int, int> *NicknamesListPref = NULL;
        
        switch(PropType){
                case PROPERTY_NONE:
-                       TZList = &GeneralTZList;
-                       TZListType = &GeneralTZListType;
-                       TZListMediatype = &GeneralTZListMediatype;
-                       TZListAltID = &GeneralTZListAltID;
-                       TZListPID = &GeneralTZListPID;
-                       TZListTokens = &GeneralTZListTokens;
-                       TZListPref = &GeneralTZListPref;
+                       NicknamesList = &GeneralNicknamesList;
+                       NicknamesListType = &GeneralNicknamesListType;
+                       NicknamesListLanguage = &GeneralNicknamesListLanguage;
+                       NicknamesListAltID = &GeneralNicknamesListAltID;
+                       NicknamesListPID = &GeneralNicknamesListPID;
+                       NicknamesListTokens = &GeneralNicknamesListTokens;
+                       NicknamesListPref = &GeneralNicknamesListPref;
                        break;
                case PROPERTY_HOME:
-                       TZList = &HomeTZList;
-                       TZListType = &HomeTZListType;
-                       TZListMediatype = &HomeTZListMediatype;
-                       TZListAltID = &HomeTZListAltID;
-                       TZListPID = &HomeTZListPID;
-                       TZListTokens = &HomeTZListTokens;
-                       TZListPref = &HomeTZListPref;
+                       NicknamesList = &HomeNicknamesList;
+                       NicknamesListType = &HomeNicknamesListType;
+                       NicknamesListLanguage = &HomeNicknamesListLanguage;
+                       NicknamesListAltID = &HomeNicknamesListAltID;
+                       NicknamesListPID = &HomeNicknamesListPID;
+                       NicknamesListTokens = &HomeNicknamesListTokens;
+                       NicknamesListPref = &HomeNicknamesListPref;
                        break;
                case PROPERTY_WORK:
-                       TZList = &BusinessTZList;
-                       TZListType = &BusinessTZListType;
-                       TZListMediatype = &BusinessTZListMediatype;
-                       TZListAltID = &BusinessTZListAltID;
-                       TZListPID = &BusinessTZListPID;
-                       TZListTokens = &BusinessTZListTokens;
-                       TZListPref = &BusinessTZListPref;
+                       NicknamesList = &BusinessNicknamesList;
+                       NicknamesListType = &BusinessNicknamesListType;
+                       NicknamesListLanguage = &BusinessNicknamesListLanguage;
+                       NicknamesListAltID = &BusinessNicknamesListAltID;
+                       NicknamesListPID = &BusinessNicknamesListPID;
+                       NicknamesListTokens = &BusinessNicknamesListTokens;
+                       NicknamesListPref = &BusinessNicknamesListPref;
                        break;
        }
        
@@ -1324,16 +1261,16 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
                intPrevValue = intiter->second;
                
                CaptureString(&PropertyValue, FALSE);
-
+               
                if (PropertyName == wxT("ALTID")){
 
-                       TZListAltID->erase(*TimeZoneCount);
-                       TZListAltID->insert(std::make_pair(*TimeZoneCount, PropertyValue));
+                       NicknamesListAltID->erase(*NicknameCount);
+                       NicknamesListAltID->insert(std::make_pair(*NicknameCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       TZListPID->erase(*TimeZoneCount);
-                       TZListPID->insert(std::make_pair(*TimeZoneCount, PropertyValue));       
+                       NicknamesListPID->erase(*NicknameCount);
+                       NicknamesListPID->insert(std::make_pair(*NicknameCount, PropertyValue));        
 
                } else if (PropertyName == wxT("PREF")){
 
@@ -1350,15 +1287,15 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
 
                        if (ValidNumber == TRUE){
 
-                               TZListPref->erase(*TimeZoneCount);
-                               TZListPref->insert(std::make_pair(*TimeZoneCount, PriorityNumber));
+                               NicknamesListPref->erase(*NicknameCount);
+                               NicknamesListPref->insert(std::make_pair(*NicknameCount, PriorityNumber));
 
                        }
                
-               } else if (PropertyName == wxT("MEDIATYPE")){
+               } else if (PropertyName == wxT("LANGUAGE")){
 
-                       TZListMediatype->erase(*TimeZoneCount);
-                       TZListMediatype->insert(std::make_pair(*TimeZoneCount, PropertyValue)); 
+                       NicknamesListLanguage->erase(*NicknameCount);
+                       NicknamesListLanguage->insert(std::make_pair(*NicknameCount, PropertyValue));   
 
                } else {
                
@@ -1384,20 +1321,511 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
                
        }
        
-       TZList->insert(std::make_pair(*TimeZoneCount, PropertySeg2));
+       NicknamesList->insert(std::make_pair(*NicknameCount, PropertySeg2));
        
        // Add the name token data.
        
        if (!PropertyTokens.IsEmpty()){
        
-               TZListTokens->insert(std::make_pair(*TimeZoneCount, PropertyTokens));
+               NicknamesListTokens->insert(std::make_pair(*NicknameCount, PropertyTokens));
        
        }
 
-
 }
 
-void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertySeg2, int *AddressCount){
+void ContactDataObject::ProcessGender(wxString PropertySeg1, wxString PropertySeg2){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intPrevValue = 8;
+
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+       intPrevValue = 7;                       
+       
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                               
+               
+               if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+
+                       if (FirstToken == TRUE){
+       
+                               PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                               FirstToken = FALSE;
+       
+                       } else {
+       
+                               PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+       
+                       }
+
+               }
+       
+       }       
+
+       wxStringTokenizer GenderData (PropertySeg2, wxT(";"));
+       
+       wxString GenderComponent;
+       
+       if (GenderData.CountTokens() >= 2){
+       
+               Gender = GenderData.GetNextToken();
+               GenderDetails = GenderData.GetString();
+       
+               CaptureString(&GenderDetails, FALSE);
+                                               
+       } else {
+       
+               Gender = GenderData.GetNextToken();
+       
+       }
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               GenderTokens = PropertyTokens;
+       
+       }
+
+}
+
+void ContactDataObject::ProcessBirthday(wxString PropertySeg1, wxString PropertySeg2){
+
+       // Process date. Preserve the remainder in the string.
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool BirthdayText = FALSE;
+       int intPrevValue = 6;
+
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+       intPrevValue = 5;
+
+       // Look for type before continuing.
+
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+
+               SLiter = SplitLength.find(intiter->first);
+
+               PropertyData = PropertySeg1.Mid(intPrevValue, SLiter->second);
+       
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+       
+               intPrevValue = intiter->second;
+       
+               if (PropertyName == wxT("VALUE") && PropertyValue == wxT("text") && BirthdayText == FALSE){
+       
+                       CaptureString(&PropertySeg2, FALSE);
+                       Birthday = PropertySeg2;
+                       BirthdayText = TRUE;
+       
+               }
+
+       }
+
+       // Setup blank lines for later on.
+       
+       intPrevValue = 5;
+       bool FirstToken = TRUE;
+
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+
+               SLiter = SplitLength.find(intiter->first);
+
+               PropertyData = PropertySeg1.Mid(intPrevValue, SLiter->second);
+       
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+       
+               intPrevValue = intiter->second;
+       
+               // Process properties.
+       
+               CaptureString(&PropertyValue, FALSE);
+       
+               if (PropertyValue.Mid((PropertyValue.Len() - 1), 1) == wxT("\"")){
+               
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+               
+               }                               
+       
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+               
+                       PropertyValue.Remove(0, 1);
+               
+               }                               
+       
+               if (PropertyName == wxT("ALTID")){
+
+                       BirthdayAltID = PropertyValue;
+       
+               } else if (PropertyName == wxT("CALSCALE")){
+       
+                       BirthdayCalScale = PropertyValue;
+       
+               } else if (PropertyName != wxT("VALUE")) {
+       
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+               
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+               
+                               if (FirstToken == TRUE){
+       
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+       
+                               } else {
+       
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+       
+                               }
+                               
+                       }
+                       
+               }
+
+       }       
+
+       // Add the data to the variables and form.
+       
+       if (BirthdayText == FALSE){
+       
+               Birthday = PropertySeg2;
+
+       }
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               BirthdayTokens = PropertyTokens;
+
+       }
+
+}
+
+void ContactDataObject::ProcessAnniversary(wxString PropertySeg1, wxString PropertySeg2){
+
+       // Process date. Preserve the remainder in the string.
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool AnniversaryText = FALSE;
+       int intPrevValue = 13;
+
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+       intPrevValue = 12;
+
+       // Look for type before continuing.
+
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+
+               SLiter = SplitLength.find(intiter->first);
+
+               PropertyData = PropertySeg1.Mid(intPrevValue, SLiter->second);
+       
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+       
+               intPrevValue = intiter->second;
+       
+               if (PropertyName == wxT("VALUE") && PropertyValue == wxT("text") && AnniversaryText == FALSE){
+       
+                       CaptureString(&PropertySeg2, FALSE);
+                       Anniversary = PropertySeg2;
+                       AnniversaryText = TRUE;
+       
+               }
+
+       }
+
+       // Setup blank lines for later on.
+       
+       intPrevValue = 12;
+       bool FirstToken = TRUE;
+
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+
+               SLiter = SplitLength.find(intiter->first);
+
+               PropertyData = PropertySeg1.Mid(intPrevValue, SLiter->second);
+       
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+       
+               intPrevValue = intiter->second;
+       
+               // Process properties.
+       
+               CaptureString(&PropertyValue, FALSE);
+       
+               if (PropertyValue.Mid((PropertyValue.Len() - 1), 1) == wxT("\"")){
+               
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+               
+               }                               
+       
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+               
+                       PropertyValue.Remove(0, 1);
+               
+               }                               
+       
+               if (PropertyName == wxT("ALTID")){
+
+                       AnniversaryAltID = PropertyValue;
+       
+               } else if (PropertyName == wxT("CALSCALE")){
+       
+                       AnniversaryCalScale = PropertyValue;
+       
+               } else if (PropertyName != wxT("VALUE")) {
+       
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+               
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+               
+                               if (FirstToken == TRUE){
+       
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+       
+                               } else {
+       
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+       
+                               }
+                               
+                       }
+                       
+               }
+
+       }       
+
+       // Add the data to the variables and form.
+       
+       if (AnniversaryText == FALSE){
+       
+               Anniversary = PropertySeg2;
+
+       }
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               AnniversaryTokens = PropertyTokens;
+
+       }
+
+}
+
+void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString PropertySeg2, int *TimeZoneCount){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+
+       int intPrevValue = 4;
+       int intPref = 0;                        
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 3;
+       
+       PropertyType PropType = PROPERTY_NONE;
+       
+       // Look for type before continuing.
+       
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+       
+       intPrevValue = 3;
+       
+       std::map<int, wxString> *TZList = NULL;
+       std::map<int, wxString> *TZListType = NULL;
+       std::map<int, wxString> *TZListMediatype = NULL;
+       std::map<int, wxString> *TZListAltID = NULL;
+       std::map<int, wxString> *TZListPID = NULL;
+       std::map<int, wxString> *TZListTokens = NULL;           
+       std::map<int, int> *TZListPref = NULL;
+       
+       switch(PropType){
+               case PROPERTY_NONE:
+                       TZList = &GeneralTZList;
+                       TZListType = &GeneralTZListType;
+                       TZListMediatype = &GeneralTZListMediatype;
+                       TZListAltID = &GeneralTZListAltID;
+                       TZListPID = &GeneralTZListPID;
+                       TZListTokens = &GeneralTZListTokens;
+                       TZListPref = &GeneralTZListPref;
+                       break;
+               case PROPERTY_HOME:
+                       TZList = &HomeTZList;
+                       TZListType = &HomeTZListType;
+                       TZListMediatype = &HomeTZListMediatype;
+                       TZListAltID = &HomeTZListAltID;
+                       TZListPID = &HomeTZListPID;
+                       TZListTokens = &HomeTZListTokens;
+                       TZListPref = &HomeTZListPref;
+                       break;
+               case PROPERTY_WORK:
+                       TZList = &BusinessTZList;
+                       TZListType = &BusinessTZListType;
+                       TZListMediatype = &BusinessTZListMediatype;
+                       TZListAltID = &BusinessTZListAltID;
+                       TZListPID = &BusinessTZListPID;
+                       TZListTokens = &BusinessTZListTokens;
+                       TZListPref = &BusinessTZListPref;
+                       break;
+       }
+       
+       std::map<int, int>::iterator SLiter;    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               CaptureString(&PropertyValue, FALSE);
+
+               if (PropertyName == wxT("ALTID")){
+
+                       TZListAltID->erase(*TimeZoneCount);
+                       TZListAltID->insert(std::make_pair(*TimeZoneCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       TZListPID->erase(*TimeZoneCount);
+                       TZListPID->insert(std::make_pair(*TimeZoneCount, PropertyValue));       
+
+               } else if (PropertyName == wxT("PREF")){
+
+                       int PriorityNumber = 0;
+                       bool ValidNumber = TRUE;
+                       
+                       try{
+                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
+                       }
+                       
+                       catch(std::invalid_argument &e){
+                               ValidNumber = FALSE;
+                       }
+
+                       if (ValidNumber == TRUE){
+
+                               TZListPref->erase(*TimeZoneCount);
+                               TZListPref->insert(std::make_pair(*TimeZoneCount, PriorityNumber));
+
+                       }
+               
+               } else if (PropertyName == wxT("MEDIATYPE")){
+
+                       TZListMediatype->erase(*TimeZoneCount);
+                       TZListMediatype->insert(std::make_pair(*TimeZoneCount, PropertyValue)); 
+
+               } else {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+               
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+               
+                               if (FirstToken == TRUE){
+                       
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                       
+                               } else {
+                       
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                       
+                               }
+               
+                       }
+               
+               }
+               
+       }
+       
+       TZList->insert(std::make_pair(*TimeZoneCount, PropertySeg2));
+       
+       // Add the name token data.
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               TZListTokens->insert(std::make_pair(*TimeZoneCount, PropertyTokens));
+       
+       }
+
+
+}
+
+void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertySeg2, int *AddressCount){
 
        size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
@@ -1844,10 +2272,161 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg
                        EmailListAltID->erase(*EmailCount);
                        EmailListAltID->insert(std::make_pair(*EmailCount, PropertyValue));
                
-               } else if (PropertyName == wxT("PID")){
+               } else if (PropertyName == wxT("PID")){
+
+                       EmailListPID->erase(*EmailCount);
+                       EmailListPID->insert(std::make_pair(*EmailCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PREF")){
+                       
+                       int PriorityNumber = 0;
+                       bool ValidNumber = TRUE;
+                       
+                       try{
+                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
+                       }
+                       
+                       catch(std::invalid_argument &e){
+                               ValidNumber = FALSE;
+                       }
+
+                       if (ValidNumber == TRUE){
+
+                               EmailListPref->erase(*EmailCount);
+                               EmailListPref->insert(std::make_pair(*EmailCount, PriorityNumber));
+
+                       }
+               
+               } else {
+               
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       
+                               if (FirstToken == TRUE){
+                               
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                               
+                               } else {
+                               
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                               }
+                       
+                       }
+               
+               }
+       
+       }
+       
+       EmailList->insert(std::make_pair(*EmailCount, PropertySeg2));
+       
+       // Add the name token data.
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               EmailListTokens->insert(std::make_pair(*EmailCount, PropertyTokens));
+       
+       }       
+
+
+}
+
+void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2, int *IMCount){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+
+       int intPrevValue = 6;
+       int intPref = 0;                        
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 5;
+       
+       PropertyType PropType = PROPERTY_NONE;
+               
+       // Look for type before continuing.
+       
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+       
+       std::map<int, wxString> *IMList = NULL;
+       std::map<int, wxString> *IMListType = NULL;
+       std::map<int, wxString> *IMListAltID = NULL;
+       std::map<int, wxString> *IMListPID = NULL;
+       std::map<int, wxString> *IMListTokens = NULL;
+       std::map<int, wxString> *IMListMediatype = NULL;        
+       std::map<int, int> *IMListPref = NULL;
+
+       switch(PropType){
+               case PROPERTY_NONE:
+                       IMList = &GeneralIMList;
+                       IMListType = &GeneralIMListType;
+                       IMListAltID = &GeneralIMListAltID;
+                       IMListPID = &GeneralIMListPID;
+                       IMListTokens = &GeneralIMListTokens;
+                       IMListMediatype = &GeneralIMListMediatype;
+                       IMListPref = &GeneralIMListPref;        
+                       break;
+               case PROPERTY_HOME:
+                       IMList = &HomeIMList;
+                       IMListType = &HomeIMListType;
+                       IMListAltID = &HomeIMListAltID;
+                       IMListPID = &HomeIMListPID;
+                       IMListTokens = &HomeIMListTokens;
+                       IMListMediatype = &HomeIMListMediatype;         
+                       IMListPref = &HomeIMListPref;   
+                       break;
+               case PROPERTY_WORK:
+                       IMList = &BusinessIMList;
+                       IMListType = &BusinessIMListType;
+                       IMListAltID = &BusinessIMListAltID;
+                       IMListPID = &BusinessIMListPID;
+                       IMListTokens = &BusinessIMListTokens;   
+                       IMListMediatype = &BusinessIMListMediatype;     
+                       IMListPref = &BusinessIMListPref;       
+                       break;
+       }
+       
+       intPrevValue = 5;
+       
+       std::map<int,int>::iterator SLiter;
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               // Process properties.
+               
+               if (PropertyName == wxT("ALTID")){
+
+                       IMListAltID->erase(*IMCount);
+                       IMListAltID->insert(std::make_pair(*IMCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       IMListPID->erase(*IMCount);
+                       IMListPID->insert(std::make_pair(*IMCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("MEDIATYPE")){
 
-                       EmailListPID->erase(*EmailCount);
-                       EmailListPID->insert(std::make_pair(*EmailCount, PropertyValue));
+                       IMListMediatype->erase(*IMCount);
+                       IMListMediatype->insert(std::make_pair(*IMCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
                        
@@ -1864,8 +2443,8 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg
 
                        if (ValidNumber == TRUE){
 
-                               EmailListPref->erase(*EmailCount);
-                               EmailListPref->insert(std::make_pair(*EmailCount, PriorityNumber));
+                               IMListPref->erase(*IMCount);
+                               IMListPref->insert(std::make_pair(*IMCount, PriorityNumber));
 
                        }
                
@@ -1889,85 +2468,249 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg
                }
        
        }
-       
-       EmailList->insert(std::make_pair(*EmailCount, PropertySeg2));
+               
+       IMList->insert(std::make_pair(*IMCount, PropertySeg2));
        
        // Add the name token data.
        
        if (!PropertyTokens.IsEmpty()){
        
-               EmailListTokens->insert(std::make_pair(*EmailCount, PropertyTokens));
+               IMListTokens->insert(std::make_pair(*IMCount, PropertyTokens));
        
-       }       
-
+       }
 
 }
 
-void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2, int *IMCount){
+void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString PropertySeg2, int *TelephoneCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
-
-       int intPrevValue = 6;
-       int intPref = 0;                        
-       
-       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       std::map<int, int>::iterator SLiter;
        
-       intPrevValue = 5;
+       int intPref = 0;
        
        PropertyType PropType = PROPERTY_NONE;
                
        // Look for type before continuing.
        
-       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+       wxString TelTypeUI;
+       wxString TelTypeDetail;
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
        
-       std::map<int, wxString> *IMList = NULL;
-       std::map<int, wxString> *IMListType = NULL;
-       std::map<int, wxString> *IMListAltID = NULL;
-       std::map<int, wxString> *IMListPID = NULL;
-       std::map<int, wxString> *IMListTokens = NULL;
-       std::map<int, wxString> *IMListMediatype = NULL;        
-       std::map<int, int> *IMListPref = NULL;
+       std::map<int,int> TypeSplitPoints;
+       std::map<int,int> TypeSplitLength;
+       std::map<int,int>::iterator TSLiter;
+       
+       int intSplitSize = 0;
+       int intSplitsFound = 0;
+       int intSplitPoint = 0;
+       int intType = 0;
+       int intPrevValue = 5;
+               
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 4;
+       
+       // Look for type before continuing.
+       
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+
+               if (PropertyName == wxT("TYPE")){
+               
+                       // Process each value in type and translate each
+                       // part.
+               
+                       // Strip out the quotes if they are there.
+               
+                       size_t intPropertyValueLen = PropertyValue.Len();
+               
+                       if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                               PropertyValue.Trim();
+                               PropertyValue.RemoveLast();
+                       
+                       }                               
+               
+                       if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                               PropertyValue.Remove(0, 1);
+                       
+                       }
+                       
+                       TelTypeDetail = PropertyValue;
+                       
+                       intSplitSize = 0;
+                       intSplitsFound = 0;
+                       intSplitPoint = 0;
+                       
+                       for (int i = 0; i <= intPropertyValueLen; i++){
+       
+                               intSplitSize++;
+       
+                               if (PropertyValue.Mid(i, 1) == wxT(",") && PropertyValue.Mid((i - 1), 1) != wxT("\\")){
+       
+                                       if (intSplitsFound == 0){
+
+                                               TypeSplitPoints.insert(std::make_pair(intSplitsFound, intSplitPoint));
+                                               TypeSplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                       
+                                       } else {
+                       
+                                               TypeSplitPoints.insert(std::make_pair(intSplitsFound, intSplitPoint));
+                                               TypeSplitLength.insert(std::make_pair(intSplitsFound, intSplitSize));
+                       
+                                       }                       
+
+                                       intSplitsFound++;
+                                       i++;
+                                       intSplitPoint = i;
+                                       intSplitSize = 0;
+       
+                               }
+       
+                       }
+                       
+                       TypeSplitPoints.insert(std::make_pair(intSplitsFound, intSplitPoint));
+                       TypeSplitLength.insert(std::make_pair(intSplitsFound, intSplitSize));                                                           
+               
+                       int intTypeSeek = 0;
+               
+                       for (std::map<int, int>::iterator typeiter = TypeSplitPoints.begin(); 
+                       typeiter != TypeSplitPoints.end(); ++typeiter){
+                       
+                               wxString TypePropertyName;
+                               
+                               TSLiter = TypeSplitLength.find(typeiter->first);
+                               
+                               TypePropertyName = PropertyValue.Mid(typeiter->second, TSLiter->second);
+                               
+                               if (intTypeSeek == 0){
+                               
+                               
+                               } else {
+                                                                               
+                                       TelTypeUI.Append(wxT(","));                                                     
+                               
+                               }
+                       
+                               if (TypePropertyName == wxT("home")){
+                               
+                                       PropType = PROPERTY_HOME;
+                               
+                               } else if (TypePropertyName == wxT("work")){
+                               
+                                       PropType = PROPERTY_WORK;
+                                                                       
+                               }
+                               
+                               
+                               if (TypePropertyName == wxT("text")){
+                               
+                                       TelTypeUI.Append(_("text"));
+                                       intTypeSeek++;
+                               
+                               } else if (TypePropertyName == wxT("voice")){
+                               
+                                       TelTypeUI.Append(_("voice"));
+                                       intTypeSeek++;
+                               
+                               } else if (TypePropertyName == wxT("fax")){
+                               
+                                       TelTypeUI.Append(_("fax"));
+                                       intTypeSeek++;
+                               
+                               } else if (TypePropertyName == wxT("cell")){
+                               
+                                       TelTypeUI.Append(_("mobile"));
+                                       intTypeSeek++;
+                               
+                               } else if (TypePropertyName == wxT("video")){
+                               
+                                       TelTypeUI.Append(_("video"));
+                                       intTypeSeek++;
+                               
+                               } else if (TypePropertyName == wxT("pager")){
+                               
+                                       TelTypeUI.Append(_("pager"));
+                                       intTypeSeek++;
+                               
+                               } else if (TypePropertyName == wxT("textphone")){
+                               
+                                       TelTypeUI.Append(_("textphone"));
+                                       intTypeSeek++;
+                               
+                               }
+                       
+                       }
+               
+               }
+               
+       }
+       
+       std::map<int, wxString> *TelephoneList = NULL;
+       std::map<int, wxString> *TelephoneListType = NULL;
+       std::map<int, wxString> *TelephoneListAltID = NULL;
+       std::map<int, wxString> *TelephoneListPID = NULL;
+       std::map<int, wxString> *TelephoneListTokens = NULL;
+       std::map<int, wxString> *TelephoneListTypeInfo = NULL;  
+       std::map<int, int> *TelephoneListPref = NULL;
 
        switch(PropType){
                case PROPERTY_NONE:
-                       IMList = &GeneralIMList;
-                       IMListType = &GeneralIMListType;
-                       IMListAltID = &GeneralIMListAltID;
-                       IMListPID = &GeneralIMListPID;
-                       IMListTokens = &GeneralIMListTokens;
-                       IMListMediatype = &GeneralIMListMediatype;
-                       IMListPref = &GeneralIMListPref;        
+                       TelephoneList = &GeneralTelephoneList;
+                       TelephoneListType = &GeneralTelephoneListType;
+                       TelephoneListAltID = &GeneralTelephoneListAltID;
+                       TelephoneListPID = &GeneralTelephoneListPID;
+                       TelephoneListTokens = &GeneralTelephoneListTokens;
+                       TelephoneListTypeInfo = &GeneralTelephoneListTypeInfo;
+                       TelephoneListPref = &GeneralTelephoneListPref;  
                        break;
                case PROPERTY_HOME:
-                       IMList = &HomeIMList;
-                       IMListType = &HomeIMListType;
-                       IMListAltID = &HomeIMListAltID;
-                       IMListPID = &HomeIMListPID;
-                       IMListTokens = &HomeIMListTokens;
-                       IMListMediatype = &HomeIMListMediatype;         
-                       IMListPref = &HomeIMListPref;   
+                       TelephoneList = &HomeTelephoneList;
+                       TelephoneListType = &HomeTelephoneListType;
+                       TelephoneListAltID = &HomeTelephoneListAltID;
+                       TelephoneListPID = &HomeTelephoneListPID;
+                       TelephoneListTokens = &HomeTelephoneListTokens;
+                       TelephoneListTypeInfo = &HomeTelephoneListTypeInfo;     
+                       TelephoneListPref = &HomeTelephoneListPref;     
                        break;
                case PROPERTY_WORK:
-                       IMList = &BusinessIMList;
-                       IMListType = &BusinessIMListType;
-                       IMListAltID = &BusinessIMListAltID;
-                       IMListPID = &BusinessIMListPID;
-                       IMListTokens = &BusinessIMListTokens;   
-                       IMListMediatype = &BusinessIMListMediatype;     
-                       IMListPref = &BusinessIMListPref;       
+                       TelephoneList = &BusinessTelephoneList;
+                       TelephoneListType = &BusinessTelephoneListType;
+                       TelephoneListAltID = &BusinessTelephoneListAltID;
+                       TelephoneListPID = &BusinessTelephoneListPID;
+                       TelephoneListTokens = &BusinessTelephoneListTokens;     
+                       TelephoneListTypeInfo = &BusinessTelephoneListTypeInfo; 
+                       TelephoneListPref = &BusinessTelephoneListPref; 
                        break;
        }
+               
+       // Process the properties.
        
-       intPrevValue = 5;
-       
-       std::map<int,int>::iterator SLiter;
-       wxString PropertyData;
-       wxString PropertyName;
-       wxString PropertyValue;
-       wxString PropertyTokens;
        bool FirstToken = TRUE;
        
+       intPrevValue = 5;
+       SplitPoints.clear();
+       SplitLength.clear();
+
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+       intPrevValue = 4;
+       
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -1987,18 +2730,13 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2,
                
                if (PropertyName == wxT("ALTID")){
 
-                       IMListAltID->erase(*IMCount);
-                       IMListAltID->insert(std::make_pair(*IMCount, PropertyValue));
+                       TelephoneListAltID->erase(*TelephoneCount);
+                       TelephoneListAltID->insert(std::make_pair(*TelephoneCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       IMListPID->erase(*IMCount);
-                       IMListPID->insert(std::make_pair(*IMCount, PropertyValue));
-               
-               } else if (PropertyName == wxT("MEDIATYPE")){
-
-                       IMListMediatype->erase(*IMCount);
-                       IMListMediatype->insert(std::make_pair(*IMCount, PropertyValue));
+                       TelephoneListPID->erase(*TelephoneCount);
+                       TelephoneListPID->insert(std::make_pair(*TelephoneCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
                        
@@ -2015,8 +2753,8 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2,
 
                        if (ValidNumber == TRUE){
 
-                               IMListPref->erase(*IMCount);
-                               IMListPref->insert(std::make_pair(*IMCount, PriorityNumber));
+                               TelephoneListPref->erase(*TelephoneCount);
+                               TelephoneListPref->insert(std::make_pair(*TelephoneCount, PriorityNumber));
 
                        }
                
@@ -2041,52 +2779,79 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2,
        
        }
                
-       IMList->insert(std::make_pair(*IMCount, PropertySeg2));
+       TelephoneList->insert(std::make_pair(*TelephoneCount, PropertySeg2));
+       TelephoneListTypeInfo->insert(std::make_pair(*TelephoneCount, TelTypeUI));
        
        // Add the name token data.
        
        if (!PropertyTokens.IsEmpty()){
        
-               IMListTokens->insert(std::make_pair(*IMCount, PropertyTokens));
+               TelephoneListTokens->insert(std::make_pair(*TelephoneCount, PropertyTokens));
        
        }
 
 }
 
-void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString PropertySeg2, int *TelephoneCount){
+void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString PropertySeg2, int *LanguageCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
-       std::map<int, int>::iterator SLiter;
+
+       int intPrevValue = 6;
+       int intPref = 0;                        
        
-       int intPref = 0;
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 5;
        
        PropertyType PropType = PROPERTY_NONE;
                
        // Look for type before continuing.
        
-       wxString TelTypeUI;
-       wxString TelTypeDetail;
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+       
+       std::map<int, wxString> *LanguageList = NULL;
+       std::map<int, wxString> *LanguageListType = NULL;
+       std::map<int, wxString> *LanguageListAltID = NULL;
+       std::map<int, wxString> *LanguageListPID = NULL;
+       std::map<int, wxString> *LanguageListTokens = NULL;
+       std::map<int, int> *LanguageListPref = NULL;
+
+       switch(PropType){
+               case PROPERTY_NONE:
+                       LanguageList = &GeneralLanguageList;
+                       LanguageListType = &GeneralLanguageListType;
+                       LanguageListAltID = &GeneralLanguageListAltID;
+                       LanguageListPID = &GeneralLanguageListPID;
+                       LanguageListTokens = &GeneralLanguageListTokens;
+                       LanguageListPref = &GeneralLanguageListPref;    
+                       break;
+               case PROPERTY_HOME:
+                       LanguageList = &HomeLanguageList;
+                       LanguageListType = &HomeLanguageListType;
+                       LanguageListAltID = &HomeLanguageListAltID;
+                       LanguageListPID = &HomeLanguageListPID;
+                       LanguageListTokens = &HomeLanguageListTokens;   
+                       LanguageListPref = &HomeLanguageListPref;       
+                       break;
+               case PROPERTY_WORK:
+                       LanguageList = &BusinessLanguageList;
+                       LanguageListType = &BusinessLanguageListType;
+                       LanguageListAltID = &BusinessLanguageListAltID;
+                       LanguageListPID = &BusinessLanguageListPID;
+                       LanguageListTokens = &BusinessLanguageListTokens;       
+                       LanguageListPref = &BusinessLanguageListPref;
+                       break;
+       }
+       
+       intPrevValue = 5;
+       
+       std::map<int,int>::iterator SLiter;
        wxString PropertyData;
        wxString PropertyName;
        wxString PropertyValue;
        wxString PropertyTokens;
-       
-       std::map<int,int> TypeSplitPoints;
-       std::map<int,int> TypeSplitLength;
-       std::map<int,int>::iterator TSLiter;
-       
-       int intSplitSize = 0;
-       int intSplitsFound = 0;
-       int intSplitPoint = 0;
-       int intType = 0;
-       int intPrevValue = 5;
-               
-       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-       
-       intPrevValue = 4;
-       
-       // Look for type before continuing.
+       bool FirstToken = TRUE;
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -2100,189 +2865,139 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
                PropertyValue = PropertyElement.GetNextToken();
                
                intPrevValue = intiter->second;
-
-               if (PropertyName == wxT("TYPE")){
                
-                       // Process each value in type and translate each
-                       // part.
+               CaptureString(&PropertyValue, FALSE);
                
-                       // Strip out the quotes if they are there.
+               // Process properties.
                
-                       size_t intPropertyValueLen = PropertyValue.Len();
+               if (PropertyName == wxT("ALTID")){
+
+                       LanguageListAltID->erase(*LanguageCount);
+                       LanguageListAltID->insert(std::make_pair(*LanguageCount, PropertyValue));
                
-                       if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
-                       
-                               PropertyValue.Trim();
-                               PropertyValue.RemoveLast();
-                       
-                       }                               
+               } else if (PropertyName == wxT("PID")){
+
+                       LanguageListPID->erase(*LanguageCount);
+                       LanguageListPID->insert(std::make_pair(*LanguageCount, PropertyValue));
                
-                       if (PropertyValue.Mid(0, 1) == wxT("\"")){
+               } else if (PropertyName == wxT("PREF")){
                        
-                               PropertyValue.Remove(0, 1);
+                       int PriorityNumber = 0;
+                       bool ValidNumber = TRUE;
                        
+                       try{
+                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
                        }
                        
-                       TelTypeDetail = PropertyValue;
-                       
-                       intSplitSize = 0;
-                       intSplitsFound = 0;
-                       intSplitPoint = 0;
-                       
-                       for (int i = 0; i <= intPropertyValueLen; i++){
-       
-                               intSplitSize++;
-       
-                               if (PropertyValue.Mid(i, 1) == wxT(",") && PropertyValue.Mid((i - 1), 1) != wxT("\\")){
-       
-                                       if (intSplitsFound == 0){
+                       catch(std::invalid_argument &e){
+                               ValidNumber = FALSE;
+                       }
 
-                                               TypeSplitPoints.insert(std::make_pair(intSplitsFound, intSplitPoint));
-                                               TypeSplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
-                       
-                                       } else {
-                       
-                                               TypeSplitPoints.insert(std::make_pair(intSplitsFound, intSplitPoint));
-                                               TypeSplitLength.insert(std::make_pair(intSplitsFound, intSplitSize));
-                       
-                                       }                       
+                       if (ValidNumber == TRUE){
+
+                               LanguageListPref->erase(*LanguageCount);
+                               LanguageListPref->insert(std::make_pair(*LanguageCount, PriorityNumber));
 
-                                       intSplitsFound++;
-                                       i++;
-                                       intSplitPoint = i;
-                                       intSplitSize = 0;
-       
-                               }
-       
                        }
-                       
-                       TypeSplitPoints.insert(std::make_pair(intSplitsFound, intSplitPoint));
-                       TypeSplitLength.insert(std::make_pair(intSplitsFound, intSplitSize));                                                           
                
-                       int intTypeSeek = 0;
+               } else {
                
-                       for (std::map<int, int>::iterator typeiter = TypeSplitPoints.begin(); 
-                       typeiter != TypeSplitPoints.end(); ++typeiter){
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
                        
-                               wxString TypePropertyName;
-                               
-                               TSLiter = TypeSplitLength.find(typeiter->first);
-                               
-                               TypePropertyName = PropertyValue.Mid(typeiter->second, TSLiter->second);
-                               
-                               if (intTypeSeek == 0){
+                               if (FirstToken == TRUE){
                                
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
                                
                                } else {
-                                                                               
-                                       TelTypeUI.Append(wxT(","));                                                     
-                               
-                               }
-                       
-                               if (TypePropertyName == wxT("home")){
-                               
-                                       PropType = PROPERTY_HOME;
-                               
-                               } else if (TypePropertyName == wxT("work")){
-                               
-                                       PropType = PROPERTY_WORK;
-                                                                       
-                               }
-                               
-                               
-                               if (TypePropertyName == wxT("text")){
-                               
-                                       TelTypeUI.Append(_("text"));
-                                       intTypeSeek++;
-                               
-                               } else if (TypePropertyName == wxT("voice")){
-                               
-                                       TelTypeUI.Append(_("voice"));
-                                       intTypeSeek++;
-                               
-                               } else if (TypePropertyName == wxT("fax")){
-                               
-                                       TelTypeUI.Append(_("fax"));
-                                       intTypeSeek++;
-                               
-                               } else if (TypePropertyName == wxT("cell")){
-                               
-                                       TelTypeUI.Append(_("mobile"));
-                                       intTypeSeek++;
-                               
-                               } else if (TypePropertyName == wxT("video")){
                                
-                                       TelTypeUI.Append(_("video"));
-                                       intTypeSeek++;
-                               
-                               } else if (TypePropertyName == wxT("pager")){
-                               
-                                       TelTypeUI.Append(_("pager"));
-                                       intTypeSeek++;
-                               
-                               } else if (TypePropertyName == wxT("textphone")){
-                               
-                                       TelTypeUI.Append(_("textphone"));
-                                       intTypeSeek++;
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
                                
                                }
                        
                        }
                
                }
+       
+       }
+               
+       LanguageList->insert(std::make_pair(*LanguageCount, PropertySeg2));
+       
+       // Add the name token data.
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               LanguageListTokens->insert(std::make_pair(*LanguageCount, PropertyTokens));
+       
+       }
+
+}
+
+void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString PropertySeg2, int *GeographicCount){
+
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+
+       int intPrevValue = 5;
+       int intPref = 0;                        
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 4;
+       
+       PropertyType PropType = PROPERTY_NONE;
                
-       }
+       // Look for type before continuing.
        
-       std::map<int, wxString> *TelephoneList = NULL;
-       std::map<int, wxString> *TelephoneListType = NULL;
-       std::map<int, wxString> *TelephoneListAltID = NULL;
-       std::map<int, wxString> *TelephoneListPID = NULL;
-       std::map<int, wxString> *TelephoneListTokens = NULL;
-       std::map<int, wxString> *TelephoneListTypeInfo = NULL;  
-       std::map<int, int> *TelephoneListPref = NULL;
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+       
+       std::map<int, wxString> *GeopositionList = NULL;
+       std::map<int, wxString> *GeopositionListType = NULL;
+       std::map<int, wxString> *GeopositionListAltID = NULL;
+       std::map<int, wxString> *GeopositionListPID = NULL;
+       std::map<int, wxString> *GeopositionListTokens = NULL;
+       std::map<int, wxString> *GeopositionListMediatype = NULL;
+       std::map<int, int> *GeopositionListPref = NULL;
 
        switch(PropType){
                case PROPERTY_NONE:
-                       TelephoneList = &GeneralTelephoneList;
-                       TelephoneListType = &GeneralTelephoneListType;
-                       TelephoneListAltID = &GeneralTelephoneListAltID;
-                       TelephoneListPID = &GeneralTelephoneListPID;
-                       TelephoneListTokens = &GeneralTelephoneListTokens;
-                       TelephoneListTypeInfo = &GeneralTelephoneListTypeInfo;
-                       TelephoneListPref = &GeneralTelephoneListPref;  
+                       GeopositionList = &GeneralGeographyList;
+                       GeopositionListType = &GeneralGeographyListType;
+                       GeopositionListAltID = &GeneralGeographyListAltID;
+                       GeopositionListPID = &GeneralGeographyListPID;
+                       GeopositionListTokens = &GeneralGeographyListTokens;
+                       GeopositionListMediatype = &GeneralGeographyListMediatype;
+                       GeopositionListPref = &GeneralGeographyListPref;        
                        break;
                case PROPERTY_HOME:
-                       TelephoneList = &HomeTelephoneList;
-                       TelephoneListType = &HomeTelephoneListType;
-                       TelephoneListAltID = &HomeTelephoneListAltID;
-                       TelephoneListPID = &HomeTelephoneListPID;
-                       TelephoneListTokens = &HomeTelephoneListTokens;
-                       TelephoneListTypeInfo = &HomeTelephoneListTypeInfo;     
-                       TelephoneListPref = &HomeTelephoneListPref;     
+                       GeopositionList = &HomeGeographyList;
+                       GeopositionListType = &HomeGeographyListType;
+                       GeopositionListAltID = &HomeGeographyListAltID;
+                       GeopositionListPID = &HomeGeographyListPID;
+                       GeopositionListTokens = &HomeGeographyListTokens;
+                       GeopositionListMediatype = &HomeGeographyListMediatype;
+                       GeopositionListPref = &HomeGeographyListPref;   
                        break;
                case PROPERTY_WORK:
-                       TelephoneList = &BusinessTelephoneList;
-                       TelephoneListType = &BusinessTelephoneListType;
-                       TelephoneListAltID = &BusinessTelephoneListAltID;
-                       TelephoneListPID = &BusinessTelephoneListPID;
-                       TelephoneListTokens = &BusinessTelephoneListTokens;     
-                       TelephoneListTypeInfo = &BusinessTelephoneListTypeInfo; 
-                       TelephoneListPref = &BusinessTelephoneListPref; 
+                       GeopositionList = &BusinessGeographyList;
+                       GeopositionListType = &BusinessGeographyListType;
+                       GeopositionListAltID = &BusinessGeographyListAltID;
+                       GeopositionListPID = &BusinessGeographyListPID;
+                       GeopositionListTokens = &BusinessGeographyListTokens;
+                       GeopositionListMediatype = &BusinessGeographyListMediatype;     
+                       GeopositionListPref = &BusinessGeographyListPref;
                        break;
        }
-               
-       // Process the properties.
-       
-       bool FirstToken = TRUE;
        
-       intPrevValue = 5;
-       SplitPoints.clear();
-       SplitLength.clear();
-
-       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-
        intPrevValue = 4;
        
+       std::map<int,int>::iterator SLiter;
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -2302,13 +3017,18 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
                
                if (PropertyName == wxT("ALTID")){
 
-                       TelephoneListAltID->erase(*TelephoneCount);
-                       TelephoneListAltID->insert(std::make_pair(*TelephoneCount, PropertyValue));
+                       GeopositionListAltID->erase(*GeographicCount);
+                       GeopositionListAltID->insert(std::make_pair(*GeographicCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       TelephoneListPID->erase(*TelephoneCount);
-                       TelephoneListPID->insert(std::make_pair(*TelephoneCount, PropertyValue));
+                       GeopositionListPID->erase(*GeographicCount);
+                       GeopositionListPID->insert(std::make_pair(*GeographicCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("MEDIATYPE")){
+
+                       GeopositionListMediatype->erase(*GeographicCount);
+                       GeopositionListMediatype->insert(std::make_pair(*GeographicCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
                        
@@ -2323,107 +3043,182 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
                                ValidNumber = FALSE;
                        }
 
-                       if (ValidNumber == TRUE){
+                       if (ValidNumber == TRUE){
+
+                               GeopositionListPref->erase(*GeographicCount);
+                               GeopositionListPref->insert(std::make_pair(*GeographicCount, PriorityNumber));
+
+                       }
+               
+               } else {
+               
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       
+                               if (FirstToken == TRUE){
+                               
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                               
+                               } else {
+                               
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                               }
+                       
+                       }
+               
+               }
+       
+       }
+               
+       GeopositionList->insert(std::make_pair(*GeographicCount, PropertySeg2));
+       
+       // Add the name token data.
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               GeopositionListTokens->insert(std::make_pair(*GeographicCount, PropertyTokens));
+       
+       }
+
+}
+
+void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertySeg2, int *RelatedCount){
+
+       size_t intPropertyLen = PropertySeg1.Len();
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       wxString RelatedType;
+       wxString RelatedTypeOriginal;                   
+       wxString RelatedName;
+       bool FirstToken = TRUE;                 
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 9;
+       int intPref = 0;
+       long ListCtrlIndex;
+       
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+       
+       intPrevValue = 8;
+       
+       // Look for type before continuing.
+       
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+               
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process these.
+               
+               RelatedTypeOriginal = PropertyValue;
+               
+               if (PropertyName == wxT("TYPE")){
+               
+                       if (PropertyValue == wxT("contact")){
+
+                               RelatedType = _("Contact");
+
+                       } else if (PropertyValue == wxT("acquaintance")){
+
+                               RelatedType = _("Acquaintance");
+
+                       } else if (PropertyValue == wxT("friend")){
+
+                               RelatedType = _("Friend");
+
+                       } else if (PropertyValue == wxT("met")){
+
+                               RelatedType = _("Met");
+
+                       } else if (PropertyValue == wxT("co-worker")){
+
+                               RelatedType = _("Co-worker");
+
+                       } else if (PropertyValue == wxT("colleague")){
+
+                               RelatedType = _("Colleague");
+
+                       } else if (PropertyValue == wxT("co-resident")){
+
+                               RelatedType = _("Co-resident");
+
+                       } else if (PropertyValue == wxT("neighbor")){
+
+                               RelatedType = _("Neighbour");
+
+                       } else if (PropertyValue == wxT("child")){
+
+                               RelatedType = _("Child");
+
+                       } else if (PropertyValue == wxT("parent")){
+
+                               RelatedType = _("Parent");
+
+                       } else if (PropertyValue == wxT("sibling")){
+
+                               RelatedType = _("Sibling");
+
+                       } else if (PropertyValue == wxT("spouse")){
+
+                               RelatedType = _("Spouse");
+
+                       } else if (PropertyValue == wxT("kin")){
+
+                               RelatedType = _("Kin");
+
+                       } else if (PropertyValue == wxT("muse")){
+
+                               RelatedType = _("Muse");
+
+                       } else if (PropertyValue == wxT("crush")){
+
+                               RelatedType = _("Crush");
+
+                       } else if (PropertyValue == wxT("date")){
+
+                               RelatedType = _("Date");
+
+                       } else if (PropertyValue == wxT("sweetheart")){
+
+                               RelatedType = _("Sweetheart");
+
+                       } else if (PropertyValue == wxT("me")){
+
+                               RelatedType = _("Me");
+
+                       } else if (PropertyValue == wxT("agent")){
 
-                               TelephoneListPref->erase(*TelephoneCount);
-                               TelephoneListPref->insert(std::make_pair(*TelephoneCount, PriorityNumber));
+                               RelatedType = _("Agent");
 
-                       }
-               
-               } else {
-               
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-                       
-                               if (FirstToken == TRUE){
-                               
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                               
-                               } else {
-                               
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-                               }
-                       
-                       }
-               
-               }
-       
-       }
-               
-       TelephoneList->insert(std::make_pair(*TelephoneCount, PropertySeg2));
-       TelephoneListTypeInfo->insert(std::make_pair(*TelephoneCount, TelTypeUI));
-       
-       // Add the name token data.
-       
-       if (!PropertyTokens.IsEmpty()){
-       
-               TelephoneListTokens->insert(std::make_pair(*TelephoneCount, PropertyTokens));
-       
-       }
+                       } else if (PropertyValue == wxT("emergency")){
 
-}
+                               RelatedType = _("Emergency");
 
-void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString PropertySeg2, int *LanguageCount){
+                       } else {
 
-       std::map<int, int> SplitPoints;
-       std::map<int, int> SplitLength;
+                               RelatedType = PropertyValue;
 
-       int intPrevValue = 6;
-       int intPref = 0;                        
-       
-       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
-       
-       intPrevValue = 5;
-       
-       PropertyType PropType = PROPERTY_NONE;
+                       }
                
-       // Look for type before continuing.
-       
-       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+               }
        
-       std::map<int, wxString> *LanguageList = NULL;
-       std::map<int, wxString> *LanguageListType = NULL;
-       std::map<int, wxString> *LanguageListAltID = NULL;
-       std::map<int, wxString> *LanguageListPID = NULL;
-       std::map<int, wxString> *LanguageListTokens = NULL;
-       std::map<int, int> *LanguageListPref = NULL;
-
-       switch(PropType){
-               case PROPERTY_NONE:
-                       LanguageList = &GeneralLanguageList;
-                       LanguageListType = &GeneralLanguageListType;
-                       LanguageListAltID = &GeneralLanguageListAltID;
-                       LanguageListPID = &GeneralLanguageListPID;
-                       LanguageListTokens = &GeneralLanguageListTokens;
-                       LanguageListPref = &GeneralLanguageListPref;    
-                       break;
-               case PROPERTY_HOME:
-                       LanguageList = &HomeLanguageList;
-                       LanguageListType = &HomeLanguageListType;
-                       LanguageListAltID = &HomeLanguageListAltID;
-                       LanguageListPID = &HomeLanguageListPID;
-                       LanguageListTokens = &HomeLanguageListTokens;   
-                       LanguageListPref = &HomeLanguageListPref;       
-                       break;
-               case PROPERTY_WORK:
-                       LanguageList = &BusinessLanguageList;
-                       LanguageListType = &BusinessLanguageListType;
-                       LanguageListAltID = &BusinessLanguageListAltID;
-                       LanguageListPID = &BusinessLanguageListPID;
-                       LanguageListTokens = &BusinessLanguageListTokens;       
-                       LanguageListPref = &BusinessLanguageListPref;
-                       break;
        }
        
-       intPrevValue = 5;
-       
-       std::map<int,int>::iterator SLiter;
-       wxString PropertyData;
-       wxString PropertyName;
-       wxString PropertyValue;
-       wxString PropertyTokens;
-       bool FirstToken = TRUE;
+       intPrevValue = 8;                       
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -2438,19 +3233,34 @@ void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString Property
                
                intPrevValue = intiter->second;
                
-               CaptureString(&PropertyValue, FALSE);
-               
                // Process properties.
                
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }
+               
+               CaptureString(&PropertyValue, FALSE);
+                       
                if (PropertyName == wxT("ALTID")){
 
-                       LanguageListAltID->erase(*LanguageCount);
-                       LanguageListAltID->insert(std::make_pair(*LanguageCount, PropertyValue));
+                       GeneralRelatedListAltID.erase(*RelatedCount);
+                       GeneralRelatedListAltID.insert(std::make_pair(*RelatedCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       LanguageListPID->erase(*LanguageCount);
-                       LanguageListPID->insert(std::make_pair(*LanguageCount, PropertyValue));
+                       GeneralRelatedListPID.erase(*RelatedCount);
+                       GeneralRelatedListPID.insert(std::make_pair(*RelatedCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
                        
@@ -2467,51 +3277,67 @@ void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString Property
 
                        if (ValidNumber == TRUE){
 
-                               LanguageListPref->erase(*LanguageCount);
-                               LanguageListPref->insert(std::make_pair(*LanguageCount, PriorityNumber));
+                               GeneralRelatedListPref.erase(*RelatedCount);
+                               GeneralRelatedListPref.insert(std::make_pair(*RelatedCount, PriorityNumber));
 
                        }
                
-               } else {
+               } else if (PropertyName == wxT("LANGUAGE")){
+               
+                       GeneralRelatedListLanguage.erase(*RelatedCount);
+                       GeneralRelatedListLanguage.insert(std::make_pair(*RelatedCount, PropertyValue));
+               
+               } else if (PropertyName != wxT("TYPE")) {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
                
                        if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-                       
+               
                                if (FirstToken == TRUE){
-                               
+                       
                                        PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
                                        FirstToken = FALSE;
-                               
+                       
                                } else {
-                               
+                       
                                        PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-                               }
                        
+                               }
+               
                        }
                
                }
        
-       }
-               
-       LanguageList->insert(std::make_pair(*LanguageCount, PropertySeg2));
-       
-       // Add the name token data.
-       
-       if (!PropertyTokens.IsEmpty()){
-       
-               LanguageListTokens->insert(std::make_pair(*LanguageCount, PropertyTokens));
+       }                                       
        
-       }
+       // Add the data to the General/Home/Work address variables.
+                               
+       GeneralRelatedList.erase(*RelatedCount);
+       GeneralRelatedListRelType.erase(*RelatedCount);
+       GeneralRelatedListType.erase(*RelatedCount);
+       GeneralRelatedListTokens.erase(*RelatedCount);
+       GeneralRelatedList.insert(std::make_pair(*RelatedCount, PropertySeg2));
+       GeneralRelatedListRelType.insert(std::make_pair(*RelatedCount, RelatedType));                   
+       GeneralRelatedListType.insert(std::make_pair(*RelatedCount, RelatedType));
+       GeneralRelatedListTokens.insert(std::make_pair(*RelatedCount, PropertyTokens));
 
 }
 
-void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString PropertySeg2, int *GeographicCount){
+void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, int *URLCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
-
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
        int intPrevValue = 5;
        int intPref = 0;                        
+       int intType = 0;
+       long ListCtrlIndex;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
@@ -2523,53 +3349,50 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
        
        CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
        
-       std::map<int, wxString> *GeopositionList = NULL;
-       std::map<int, wxString> *GeopositionListType = NULL;
-       std::map<int, wxString> *GeopositionListAltID = NULL;
-       std::map<int, wxString> *GeopositionListPID = NULL;
-       std::map<int, wxString> *GeopositionListTokens = NULL;
-       std::map<int, wxString> *GeopositionListMediatype = NULL;
-       std::map<int, int> *GeopositionListPref = NULL;
-
+       // Setup the pointers.
+       
+       std::map<int, wxString> *WebsiteList = NULL;
+       std::map<int, wxString> *WebsiteListAltID = NULL;
+       std::map<int, wxString> *WebsiteListPID = NULL;
+       std::map<int, wxString> *WebsiteListType = NULL;
+       std::map<int, wxString> *WebsiteListTokens = NULL;
+       std::map<int, wxString> *WebsiteListMediatype = NULL;
+       std::map<int, int> *WebsiteListPref = NULL;
+       
+       // Setup blank lines for later on.
+       
        switch(PropType){
                case PROPERTY_NONE:
-                       GeopositionList = &GeneralGeographyList;
-                       GeopositionListType = &GeneralGeographyListType;
-                       GeopositionListAltID = &GeneralGeographyListAltID;
-                       GeopositionListPID = &GeneralGeographyListPID;
-                       GeopositionListTokens = &GeneralGeographyListTokens;
-                       GeopositionListMediatype = &GeneralGeographyListMediatype;
-                       GeopositionListPref = &GeneralGeographyListPref;        
+                       WebsiteList = &GeneralWebsiteList;
+                       WebsiteListType = &GeneralWebsiteListType;
+                       WebsiteListAltID = &GeneralWebsiteListAltID;
+                       WebsiteListPID = &GeneralWebsiteListPID;
+                       WebsiteListTokens = &GeneralWebsiteListTokens;
+                       WebsiteListMediatype = &GeneralWebsiteListMediatype;
+                       WebsiteListPref = &GeneralWebsiteListPref;      
                        break;
                case PROPERTY_HOME:
-                       GeopositionList = &HomeGeographyList;
-                       GeopositionListType = &HomeGeographyListType;
-                       GeopositionListAltID = &HomeGeographyListAltID;
-                       GeopositionListPID = &HomeGeographyListPID;
-                       GeopositionListTokens = &HomeGeographyListTokens;
-                       GeopositionListMediatype = &HomeGeographyListMediatype;
-                       GeopositionListPref = &HomeGeographyListPref;   
+                       WebsiteList = &HomeWebsiteList;
+                       WebsiteListType = &HomeWebsiteListType;
+                       WebsiteListAltID = &HomeWebsiteListAltID;
+                       WebsiteListPID = &HomeWebsiteListPID;
+                       WebsiteListTokens = &HomeWebsiteListTokens;
+                       WebsiteListMediatype = &HomeWebsiteListMediatype;
+                       WebsiteListPref = &HomeWebsiteListPref; 
                        break;
                case PROPERTY_WORK:
-                       GeopositionList = &BusinessGeographyList;
-                       GeopositionListType = &BusinessGeographyListType;
-                       GeopositionListAltID = &BusinessGeographyListAltID;
-                       GeopositionListPID = &BusinessGeographyListPID;
-                       GeopositionListTokens = &BusinessGeographyListTokens;
-                       GeopositionListMediatype = &BusinessGeographyListMediatype;     
-                       GeopositionListPref = &BusinessGeographyListPref;
+                       WebsiteList = &BusinessWebsiteList;
+                       WebsiteListType = &BusinessWebsiteListType;
+                       WebsiteListAltID = &BusinessWebsiteListAltID;
+                       WebsiteListPID = &BusinessWebsiteListPID;
+                       WebsiteListTokens = &BusinessWebsiteListTokens;
+                       WebsiteListMediatype = &BusinessWebsiteListMediatype;   
+                       WebsiteListPref = &BusinessWebsiteListPref;
                        break;
        }
        
-       intPrevValue = 4;
-       
-       std::map<int,int>::iterator SLiter;
-       wxString PropertyData;
-       wxString PropertyName;
-       wxString PropertyValue;
-       wxString PropertyTokens;
-       bool FirstToken = TRUE;
-       
+       intPrevValue = 4;
+       
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -2583,25 +3406,35 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
                
                intPrevValue = intiter->second;
                
-               CaptureString(&PropertyValue, FALSE);
-               
                // Process properties.
                
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }
+               
+               CaptureString(&PropertyValue, FALSE);
+               
                if (PropertyName == wxT("ALTID")){
 
-                       GeopositionListAltID->erase(*GeographicCount);
-                       GeopositionListAltID->insert(std::make_pair(*GeographicCount, PropertyValue));
+                       WebsiteListAltID->erase(*URLCount);
+                       WebsiteListAltID->insert(std::make_pair(*URLCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       GeopositionListPID->erase(*GeographicCount);
-                       GeopositionListPID->insert(std::make_pair(*GeographicCount, PropertyValue));
-               
-               } else if (PropertyName == wxT("MEDIATYPE")){
-
-                       GeopositionListMediatype->erase(*GeographicCount);
-                       GeopositionListMediatype->insert(std::make_pair(*GeographicCount, PropertyValue));
-               
+                       WebsiteListPID->erase(*URLCount);
+                       WebsiteListPID->insert(std::make_pair(*URLCount, PropertyValue));
+                       
                } else if (PropertyName == wxT("PREF")){
                        
                        int PriorityNumber = 0;
@@ -2617,47 +3450,56 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 
                        if (ValidNumber == TRUE){
 
-                               GeopositionListPref->erase(*GeographicCount);
-                               GeopositionListPref->insert(std::make_pair(*GeographicCount, PriorityNumber));
+                               WebsiteListPref->erase(*URLCount);
+                               WebsiteListPref->insert(std::make_pair(*URLCount, PriorityNumber));
 
                        }
+                                       
+               } else if (PropertyName == wxT("MEDIATYPE")){
+               
+                       WebsiteListMediatype->erase(*URLCount);
+                       WebsiteListMediatype->insert(std::make_pair(*URLCount, PropertyValue));
                
                } else {
                
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+               
                        if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-                       
+               
                                if (FirstToken == TRUE){
-                               
+                       
                                        PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
                                        FirstToken = FALSE;
-                               
+                       
                                } else {
-                               
+                       
                                        PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-                               }
                        
+                               }
+               
                        }
                
                }
        
        }
-               
-       GeopositionList->insert(std::make_pair(*GeographicCount, PropertySeg2));
        
-       // Add the name token data.
+       // Add the data to the General/Home/Work address variables.
        
-       if (!PropertyTokens.IsEmpty()){
+       CaptureString(&PropertySeg2, FALSE);
+                       
+       WebsiteList->insert(std::make_pair(*URLCount, PropertySeg2));
        
-               GeopositionListTokens->insert(std::make_pair(*GeographicCount, PropertyTokens));
+       if (!PropertyTokens.IsEmpty()){
        
+               WebsiteListTokens->insert(std::make_pair(*URLCount, PropertyTokens));
+                       
        }
-
+       
 }
 
-void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertySeg2, int *RelatedCount){
+void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg2, int *TitleCount){
 
-       size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
        std::map<int, int>::iterator SLiter;                    
@@ -2665,133 +3507,66 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
        wxString PropertyName;
        wxString PropertyValue;
        wxString PropertyTokens;
-       wxString RelatedType;
-       wxString RelatedTypeOriginal;                   
-       wxString RelatedName;
-       bool FirstToken = TRUE;                 
-       int intSplitsFound = 0;
-       int intSplitSize = 0;
-       int intPrevValue = 9;
-       int intPref = 0;
+       bool FirstToken = TRUE;
+       int intPrevValue = 7;
+       int intPref = 0;                        
+       int intType = 0;
        long ListCtrlIndex;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 8;
+       intPrevValue = 6;
        
+       PropertyType PropType = PROPERTY_NONE;
+               
        // Look for type before continuing.
        
-       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
-       intiter != SplitPoints.end(); ++intiter){
-       
-               SLiter = SplitLength.find(intiter->first);
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
        
-               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
-               
-               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
-               PropertyName = PropertyElement.GetNextToken();                          
-               PropertyValue = PropertyElement.GetNextToken();
-               
-               intPrevValue = intiter->second;
-               
-               // Process these.
-               
-               RelatedTypeOriginal = PropertyValue;
-               
-               if (PropertyName == wxT("TYPE")){
-               
-                       if (PropertyValue == wxT("contact")){
-
-                               RelatedType = _("Contact");
-
-                       } else if (PropertyValue == wxT("acquaintance")){
-
-                               RelatedType = _("Acquaintance");
-
-                       } else if (PropertyValue == wxT("friend")){
-
-                               RelatedType = _("Friend");
-
-                       } else if (PropertyValue == wxT("met")){
-
-                               RelatedType = _("Met");
-
-                       } else if (PropertyValue == wxT("co-worker")){
-
-                               RelatedType = _("Co-worker");
-
-                       } else if (PropertyValue == wxT("colleague")){
-
-                               RelatedType = _("Colleague");
-
-                       } else if (PropertyValue == wxT("co-resident")){
-
-                               RelatedType = _("Co-resident");
-
-                       } else if (PropertyValue == wxT("neighbor")){
-
-                               RelatedType = _("Neighbour");
-
-                       } else if (PropertyValue == wxT("child")){
-
-                               RelatedType = _("Child");
-
-                       } else if (PropertyValue == wxT("parent")){
-
-                               RelatedType = _("Parent");
-
-                       } else if (PropertyValue == wxT("sibling")){
-
-                               RelatedType = _("Sibling");
-
-                       } else if (PropertyValue == wxT("spouse")){
-
-                               RelatedType = _("Spouse");
-
-                       } else if (PropertyValue == wxT("kin")){
-
-                               RelatedType = _("Kin");
-
-                       } else if (PropertyValue == wxT("muse")){
-
-                               RelatedType = _("Muse");
-
-                       } else if (PropertyValue == wxT("crush")){
-
-                               RelatedType = _("Crush");
-
-                       } else if (PropertyValue == wxT("date")){
-
-                               RelatedType = _("Date");
-
-                       } else if (PropertyValue == wxT("sweetheart")){
-
-                               RelatedType = _("Sweetheart");
-
-                       } else if (PropertyValue == wxT("me")){
-
-                               RelatedType = _("Me");
-
-                       } else if (PropertyValue == wxT("agent")){
-
-                               RelatedType = _("Agent");
-
-                       } else if (PropertyValue == wxT("emergency")){
-
-                               RelatedType = _("Emergency");
-
-                       } else {
-
-                               RelatedType = PropertyValue;
-
-                       }
-               
-               }
+       // Setup the pointers.
        
-       }
+       std::map<int, wxString> *TitleList = NULL;
+       std::map<int, wxString> *TitleListAltID = NULL;
+       std::map<int, wxString> *TitleListPID = NULL;
+       std::map<int, wxString> *TitleListType = NULL;
+       std::map<int, wxString> *TitleListTokens = NULL;
+       std::map<int, wxString> *TitleListLanguage = NULL;
+       std::map<int, int> *TitleListPref = NULL;
        
-       intPrevValue = 8;                       
+       // Setup blank lines for later on.
        
+       switch(PropType){
+               case PROPERTY_NONE:
+                       TitleList = &GeneralTitleList;
+                       TitleListType = &GeneralTitleListType;
+                       TitleListAltID = &GeneralTitleListAltID;
+                       TitleListPID = &GeneralTitleListPID;
+                       TitleListTokens = &GeneralTitleListTokens;
+                       TitleListLanguage = &GeneralTitleListLanguage;
+                       TitleListPref = &GeneralTitleListPref;  
+                       break;
+               case PROPERTY_HOME:
+                       TitleList = &HomeTitleList;
+                       TitleListType = &HomeTitleListType;
+                       TitleListAltID = &HomeTitleListAltID;
+                       TitleListPID = &HomeTitleListPID;
+                       TitleListTokens = &HomeTitleListTokens;
+                       TitleListLanguage = &HomeTitleListLanguage;
+                       TitleListPref = &HomeTitleListPref;     
+                       break;
+               case PROPERTY_WORK:
+                       TitleList = &BusinessTitleList;
+                       TitleListType = &BusinessTitleListType;
+                       TitleListAltID = &BusinessTitleListAltID;
+                       TitleListPID = &BusinessTitleListPID;
+                       TitleListTokens = &BusinessTitleListTokens;
+                       TitleListLanguage = &BusinessTitleListLanguage; 
+                       TitleListPref = &BusinessTitleListPref;
+                       break;
+       }
+
+       intPrevValue = 6;
+               
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -2820,22 +3595,22 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
                        
                        PropertyValue.Remove(0, 1);
                        
-               }
+               }                               
                
                CaptureString(&PropertyValue, FALSE);
-                       
+               
                if (PropertyName == wxT("ALTID")){
-
-                       GeneralRelatedListAltID.erase(*RelatedCount);
-                       GeneralRelatedListAltID.insert(std::make_pair(*RelatedCount, PropertyValue));
+               
+                       TitleListAltID->erase(*TitleCount);
+                       TitleListAltID->insert(std::make_pair(*TitleCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       GeneralRelatedListPID.erase(*RelatedCount);
-                       GeneralRelatedListPID.insert(std::make_pair(*RelatedCount, PropertyValue));
+                       TitleListPID->erase(*TitleCount);
+                       TitleListPID->insert(std::make_pair(*TitleCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
-                       
+                               
                        int PriorityNumber = 0;
                        bool ValidNumber = TRUE;
                        
@@ -2849,17 +3624,17 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
 
                        if (ValidNumber == TRUE){
 
-                               GeneralRelatedListPref.erase(*RelatedCount);
-                               GeneralRelatedListPref.insert(std::make_pair(*RelatedCount, PriorityNumber));
+                               TitleListPref->erase(*TitleCount);
+                               TitleListPref->insert(std::make_pair(*TitleCount, PriorityNumber));
 
                        }
-               
+                                       
                } else if (PropertyName == wxT("LANGUAGE")){
                
-                       GeneralRelatedListLanguage.erase(*RelatedCount);
-                       GeneralRelatedListLanguage.insert(std::make_pair(*RelatedCount, PropertyValue));
+                       TitleListLanguage->erase(*TitleCount);
+                       TitleListLanguage->insert(std::make_pair(*TitleCount, PropertyValue));
                
-               } else if (PropertyName != wxT("TYPE")) {
+               } else {
                
                        // Something else we don't know about so append
                        // to the tokens variable.
@@ -2881,22 +3656,23 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
                
                }
        
-       }                                       
+       }
        
        // Add the data to the General/Home/Work address variables.
-                               
-       GeneralRelatedList.erase(*RelatedCount);
-       GeneralRelatedListRelType.erase(*RelatedCount);
-       GeneralRelatedListType.erase(*RelatedCount);
-       GeneralRelatedListTokens.erase(*RelatedCount);
-       GeneralRelatedList.insert(std::make_pair(*RelatedCount, PropertySeg2));
-       GeneralRelatedListRelType.insert(std::make_pair(*RelatedCount, RelatedType));                   
-       GeneralRelatedListType.insert(std::make_pair(*RelatedCount, RelatedType));
-       GeneralRelatedListTokens.insert(std::make_pair(*RelatedCount, PropertyTokens));
+       
+       CaptureString(&PropertySeg2, FALSE);
+
+       TitleList->insert(std::make_pair(*TitleCount, PropertySeg2));
+       
+       if (!PropertyTokens.IsEmpty()){
+       
+               TitleListTokens->insert(std::make_pair(*TitleCount, PropertyTokens));
+                       
+       }
 
 }
 
-void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2, int *URLCount){
+void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2, int *RoleCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
@@ -2906,14 +3682,14 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
-       int intPrevValue = 5;
+       int intPrevValue = 6;
        int intPref = 0;                        
        int intType = 0;
        long ListCtrlIndex;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 4;
+       intPrevValue = 5;
        
        PropertyType PropType = PROPERTY_NONE;
                
@@ -2923,48 +3699,48 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
        
        // Setup the pointers.
        
-       std::map<int, wxString> *WebsiteList = NULL;
-       std::map<int, wxString> *WebsiteListAltID = NULL;
-       std::map<int, wxString> *WebsiteListPID = NULL;
-       std::map<int, wxString> *WebsiteListType = NULL;
-       std::map<int, wxString> *WebsiteListTokens = NULL;
-       std::map<int, wxString> *WebsiteListMediatype = NULL;
-       std::map<int, int> *WebsiteListPref = NULL;
+       std::map<int, wxString> *RoleList = NULL;
+       std::map<int, wxString> *RoleListAltID = NULL;
+       std::map<int, wxString> *RoleListPID = NULL;
+       std::map<int, wxString> *RoleListType = NULL;
+       std::map<int, wxString> *RoleListTokens = NULL;
+       std::map<int, wxString> *RoleListLanguage = NULL;
+       std::map<int, int> *RoleListPref = NULL;
        
        // Setup blank lines for later on.
        
        switch(PropType){
                case PROPERTY_NONE:
-                       WebsiteList = &GeneralWebsiteList;
-                       WebsiteListType = &GeneralWebsiteListType;
-                       WebsiteListAltID = &GeneralWebsiteListAltID;
-                       WebsiteListPID = &GeneralWebsiteListPID;
-                       WebsiteListTokens = &GeneralWebsiteListTokens;
-                       WebsiteListMediatype = &GeneralWebsiteListMediatype;
-                       WebsiteListPref = &GeneralWebsiteListPref;      
+                       RoleList = &GeneralRoleList;
+                       RoleListType = &GeneralRoleListType;
+                       RoleListAltID = &GeneralRoleListAltID;
+                       RoleListPID = &GeneralRoleListPID;
+                       RoleListTokens = &GeneralRoleListTokens;
+                       RoleListLanguage = &GeneralRoleListLanguage;
+                       RoleListPref = &GeneralRoleListPref;    
                        break;
                case PROPERTY_HOME:
-                       WebsiteList = &HomeWebsiteList;
-                       WebsiteListType = &HomeWebsiteListType;
-                       WebsiteListAltID = &HomeWebsiteListAltID;
-                       WebsiteListPID = &HomeWebsiteListPID;
-                       WebsiteListTokens = &HomeWebsiteListTokens;
-                       WebsiteListMediatype = &HomeWebsiteListMediatype;
-                       WebsiteListPref = &HomeWebsiteListPref; 
+                       RoleList = &HomeRoleList;
+                       RoleListType = &HomeRoleListType;
+                       RoleListAltID = &HomeRoleListAltID;
+                       RoleListPID = &HomeRoleListPID;
+                       RoleListTokens = &HomeRoleListTokens;
+                       RoleListLanguage = &HomeRoleListLanguage;
+                       RoleListPref = &HomeRoleListPref;       
                        break;
                case PROPERTY_WORK:
-                       WebsiteList = &BusinessWebsiteList;
-                       WebsiteListType = &BusinessWebsiteListType;
-                       WebsiteListAltID = &BusinessWebsiteListAltID;
-                       WebsiteListPID = &BusinessWebsiteListPID;
-                       WebsiteListTokens = &BusinessWebsiteListTokens;
-                       WebsiteListMediatype = &BusinessWebsiteListMediatype;   
-                       WebsiteListPref = &BusinessWebsiteListPref;
+                       RoleList = &BusinessRoleList;
+                       RoleListType = &BusinessRoleListType;
+                       RoleListAltID = &BusinessRoleListAltID;
+                       RoleListPID = &BusinessRoleListPID;
+                       RoleListTokens = &BusinessRoleListTokens;
+                       RoleListLanguage = &BusinessRoleListLanguage;   
+                       RoleListPref = &BusinessRoleListPref;
                        break;
        }
-       
-       intPrevValue = 4;
-       
+
+       intPrevValue = 5;
+               
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -2993,22 +3769,22 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
                        
                        PropertyValue.Remove(0, 1);
                        
-               }
+               }                               
                
                CaptureString(&PropertyValue, FALSE);
                
                if (PropertyName == wxT("ALTID")){
-
-                       WebsiteListAltID->erase(*URLCount);
-                       WebsiteListAltID->insert(std::make_pair(*URLCount, PropertyValue));
+               
+                       RoleListAltID->erase(*RoleCount);
+                       RoleListAltID->insert(std::make_pair(*RoleCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       WebsiteListPID->erase(*URLCount);
-                       WebsiteListPID->insert(std::make_pair(*URLCount, PropertyValue));
-                       
+                       RoleListPID->erase(*RoleCount);
+                       RoleListPID->insert(std::make_pair(*RoleCount, PropertyValue));
+               
                } else if (PropertyName == wxT("PREF")){
-                       
+                               
                        int PriorityNumber = 0;
                        bool ValidNumber = TRUE;
                        
@@ -3022,15 +3798,15 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
 
                        if (ValidNumber == TRUE){
 
-                               WebsiteListPref->erase(*URLCount);
-                               WebsiteListPref->insert(std::make_pair(*URLCount, PriorityNumber));
+                               RoleListPref->erase(*RoleCount);
+                               RoleListPref->insert(std::make_pair(*RoleCount, PriorityNumber));
 
                        }
                                        
-               } else if (PropertyName == wxT("MEDIATYPE")){
+               } else if (PropertyName == wxT("LANGUAGE")){
                
-                       WebsiteListMediatype->erase(*URLCount);
-                       WebsiteListMediatype->insert(std::make_pair(*URLCount, PropertyValue));
+                       RoleListLanguage->erase(*RoleCount);
+                       RoleListLanguage->insert(std::make_pair(*RoleCount, PropertyValue));
                
                } else {
                
@@ -3059,18 +3835,18 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
        // Add the data to the General/Home/Work address variables.
        
        CaptureString(&PropertySeg2, FALSE);
-                       
-       WebsiteList->insert(std::make_pair(*URLCount, PropertySeg2));
+
+       RoleList->insert(std::make_pair(*RoleCount, PropertySeg2));
        
        if (!PropertyTokens.IsEmpty()){
        
-               WebsiteListTokens->insert(std::make_pair(*URLCount, PropertyTokens));
+               RoleListTokens->insert(std::make_pair(*RoleCount, PropertyTokens));
                        
        }
-       
+
 }
 
-void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg2, int *TitleCount){
+void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString PropertySeg2, int *OrganisationCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
@@ -3080,14 +3856,14 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
-       int intPrevValue = 7;
+       int intPrevValue = 5;
        int intPref = 0;                        
        int intType = 0;
        long ListCtrlIndex;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 6;
+       intPrevValue = 4;
        
        PropertyType PropType = PROPERTY_NONE;
                
@@ -3097,47 +3873,51 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
        
        // Setup the pointers.
        
-       std::map<int, wxString> *TitleList = NULL;
-       std::map<int, wxString> *TitleListAltID = NULL;
-       std::map<int, wxString> *TitleListPID = NULL;
-       std::map<int, wxString> *TitleListType = NULL;
-       std::map<int, wxString> *TitleListTokens = NULL;
-       std::map<int, wxString> *TitleListLanguage = NULL;
-       std::map<int, int> *TitleListPref = NULL;
+       std::map<int, wxString> *OrganisationsList = NULL;
+       std::map<int, wxString> *OrganisationsListAltID = NULL;
+       std::map<int, wxString> *OrganisationsListPID = NULL;
+       std::map<int, wxString> *OrganisationsListType = NULL;
+       std::map<int, wxString> *OrganisationsListTokens = NULL;
+       std::map<int, wxString> *OrganisationsListLanguage = NULL;
+       std::map<int, wxString> *OrganisationsListSortAs = NULL;
+       std::map<int, int> *OrganisationsListPref = NULL;
        
        // Setup blank lines for later on.
        
        switch(PropType){
                case PROPERTY_NONE:
-                       TitleList = &GeneralTitleList;
-                       TitleListType = &GeneralTitleListType;
-                       TitleListAltID = &GeneralTitleListAltID;
-                       TitleListPID = &GeneralTitleListPID;
-                       TitleListTokens = &GeneralTitleListTokens;
-                       TitleListLanguage = &GeneralTitleListLanguage;
-                       TitleListPref = &GeneralTitleListPref;  
+                       OrganisationsList = &GeneralOrganisationsList;
+                       OrganisationsListType = &GeneralOrganisationsListType;
+                       OrganisationsListAltID = &GeneralOrganisationsListAltID;
+                       OrganisationsListPID = &GeneralOrganisationsListPID;
+                       OrganisationsListTokens = &GeneralOrganisationsListTokens;
+                       OrganisationsListLanguage = &GeneralOrganisationsListLanguage;
+                       OrganisationsListSortAs = &GeneralOrganisationsListSortAs;
+                       OrganisationsListPref = &GeneralOrganisationsListPref;  
                        break;
                case PROPERTY_HOME:
-                       TitleList = &HomeTitleList;
-                       TitleListType = &HomeTitleListType;
-                       TitleListAltID = &HomeTitleListAltID;
-                       TitleListPID = &HomeTitleListPID;
-                       TitleListTokens = &HomeTitleListTokens;
-                       TitleListLanguage = &HomeTitleListLanguage;
-                       TitleListPref = &HomeTitleListPref;     
+                       OrganisationsList = &HomeOrganisationsList;
+                       OrganisationsListType = &HomeOrganisationsListType;
+                       OrganisationsListAltID = &HomeOrganisationsListAltID;
+                       OrganisationsListPID = &HomeOrganisationsListPID;
+                       OrganisationsListTokens = &HomeOrganisationsListTokens;
+                       OrganisationsListLanguage = &HomeOrganisationsListLanguage;
+                       OrganisationsListSortAs = &HomeOrganisationsListSortAs;
+                       OrganisationsListPref = &HomeOrganisationsListPref;     
                        break;
                case PROPERTY_WORK:
-                       TitleList = &BusinessTitleList;
-                       TitleListType = &BusinessTitleListType;
-                       TitleListAltID = &BusinessTitleListAltID;
-                       TitleListPID = &BusinessTitleListPID;
-                       TitleListTokens = &BusinessTitleListTokens;
-                       TitleListLanguage = &BusinessTitleListLanguage; 
-                       TitleListPref = &BusinessTitleListPref;
+                       OrganisationsList = &BusinessOrganisationsList;
+                       OrganisationsListType = &BusinessOrganisationsListType;
+                       OrganisationsListAltID = &BusinessOrganisationsListAltID;
+                       OrganisationsListPID = &BusinessOrganisationsListPID;
+                       OrganisationsListTokens = &BusinessOrganisationsListTokens;
+                       OrganisationsListLanguage = &BusinessOrganisationsListLanguage;
+                       OrganisationsListSortAs = &BusinessOrganisationsListSortAs;     
+                       OrganisationsListPref = &BusinessOrganisationsListPref;
                        break;
        }
 
-       intPrevValue = 6;
+       intPrevValue = 4;
                
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -3173,13 +3953,18 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
                
                if (PropertyName == wxT("ALTID")){
                
-                       TitleListAltID->erase(*TitleCount);
-                       TitleListAltID->insert(std::make_pair(*TitleCount, PropertyValue));
+                       OrganisationsListAltID->erase(*OrganisationCount);
+                       OrganisationsListAltID->insert(std::make_pair(*OrganisationCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       TitleListPID->erase(*TitleCount);
-                       TitleListPID->insert(std::make_pair(*TitleCount, PropertyValue));
+                       OrganisationsListPID->erase(*OrganisationCount);
+                       OrganisationsListPID->insert(std::make_pair(*OrganisationCount, PropertyValue));
+               
+               } else if (PropertyName == wxT("SORT-AS")){
+
+                       OrganisationsListSortAs->erase(*OrganisationCount);
+                       OrganisationsListSortAs->insert(std::make_pair(*OrganisationCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
                                
@@ -3196,15 +3981,15 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
 
                        if (ValidNumber == TRUE){
 
-                               TitleListPref->erase(*TitleCount);
-                               TitleListPref->insert(std::make_pair(*TitleCount, PriorityNumber));
+                               OrganisationsListPref->erase(*OrganisationCount);
+                               OrganisationsListPref->insert(std::make_pair(*OrganisationCount, PriorityNumber));
 
                        }
                                        
                } else if (PropertyName == wxT("LANGUAGE")){
                
-                       TitleListLanguage->erase(*TitleCount);
-                       TitleListLanguage->insert(std::make_pair(*TitleCount, PropertyValue));
+                       OrganisationsListLanguage->erase(*OrganisationCount);
+                       OrganisationsListLanguage->insert(std::make_pair(*OrganisationCount, PropertyValue));
                
                } else {
                
@@ -3234,17 +4019,17 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
        
        CaptureString(&PropertySeg2, FALSE);
 
-       TitleList->insert(std::make_pair(*TitleCount, PropertySeg2));
+       OrganisationsList->insert(std::make_pair(*OrganisationCount, PropertySeg2));
        
        if (!PropertyTokens.IsEmpty()){
        
-               TitleListTokens->insert(std::make_pair(*TitleCount, PropertyTokens));
+               OrganisationsListTokens->insert(std::make_pair(*OrganisationCount, PropertyTokens));
                        
        }
 
 }
 
-void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2, int *RoleCount){
+void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2, int *NoteCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
@@ -3271,43 +4056,43 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2
        
        // Setup the pointers.
        
-       std::map<int, wxString> *RoleList = NULL;
-       std::map<int, wxString> *RoleListAltID = NULL;
-       std::map<int, wxString> *RoleListPID = NULL;
-       std::map<int, wxString> *RoleListType = NULL;
-       std::map<int, wxString> *RoleListTokens = NULL;
-       std::map<int, wxString> *RoleListLanguage = NULL;
-       std::map<int, int> *RoleListPref = NULL;
+       std::map<int, wxString> *NoteList = NULL;
+       std::map<int, wxString> *NoteListAltID = NULL;
+       std::map<int, wxString> *NoteListPID = NULL;
+       std::map<int, wxString> *NoteListType = NULL;
+       std::map<int, wxString> *NoteListTokens = NULL;
+       std::map<int, wxString> *NoteListLanguage = NULL;
+       std::map<int, int> *NoteListPref = NULL;
        
        // Setup blank lines for later on.
-       
-       switch(PropType){
-               case PROPERTY_NONE:
-                       RoleList = &GeneralRoleList;
-                       RoleListType = &GeneralRoleListType;
-                       RoleListAltID = &GeneralRoleListAltID;
-                       RoleListPID = &GeneralRoleListPID;
-                       RoleListTokens = &GeneralRoleListTokens;
-                       RoleListLanguage = &GeneralRoleListLanguage;
-                       RoleListPref = &GeneralRoleListPref;    
+       
+       switch(PropType){
+               case PROPERTY_NONE:
+                       NoteList = &GeneralNoteList;
+                       NoteListType = &GeneralNoteListType;
+                       NoteListAltID = &GeneralNoteListAltID;
+                       NoteListPID = &GeneralNoteListPID;
+                       NoteListTokens = &GeneralNoteListTokens;
+                       NoteListLanguage = &GeneralNoteListLanguage;
+                       NoteListPref = &GeneralNoteListPref;    
                        break;
                case PROPERTY_HOME:
-                       RoleList = &HomeRoleList;
-                       RoleListType = &HomeRoleListType;
-                       RoleListAltID = &HomeRoleListAltID;
-                       RoleListPID = &HomeRoleListPID;
-                       RoleListTokens = &HomeRoleListTokens;
-                       RoleListLanguage = &HomeRoleListLanguage;
-                       RoleListPref = &HomeRoleListPref;       
+                       NoteList = &HomeNoteList;
+                       NoteListType = &HomeNoteListType;
+                       NoteListAltID = &HomeNoteListAltID;
+                       NoteListPID = &HomeNoteListPID;
+                       NoteListTokens = &HomeNoteListTokens;
+                       NoteListLanguage = &HomeNoteListLanguage;
+                       NoteListPref = &HomeNoteListPref;       
                        break;
                case PROPERTY_WORK:
-                       RoleList = &BusinessRoleList;
-                       RoleListType = &BusinessRoleListType;
-                       RoleListAltID = &BusinessRoleListAltID;
-                       RoleListPID = &BusinessRoleListPID;
-                       RoleListTokens = &BusinessRoleListTokens;
-                       RoleListLanguage = &BusinessRoleListLanguage;   
-                       RoleListPref = &BusinessRoleListPref;
+                       NoteList = &BusinessNoteList;
+                       NoteListType = &BusinessNoteListType;
+                       NoteListAltID = &BusinessNoteListAltID;
+                       NoteListPID = &BusinessNoteListPID;
+                       NoteListTokens = &BusinessNoteListTokens;
+                       NoteListLanguage = &BusinessNoteListLanguage;   
+                       NoteListPref = &BusinessNoteListPref;
                        break;
        }
 
@@ -3347,13 +4132,13 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2
                
                if (PropertyName == wxT("ALTID")){
                
-                       RoleListAltID->erase(*RoleCount);
-                       RoleListAltID->insert(std::make_pair(*RoleCount, PropertyValue));
+                       NoteListAltID->erase(*NoteCount);
+                       NoteListAltID->insert(std::make_pair(*NoteCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       RoleListPID->erase(*RoleCount);
-                       RoleListPID->insert(std::make_pair(*RoleCount, PropertyValue));
+                       NoteListPID->erase(*NoteCount);
+                       NoteListPID->insert(std::make_pair(*NoteCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
                                
@@ -3370,15 +4155,15 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2
 
                        if (ValidNumber == TRUE){
 
-                               RoleListPref->erase(*RoleCount);
-                               RoleListPref->insert(std::make_pair(*RoleCount, PriorityNumber));
+                               NoteListPref->erase(*NoteCount);
+                               NoteListPref->insert(std::make_pair(*NoteCount, PriorityNumber));
 
                        }
                                        
                } else if (PropertyName == wxT("LANGUAGE")){
                
-                       RoleListLanguage->erase(*RoleCount);
-                       RoleListLanguage->insert(std::make_pair(*RoleCount, PropertyValue));
+                       NoteListLanguage->erase(*NoteCount);
+                       NoteListLanguage->insert(std::make_pair(*NoteCount, PropertyValue));
                
                } else {
                
@@ -3408,17 +4193,17 @@ void ContactDataObject::ProcessRole(wxString PropertySeg1, wxString PropertySeg2
        
        CaptureString(&PropertySeg2, FALSE);
 
-       RoleList->insert(std::make_pair(*RoleCount, PropertySeg2));
+       NoteList->insert(std::make_pair(*NoteCount, PropertySeg2));
        
        if (!PropertyTokens.IsEmpty()){
        
-               RoleListTokens->insert(std::make_pair(*RoleCount, PropertyTokens));
+               NoteListTokens->insert(std::make_pair(*NoteCount, PropertyTokens));
                        
        }
 
 }
 
-void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString PropertySeg2, int *OrganisationCount){
+void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString PropertySeg2, int *CategoryCount){
 
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
@@ -3428,14 +4213,14 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
-       int intPrevValue = 5;
+       int intPrevValue = 12;
        int intPref = 0;                        
        int intType = 0;
        long ListCtrlIndex;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 4;
+       intPrevValue = 11;
        
        PropertyType PropType = PROPERTY_NONE;
                
@@ -3443,53 +4228,20 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop
        
        CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
        
-       // Setup the pointers.
-       
-       std::map<int, wxString> *OrganisationsList = NULL;
-       std::map<int, wxString> *OrganisationsListAltID = NULL;
-       std::map<int, wxString> *OrganisationsListPID = NULL;
-       std::map<int, wxString> *OrganisationsListType = NULL;
-       std::map<int, wxString> *OrganisationsListTokens = NULL;
-       std::map<int, wxString> *OrganisationsListLanguage = NULL;
-       std::map<int, wxString> *OrganisationsListSortAs = NULL;
-       std::map<int, int> *OrganisationsListPref = NULL;
-       
        // Setup blank lines for later on.
        
        switch(PropType){
                case PROPERTY_NONE:
-                       OrganisationsList = &GeneralOrganisationsList;
-                       OrganisationsListType = &GeneralOrganisationsListType;
-                       OrganisationsListAltID = &GeneralOrganisationsListAltID;
-                       OrganisationsListPID = &GeneralOrganisationsListPID;
-                       OrganisationsListTokens = &GeneralOrganisationsListTokens;
-                       OrganisationsListLanguage = &GeneralOrganisationsListLanguage;
-                       OrganisationsListSortAs = &GeneralOrganisationsListSortAs;
-                       OrganisationsListPref = &GeneralOrganisationsListPref;  
                        break;
                case PROPERTY_HOME:
-                       OrganisationsList = &HomeOrganisationsList;
-                       OrganisationsListType = &HomeOrganisationsListType;
-                       OrganisationsListAltID = &HomeOrganisationsListAltID;
-                       OrganisationsListPID = &HomeOrganisationsListPID;
-                       OrganisationsListTokens = &HomeOrganisationsListTokens;
-                       OrganisationsListLanguage = &HomeOrganisationsListLanguage;
-                       OrganisationsListSortAs = &HomeOrganisationsListSortAs;
-                       OrganisationsListPref = &HomeOrganisationsListPref;     
+                       CategoriesListType.insert(std::make_pair(*CategoryCount, "home"));
                        break;
                case PROPERTY_WORK:
-                       OrganisationsList = &BusinessOrganisationsList;
-                       OrganisationsListType = &BusinessOrganisationsListType;
-                       OrganisationsListAltID = &BusinessOrganisationsListAltID;
-                       OrganisationsListPID = &BusinessOrganisationsListPID;
-                       OrganisationsListTokens = &BusinessOrganisationsListTokens;
-                       OrganisationsListLanguage = &BusinessOrganisationsListLanguage;
-                       OrganisationsListSortAs = &BusinessOrganisationsListSortAs;     
-                       OrganisationsListPref = &BusinessOrganisationsListPref;
+                       CategoriesListType.insert(std::make_pair(*CategoryCount, "work"));
                        break;
        }
 
-       intPrevValue = 4;
+       intPrevValue = 11;
                
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -3525,18 +4277,13 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop
                
                if (PropertyName == wxT("ALTID")){
                
-                       OrganisationsListAltID->erase(*OrganisationCount);
-                       OrganisationsListAltID->insert(std::make_pair(*OrganisationCount, PropertyValue));
+                       CategoriesListAltID.erase(*CategoryCount);
+                       CategoriesListAltID.insert(std::make_pair(*CategoryCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       OrganisationsListPID->erase(*OrganisationCount);
-                       OrganisationsListPID->insert(std::make_pair(*OrganisationCount, PropertyValue));
-               
-               } else if (PropertyName == wxT("SORT-AS")){
-
-                       OrganisationsListSortAs->erase(*OrganisationCount);
-                       OrganisationsListSortAs->insert(std::make_pair(*OrganisationCount, PropertyValue));
+                       CategoriesListPID.erase(*CategoryCount);
+                       CategoriesListPID.insert(std::make_pair(*CategoryCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
                                
@@ -3553,56 +4300,212 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop
 
                        if (ValidNumber == TRUE){
 
-                               OrganisationsListPref->erase(*OrganisationCount);
-                               OrganisationsListPref->insert(std::make_pair(*OrganisationCount, PriorityNumber));
+                               CategoriesListPref.erase(*CategoryCount);
+                               CategoriesListPref.insert(std::make_pair(*CategoryCount, PriorityNumber));
+
+                       }
+                                       
+               } else if (PropertyName == wxT("LANGUAGE")){
+               
+                       CategoriesListLanguage.erase(*CategoryCount);
+                       CategoriesListLanguage.insert(std::make_pair(*CategoryCount, PropertyValue));
+               
+               } else {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+               
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+               
+                               if (FirstToken == TRUE){
+                       
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                       
+                               } else {
+                       
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                       
+                               }
+               
+                       }
+               
+               }
+       
+       }
+       
+       // Deal with multiple categories.
+       
+       int intOrigCatCount = *CategoryCount;
+       bool FirstCategoryProcessed = TRUE;
+       bool AfterFirstToken = FALSE;
+       int intSplitSize = 0;
+       int intSplitsFound = 0;
+       int intSplitSeek = 0;
+       int intPropertyLen = PropertySeg2.Len();
+       
+       SplitPoints.clear();
+       SplitLength.clear();
+       intPrevValue = 0;
+       
+       for (int i = 0; i <= intPropertyLen; i++){
+       
+               if (intSplitSize == 0 && PropertySeg2.Mid(i, 1) == wxT(" ")){
+       
+                       continue;
+               
+               }
+       
+               intSplitSize++;
+       
+               if (PropertySeg2.Mid(i, 1) == wxT(",") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){
+       
+                       if (AfterFirstToken == TRUE){
+               
+                               SplitPoints.insert(std::make_pair(intSplitsFound, (i - intSplitSize + 1)));
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2)));
+                       
+                       } else {
+                       
+                               SplitPoints.insert(std::make_pair(intSplitsFound, 0));
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2)));                                 
+                               AfterFirstToken = TRUE;
+
+                       }
+
+                       intSplitsFound++;
+                       intSplitSeek = i;
+                       intSplitSize = 0;                               
+       
+               }                       
+       
+       }
+       
+       if (SplitPoints.size() > 0){
+       
+               SplitPoints.insert(std::make_pair(intSplitsFound, (intSplitSeek + 1)));
+               SplitLength.insert(std::make_pair(intSplitsFound, intSplitSize));
+       
+       }
+       
+       if (SplitPoints.size() == 0){
+       
+               CategoriesList.insert(std::make_pair(*CategoryCount, PropertySeg2));
+       
+               if (!PropertyTokens.IsEmpty()){
+               
+                       CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens));
+               
+               }
+       
+       }
+       
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
+       
+               SLiter = SplitLength.find(intiter->first);
+       
+               intPrevValue = intiter->second;
+       
+               PropertyData = PropertySeg2.Mid(intPrevValue, (SLiter->second + 1));
+               
+               // Add the data to the General/Home/Work address variables.
+       
+               // Trim any whitespace from the start and end.
+       
+               PropertyData = PropertyData.Trim(FALSE);
+               PropertyData = PropertyData.Trim(TRUE); 
+       
+               CaptureString(&PropertyData, FALSE);
+               
+               if (FirstCategoryProcessed == TRUE){
+               
+                       FirstCategoryProcessed = FALSE;
+                       
+                       CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData));
+       
+                       if (!PropertyTokens.IsEmpty()){
+               
+                               CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens));
+               
+                       }
+                       
+                       continue;
+               
+               } else {
 
+                       (*CategoryCount)++;
+                       
+                       CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData));
+               
+                       if (!PropertyTokens.IsEmpty()){
+               
+                               CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens));
+               
                        }
-                                       
-               } else if (PropertyName == wxT("LANGUAGE")){
                
-                       OrganisationsListLanguage->erase(*OrganisationCount);
-                       OrganisationsListLanguage->insert(std::make_pair(*OrganisationCount, PropertyValue));
+               }
                
-               } else {
+               // Copy the properties to each of the categories (if it exists).
                
-                       // Something else we don't know about so append
-                       // to the tokens variable.
+               if (!PropertyTokens.IsEmpty()){
                
-                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       CategoriesListTokens.insert(std::make_pair(*CategoryCount, CategoriesListTokens.find(intOrigCatCount)->second));
                
-                               if (FirstToken == TRUE){
-                       
-                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                                       FirstToken = FALSE;
-                       
-                               } else {
-                       
-                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                       
-                               }
+               }
                
-                       }
+               // Check if ALTID was used.
+               
+               if (CategoriesListAltID.find(intOrigCatCount) != CategoriesListAltID.end()){
+               
+                       CategoriesListAltID.insert(std::make_pair(*CategoryCount, CategoriesListAltID.find(intOrigCatCount)->second));
+               
+               }
+               
+               // Check if PID was used.
+               
+               if (CategoriesListPID.find(intOrigCatCount) != CategoriesListPID.end()){
+               
+                       CategoriesListPID.insert(std::make_pair(*CategoryCount, CategoriesListPID.find(intOrigCatCount)->second));
                
                }
        
-       }
-       
-       // Add the data to the General/Home/Work address variables.
-       
-       CaptureString(&PropertySeg2, FALSE);
-
-       OrganisationsList->insert(std::make_pair(*OrganisationCount, PropertySeg2));
+               // Check if PREF was used.
        
-       if (!PropertyTokens.IsEmpty()){
+               if (CategoriesListPref.find(intOrigCatCount) != CategoriesListPref.end()){
+               
+                       CategoriesListPref.insert(std::make_pair(*CategoryCount, CategoriesListPref.find(intOrigCatCount)->second));
+               
+               }
+               
+               // Check if LANGUAGE was used.
+               
+               if (CategoriesListLanguage.find(intOrigCatCount) != CategoriesListLanguage.end()){
+               
+                       CategoriesListLanguage.insert(std::make_pair(*CategoryCount, CategoriesListLanguage.find(intOrigCatCount)->second));
+               
+               }
+               
+               // Check if TYPE was used.
+               
+               switch(PropType){
+                       case PROPERTY_NONE:
+                               break;
+                       case PROPERTY_HOME:
+                               CategoriesListType.insert(std::make_pair(*CategoryCount, "home"));
+                               break;
+                       case PROPERTY_WORK:
+                               CategoriesListType.insert(std::make_pair(*CategoryCount, "work"));
+                               break;
+               }
        
-               OrganisationsListTokens->insert(std::make_pair(*OrganisationCount, PropertyTokens));
-                       
        }
 
 }
 
-void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2, int *NoteCount){
+void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg2, int *PhotoCount){
 
+       size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
        std::map<int, int>::iterator SLiter;                    
@@ -3611,65 +4514,24 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
-       int intPrevValue = 6;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 7;
        int intPref = 0;                        
        int intType = 0;
-       long ListCtrlIndex;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 5;
+       intPrevValue = 6;
        
        PropertyType PropType = PROPERTY_NONE;
                
        // Look for type before continuing.
        
        CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
-       
-       // Setup the pointers.
-       
-       std::map<int, wxString> *NoteList = NULL;
-       std::map<int, wxString> *NoteListAltID = NULL;
-       std::map<int, wxString> *NoteListPID = NULL;
-       std::map<int, wxString> *NoteListType = NULL;
-       std::map<int, wxString> *NoteListTokens = NULL;
-       std::map<int, wxString> *NoteListLanguage = NULL;
-       std::map<int, int> *NoteListPref = NULL;
-       
-       // Setup blank lines for later on.
-       
-       switch(PropType){
-               case PROPERTY_NONE:
-                       NoteList = &GeneralNoteList;
-                       NoteListType = &GeneralNoteListType;
-                       NoteListAltID = &GeneralNoteListAltID;
-                       NoteListPID = &GeneralNoteListPID;
-                       NoteListTokens = &GeneralNoteListTokens;
-                       NoteListLanguage = &GeneralNoteListLanguage;
-                       NoteListPref = &GeneralNoteListPref;    
-                       break;
-               case PROPERTY_HOME:
-                       NoteList = &HomeNoteList;
-                       NoteListType = &HomeNoteListType;
-                       NoteListAltID = &HomeNoteListAltID;
-                       NoteListPID = &HomeNoteListPID;
-                       NoteListTokens = &HomeNoteListTokens;
-                       NoteListLanguage = &HomeNoteListLanguage;
-                       NoteListPref = &HomeNoteListPref;       
-                       break;
-               case PROPERTY_WORK:
-                       NoteList = &BusinessNoteList;
-                       NoteListType = &BusinessNoteListType;
-                       NoteListAltID = &BusinessNoteListAltID;
-                       NoteListPID = &BusinessNoteListPID;
-                       NoteListTokens = &BusinessNoteListTokens;
-                       NoteListLanguage = &BusinessNoteListLanguage;   
-                       NoteListPref = &BusinessNoteListPref;
-                       break;
-       }
 
-       intPrevValue = 5;
-               
+       intPrevValue = 6;
+
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -3698,22 +4560,22 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2
                        
                        PropertyValue.Remove(0, 1);
                        
-               }                               
+               }
                
                CaptureString(&PropertyValue, FALSE);
                
                if (PropertyName == wxT("ALTID")){
-               
-                       NoteListAltID->erase(*NoteCount);
-                       NoteListAltID->insert(std::make_pair(*NoteCount, PropertyValue));
+
+                       PicturesListAltID.erase(*PhotoCount);
+                       PicturesListAltID.insert(std::make_pair(*PhotoCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       NoteListPID->erase(*NoteCount);
-                       NoteListPID->insert(std::make_pair(*NoteCount, PropertyValue));
+                       PicturesListPID.erase(*PhotoCount);
+                       PicturesListPID.insert(std::make_pair(*PhotoCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
-                               
+                       
                        int PriorityNumber = 0;
                        bool ValidNumber = TRUE;
                        
@@ -3727,35 +4589,107 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2
 
                        if (ValidNumber == TRUE){
 
-                               NoteListPref->erase(*NoteCount);
-                               NoteListPref->insert(std::make_pair(*NoteCount, PriorityNumber));
+                               PicturesListPref.erase(*PhotoCount);
+                               PicturesListPref.insert(std::make_pair(*PhotoCount, PriorityNumber));
 
                        }
-                                       
-               } else if (PropertyName == wxT("LANGUAGE")){
                
-                       NoteListLanguage->erase(*NoteCount);
-                       NoteListLanguage->insert(std::make_pair(*NoteCount, PropertyValue));
+               } else if (PropertyName == wxT("MEDIATYPE")){
                
+                       PicturesListMediatype.erase(*PhotoCount);
+                       PicturesListMediatype.insert(std::make_pair(*PhotoCount, PropertyValue));
+                                       
                } else {
                
                        // Something else we don't know about so append
                        // to the tokens variable.
-               
+                       
                        if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-               
-                               if (FirstToken == TRUE){
                        
+                               if (FirstToken == TRUE){
+                               
                                        PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
                                        FirstToken = FALSE;
-                       
+                               
                                } else {
-                       
+                               
                                        PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                       
+                               
                                }
+                       
+                       }
                
+               }
+       
+       }       
+       
+       intPropertyLen = PropertySeg2.Len();
+       SplitPoints.clear();
+       SplitLength.clear();
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;                       
+       
+       CaptureString(&PropertySeg2, FALSE);
+       
+       for (int i = 0; i <= intPropertyLen; i++){
+
+               intSplitSize++;
+       
+               if (PropertySeg2.Mid(i, 1) == wxT(";")){
+       
+                       intSplitsFound++;
+                       SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1)));
+                       
+                       if (intSplitsFound == 6){ 
+                       
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                               break; 
+                               
+                       } else {
+                       
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                       
                        }
+                       
+                       intSplitSize = 0;                                       
+       
+               }
+
+       }
+       
+       wxString wxSPhotoURI;
+       wxString wxSPhotoMIME;
+       wxString wxSPhotoEncoding;
+       wxString wxSPhotoData;
+       std::string base64enc;
+       
+       if (intSplitsFound == 0){
+       
+       } else {
+       
+               std::map<int, int>::iterator striter;
+       
+               striter = SplitLength.find(1);
+       
+               wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":"));
+       
+               while (wSTDataType.HasMoreTokens() == TRUE){
+               
+                       wxSPhotoURI = wSTDataType.GetNextToken();
+                       wxSPhotoMIME = wSTDataType.GetNextToken();
+                       break;
+               
+               }                       
+       
+               wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(","));                       
+       
+               while (wSTDataInfo.HasMoreTokens() == TRUE){
+               
+                       wxSPhotoEncoding = wSTDataInfo.GetNextToken();
+                       wxSPhotoData = wSTDataInfo.GetNextToken();
+                       base64enc = wxSPhotoData.mb_str();
+                       break;
                
                }
        
@@ -3763,20 +4697,32 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2
        
        // Add the data to the General/Home/Work address variables.
        
-       CaptureString(&PropertySeg2, FALSE);
-
-       NoteList->insert(std::make_pair(*NoteCount, PropertySeg2));
+       PicturesList.insert(std::make_pair(*PhotoCount, base64enc));
+       PicturesListPictureType.insert(std::make_pair(*PhotoCount, wxSPhotoMIME));
+       PicturesListPicEncType.insert(std::make_pair(*PhotoCount, wxSPhotoEncoding));
+       
+       switch(PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME:
+                       PicturesListType.insert(std::make_pair(*PhotoCount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       PicturesListType.insert(std::make_pair(*PhotoCount, "work"));
+                       break;
+       }
        
        if (!PropertyTokens.IsEmpty()){
+
+               PicturesListTokens.insert(std::make_pair(*PhotoCount, PropertyTokens));
        
-               NoteListTokens->insert(std::make_pair(*NoteCount, PropertyTokens));
-                       
        }
 
 }
 
-void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString PropertySeg2, int *CategoryCount){
+void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2, int *LogoCount){
 
+       size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
        std::map<int, int> SplitLength;
        std::map<int, int>::iterator SLiter;                    
@@ -3785,36 +4731,24 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property
        wxString PropertyValue;
        wxString PropertyTokens;
        bool FirstToken = TRUE;
-       int intPrevValue = 12;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 6;
        int intPref = 0;                        
        int intType = 0;
-       long ListCtrlIndex;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 11;
+       intPrevValue = 5;
        
        PropertyType PropType = PROPERTY_NONE;
                
        // Look for type before continuing.
        
        CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
-       
-       // Setup blank lines for later on.
-       
-       switch(PropType){
-               case PROPERTY_NONE:
-                       break;
-               case PROPERTY_HOME:
-                       CategoriesListType.insert(std::make_pair(*CategoryCount, "home"));
-                       break;
-               case PROPERTY_WORK:
-                       CategoriesListType.insert(std::make_pair(*CategoryCount, "work"));
-                       break;
-       }
 
-       intPrevValue = 11;
-               
+       intPrevValue = 5;
+
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
        
@@ -3843,22 +4777,22 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property
                        
                        PropertyValue.Remove(0, 1);
                        
-               }                               
+               }
                
                CaptureString(&PropertyValue, FALSE);
                
                if (PropertyName == wxT("ALTID")){
-               
-                       CategoriesListAltID.erase(*CategoryCount);
-                       CategoriesListAltID.insert(std::make_pair(*CategoryCount, PropertyValue));
+
+                       LogosListAltID.erase(*LogoCount);
+                       LogosListAltID.insert(std::make_pair(*LogoCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       CategoriesListPID.erase(*CategoryCount);
-                       CategoriesListPID.insert(std::make_pair(*CategoryCount, PropertyValue));
+                       LogosListPID.erase(*LogoCount);
+                       LogosListPID.insert(std::make_pair(*LogoCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
-                               
+                       
                        int PriorityNumber = 0;
                        bool ValidNumber = TRUE;
                        
@@ -3872,210 +4806,138 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property
 
                        if (ValidNumber == TRUE){
 
-                               CategoriesListPref.erase(*CategoryCount);
-                               CategoriesListPref.insert(std::make_pair(*CategoryCount, PriorityNumber));
+                               LogosListPref.erase(*LogoCount);
+                               LogosListPref.insert(std::make_pair(*LogoCount, PriorityNumber));
 
                        }
-                                       
-               } else if (PropertyName == wxT("LANGUAGE")){
                
-                       CategoriesListLanguage.erase(*CategoryCount);
-                       CategoriesListLanguage.insert(std::make_pair(*CategoryCount, PropertyValue));
+               } else if (PropertyName == wxT("MEDIATYPE")){
                
+                       LogosListMediatype.erase(*LogoCount);
+                       LogosListMediatype.insert(std::make_pair(*LogoCount, PropertyValue));
+                                       
                } else {
                
                        // Something else we don't know about so append
                        // to the tokens variable.
-               
+                       
                        if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
-               
-                               if (FirstToken == TRUE){
                        
+                               if (FirstToken == TRUE){
+                               
                                        PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
                                        FirstToken = FALSE;
-                       
+                               
                                } else {
-                       
+                               
                                        PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                       
+                               
                                }
-               
+                       
                        }
                
                }
        
-       }
-       
-       // Deal with multiple categories.
-       
-       int intOrigCatCount = *CategoryCount;
-       bool FirstCategoryProcessed = TRUE;
-       bool AfterFirstToken = FALSE;
-       int intSplitSize = 0;
-       int intSplitsFound = 0;
-       int intSplitSeek = 0;
-       int intPropertyLen = PropertySeg2.Len();
+       }       
        
+       intPropertyLen = PropertySeg2.Len();
        SplitPoints.clear();
        SplitLength.clear();
-       intPrevValue = 0;
-       
-       for (int i = 0; i <= intPropertyLen; i++){
-       
-               if (intSplitSize == 0 && PropertySeg2.Mid(i, 1) == wxT(" ")){
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;                       
        
-                       continue;
-               
-               }
+       CaptureString(&PropertySeg2, FALSE);
        
+       for (int i = 0; i <= intPropertyLen; i++){
+
                intSplitSize++;
        
-               if (PropertySeg2.Mid(i, 1) == wxT(",") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){
+               if (PropertySeg2.Mid(i, 1) == wxT(";")){
        
-                       if (AfterFirstToken == TRUE){
-               
-                               SplitPoints.insert(std::make_pair(intSplitsFound, (i - intSplitSize + 1)));
-                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2)));
+                       intSplitsFound++;
+                       SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1)));
+                       
+                       if (intSplitsFound == 6){ 
                        
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                               break; 
+                               
                        } else {
                        
-                               SplitPoints.insert(std::make_pair(intSplitsFound, 0));
-                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 2)));                                 
-                               AfterFirstToken = TRUE;
-
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                       
                        }
-
-                       intSplitsFound++;
-                       intSplitSeek = i;
-                       intSplitSize = 0;                               
-       
-               }                       
-       
-       }
-       
-       if (SplitPoints.size() > 0){
-       
-               SplitPoints.insert(std::make_pair(intSplitsFound, (intSplitSeek + 1)));
-               SplitLength.insert(std::make_pair(intSplitsFound, intSplitSize));
-       
-       }
-       
-       if (SplitPoints.size() == 0){
-       
-               CategoriesList.insert(std::make_pair(*CategoryCount, PropertySeg2));
+                       
+                       intSplitSize = 0;                                       
        
-               if (!PropertyTokens.IsEmpty()){
-               
-                       CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens));
-               
                }
-       
+
        }
        
-       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
-       intiter != SplitPoints.end(); ++intiter){
-       
-               SLiter = SplitLength.find(intiter->first);
+       wxString wxSPhotoURI;
+       wxString wxSPhotoMIME;
+       wxString wxSPhotoEncoding;
+       wxString wxSPhotoData;
+       std::string base64enc;
        
-               intPrevValue = intiter->second;
+       if (intSplitsFound == 0){
        
-               PropertyData = PropertySeg2.Mid(intPrevValue, (SLiter->second + 1));
-               
-               // Add the data to the General/Home/Work address variables.
+       } else {
        
-               // Trim any whitespace from the start and end.
+               std::map<int, int>::iterator striter;
        
-               PropertyData = PropertyData.Trim(FALSE);
-               PropertyData = PropertyData.Trim(TRUE); 
+               striter = SplitLength.find(1);
        
-               CaptureString(&PropertyData, FALSE);
-               
-               if (FirstCategoryProcessed == TRUE){
-               
-                       FirstCategoryProcessed = FALSE;
-                       
-                       CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData));
+               wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":"));
        
-                       if (!PropertyTokens.IsEmpty()){
-               
-                               CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens));
-               
-                       }
-                       
-                       continue;
-               
-               } else {
-
-                       (*CategoryCount)++;
-                       
-                       CategoriesList.insert(std::make_pair(*CategoryCount, PropertyData));
-               
-                       if (!PropertyTokens.IsEmpty()){
-               
-                               CategoriesListTokens.insert(std::make_pair(*CategoryCount, PropertyTokens));
-               
-                       }
-               
-               }
-               
-               // Copy the properties to each of the categories (if it exists).
-               
-               if (!PropertyTokens.IsEmpty()){
-               
-                       CategoriesListTokens.insert(std::make_pair(*CategoryCount, CategoriesListTokens.find(intOrigCatCount)->second));
-               
-               }
-               
-               // Check if ALTID was used.
-               
-               if (CategoriesListAltID.find(intOrigCatCount) != CategoriesListAltID.end()){
-               
-                       CategoriesListAltID.insert(std::make_pair(*CategoryCount, CategoriesListAltID.find(intOrigCatCount)->second));
-               
-               }
-               
-               // Check if PID was used.
-               
-               if (CategoriesListPID.find(intOrigCatCount) != CategoriesListPID.end()){
+               while (wSTDataType.HasMoreTokens() == TRUE){
                
-                       CategoriesListPID.insert(std::make_pair(*CategoryCount, CategoriesListPID.find(intOrigCatCount)->second));
+                       wxSPhotoURI = wSTDataType.GetNextToken();
+                       wxSPhotoMIME = wSTDataType.GetNextToken();
+                       break;
                
-               }
+               }                       
        
-               // Check if PREF was used.
+               wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(","));                       
        
-               if (CategoriesListPref.find(intOrigCatCount) != CategoriesListPref.end()){
-               
-                       CategoriesListPref.insert(std::make_pair(*CategoryCount, CategoriesListPref.find(intOrigCatCount)->second));
-               
-               }
-               
-               // Check if LANGUAGE was used.
-               
-               if (CategoriesListLanguage.find(intOrigCatCount) != CategoriesListLanguage.end()){
-               
-                       CategoriesListLanguage.insert(std::make_pair(*CategoryCount, CategoriesListLanguage.find(intOrigCatCount)->second));
-               
-               }
+               while (wSTDataInfo.HasMoreTokens() == TRUE){
                
-               // Check if TYPE was used.
+                       wxSPhotoEncoding = wSTDataInfo.GetNextToken();
+                       wxSPhotoData = wSTDataInfo.GetNextToken();
+                       base64enc = wxSPhotoData.mb_str();
+                       break;
                
-               switch(PropType){
-                       case PROPERTY_NONE:
-                               break;
-                       case PROPERTY_HOME:
-                               CategoriesListType.insert(std::make_pair(*CategoryCount, "home"));
-                               break;
-                       case PROPERTY_WORK:
-                               CategoriesListType.insert(std::make_pair(*CategoryCount, "work"));
-                               break;
                }
        
        }
+       
+       // Add the data to the General/Home/Work address variables.
+       
+       LogosList.insert(std::make_pair(*LogoCount, base64enc));
+       LogosListPictureType.insert(std::make_pair(*LogoCount, wxSPhotoMIME));
+       LogosListPicEncType.insert(std::make_pair(*LogoCount, wxSPhotoEncoding));
+       
+       switch(PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME:
+                       LogosListType.insert(std::make_pair(*LogoCount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       LogosListType.insert(std::make_pair(*LogoCount, "work"));
+                       break;
+       }
+       
+       if (!PropertyTokens.IsEmpty()){
+
+               LogosListTokens.insert(std::make_pair(*LogoCount, PropertyTokens));
+       
+       }
 
 }
 
-void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg2, int *PhotoCount){
+void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg2, int *SoundCount){
 
        size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
@@ -4097,9 +4959,9 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
        intPrevValue = 6;
        
        PropertyType PropType = PROPERTY_NONE;
-               
-       // Look for type before continuing.
        
+       // Look for type before continuing.                     
+
        CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
 
        intPrevValue = 6;
@@ -4132,19 +4994,19 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
                        
                        PropertyValue.Remove(0, 1);
                        
-               }
+               }                       
                
                CaptureString(&PropertyValue, FALSE);
                
                if (PropertyName == wxT("ALTID")){
 
-                       PicturesListAltID.erase(*PhotoCount);
-                       PicturesListAltID.insert(std::make_pair(*PhotoCount, PropertyValue));
+                       SoundsListAltID.erase(*SoundCount);
+                       SoundsListAltID.insert(std::make_pair(*SoundCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       PicturesListPID.erase(*PhotoCount);
-                       PicturesListPID.insert(std::make_pair(*PhotoCount, PropertyValue));
+                       SoundsListPID.erase(*SoundCount);
+                       SoundsListPID.insert(std::make_pair(*SoundCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
                        
@@ -4161,16 +5023,21 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
 
                        if (ValidNumber == TRUE){
 
-                               PicturesListPref.erase(*PhotoCount);
-                               PicturesListPref.insert(std::make_pair(*PhotoCount, PriorityNumber));
+                               SoundsListPref.erase(*SoundCount);
+                               SoundsListPref.insert(std::make_pair(*SoundCount, PriorityNumber));
 
                        }
                
                } else if (PropertyName == wxT("MEDIATYPE")){
                
-                       PicturesListMediatype.erase(*PhotoCount);
-                       PicturesListMediatype.insert(std::make_pair(*PhotoCount, PropertyValue));
-                                       
+                       SoundsListMediatype.erase(*SoundCount);
+                       SoundsListMediatype.insert(std::make_pair(*SoundCount, PropertyValue));
+
+               } else if (PropertyName == wxT("LANGUAGE")){
+               
+                       SoundsListLanguage.erase(*SoundCount);
+                       SoundsListLanguage.insert(std::make_pair(*SoundCount, PropertyValue));
+
                } else {
                
                        // Something else we don't know about so append
@@ -4200,7 +5067,7 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
        SplitLength.clear();
        intSplitsFound = 0;
        intSplitSize = 0;
-       intPrevValue = 0;                       
+       intPrevValue = 0;
        
        CaptureString(&PropertySeg2, FALSE);
        
@@ -4230,10 +5097,10 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
 
        }
        
-       wxString wxSPhotoURI;
-       wxString wxSPhotoMIME;
-       wxString wxSPhotoEncoding;
-       wxString wxSPhotoData;
+       wxString wxSSoundURI;
+       wxString wxSSoundMIME;
+       wxString wxSSoundEncoding;
+       wxString wxSSoundData;
        std::string base64enc;
        
        if (intSplitsFound == 0){
@@ -4248,8 +5115,8 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
        
                while (wSTDataType.HasMoreTokens() == TRUE){
                
-                       wxSPhotoURI = wSTDataType.GetNextToken();
-                       wxSPhotoMIME = wSTDataType.GetNextToken();
+                       wxSSoundURI = wSTDataType.GetNextToken();
+                       wxSSoundMIME = wSTDataType.GetNextToken();
                        break;
                
                }                       
@@ -4258,9 +5125,9 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
        
                while (wSTDataInfo.HasMoreTokens() == TRUE){
                
-                       wxSPhotoEncoding = wSTDataInfo.GetNextToken();
-                       wxSPhotoData = wSTDataInfo.GetNextToken();
-                       base64enc = wxSPhotoData.mb_str();
+                       wxSSoundEncoding = wSTDataInfo.GetNextToken();
+                       wxSSoundData = wSTDataInfo.GetNextToken();                                      
+                       base64enc = wxSSoundData.mb_str();
                        break;
                
                }
@@ -4268,31 +5135,31 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
        }
        
        // Add the data to the General/Home/Work address variables.
-       
-       PicturesList.insert(std::make_pair(*PhotoCount, base64enc));
-       PicturesListPictureType.insert(std::make_pair(*PhotoCount, wxSPhotoMIME));
-       PicturesListPicEncType.insert(std::make_pair(*PhotoCount, wxSPhotoEncoding));
-       
+               
        switch(PropType){
                case PROPERTY_NONE:
                        break;
                case PROPERTY_HOME:
-                       PicturesListType.insert(std::make_pair(*PhotoCount, "home"));
+                       SoundsListType.insert(std::make_pair(*SoundCount, "home"));
                        break;
                case PROPERTY_WORK:
-                       PicturesListType.insert(std::make_pair(*PhotoCount, "work"));
+                       SoundsListType.insert(std::make_pair(*SoundCount, "work"));
                        break;
        }
        
+       SoundsList.insert(std::make_pair(*SoundCount, base64enc));
+       SoundsListAudioEncType.insert(std::make_pair(*SoundCount, wxSSoundEncoding));
+       SoundsListAudioType.insert(std::make_pair(*SoundCount, wxSSoundMIME));
+       
        if (!PropertyTokens.IsEmpty()){
-
-               PicturesListTokens.insert(std::make_pair(*PhotoCount, PropertyTokens));
+       
+               SoundsListTokens.insert(std::make_pair(*SoundCount, PropertyTokens));
        
        }
-
+       
 }
 
-void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2, int *LogoCount){
+void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString PropertySeg2, int *CalURICount){
 
        size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
@@ -4305,21 +5172,21 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2
        bool FirstToken = TRUE;
        int intSplitsFound = 0;
        int intSplitSize = 0;
-       int intPrevValue = 6;
+       int intPrevValue = 8;
        int intPref = 0;                        
        int intType = 0;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 5;
+       intPrevValue = 7;
        
        PropertyType PropType = PROPERTY_NONE;
-               
-       // Look for type before continuing.
        
+       // Look for type before continuing.                     
+
        CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
 
-       intPrevValue = 5;
+       intPrevValue = 7;
 
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -4349,19 +5216,19 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2
                        
                        PropertyValue.Remove(0, 1);
                        
-               }
+               }                       
                
                CaptureString(&PropertyValue, FALSE);
                
                if (PropertyName == wxT("ALTID")){
 
-                       LogosListAltID.erase(*LogoCount);
-                       LogosListAltID.insert(std::make_pair(*LogoCount, PropertyValue));
+                       CalendarListAltID.erase(*CalURICount);
+                       CalendarListAltID.insert(std::make_pair(*CalURICount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       LogosListPID.erase(*LogoCount);
-                       LogosListPID.insert(std::make_pair(*LogoCount, PropertyValue));
+                       CalendarListPID.erase(*CalURICount);
+                       CalendarListPID.insert(std::make_pair(*CalURICount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
                        
@@ -4378,16 +5245,16 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2
 
                        if (ValidNumber == TRUE){
 
-                               LogosListPref.erase(*LogoCount);
-                               LogosListPref.insert(std::make_pair(*LogoCount, PriorityNumber));
+                               CalendarListPref.erase(*CalURICount);
+                               CalendarListPref.insert(std::make_pair(*CalURICount, PriorityNumber));
 
                        }
                
                } else if (PropertyName == wxT("MEDIATYPE")){
                
-                       LogosListMediatype.erase(*LogoCount);
-                       LogosListMediatype.insert(std::make_pair(*LogoCount, PropertyValue));
-                                       
+                       CalendarListMediatype.erase(*CalURICount);
+                       CalendarListMediatype.insert(std::make_pair(*CalURICount, PropertyValue));
+
                } else {
                
                        // Something else we don't know about so append
@@ -4417,99 +5284,186 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2
        SplitLength.clear();
        intSplitsFound = 0;
        intSplitSize = 0;
-       intPrevValue = 0;                       
+       intPrevValue = 0;
        
        CaptureString(&PropertySeg2, FALSE);
        
-       for (int i = 0; i <= intPropertyLen; i++){
-
-               intSplitSize++;
+       // Add the data to the General/Home/Work address variables.
+               
+       switch(PropType){
+               case PROPERTY_NONE:
+                       break;
+               case PROPERTY_HOME:
+                       CalendarListType.insert(std::make_pair(*CalURICount, "home"));
+                       break;
+               case PROPERTY_WORK:
+                       CalendarListType.insert(std::make_pair(*CalURICount, "work"));
+                       break;
+       }
        
-               if (PropertySeg2.Mid(i, 1) == wxT(";")){
+       CalendarList.insert(std::make_pair(*CalURICount, PropertySeg2));
        
-                       intSplitsFound++;
-                       SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1)));
-                       
-                       if (intSplitsFound == 6){ 
-                       
-                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
-                               break; 
-                               
-                       } else {
-                       
-                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
-                       
-                       }
-                       
-                       intSplitSize = 0;                                       
+       if (!PropertyTokens.IsEmpty()){
        
-               }
-
-       }
+               CalendarListTokens.insert(std::make_pair(*CalURICount, PropertyTokens));
        
-       wxString wxSPhotoURI;
-       wxString wxSPhotoMIME;
-       wxString wxSPhotoEncoding;
-       wxString wxSPhotoData;
-       std::string base64enc;
+       }
+
+}
+
+void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrURICount){
+
+       size_t intPropertyLen = PropertySeg1.Len();
+       std::map<int, int> SplitPoints;
+       std::map<int, int> SplitLength;
+       std::map<int, int>::iterator SLiter;                    
+       wxString PropertyData;
+       wxString PropertyName;
+       wxString PropertyValue;
+       wxString PropertyTokens;
+       bool FirstToken = TRUE;
+       int intSplitsFound = 0;
+       int intSplitSize = 0;
+       int intPrevValue = 8;
+       int intPref = 0;                        
+       int intType = 0;
        
-       if (intSplitsFound == 0){
+       SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       } else {
+       intPrevValue = 7;
        
-               std::map<int, int>::iterator striter;
+       PropertyType PropType = PROPERTY_NONE;
        
-               striter = SplitLength.find(1);
+       // Look for type before continuing.                     
+
+       CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+       intPrevValue = 7;
+
+       for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+       intiter != SplitPoints.end(); ++intiter){
        
-               wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":"));
+               SLiter = SplitLength.find(intiter->first);
        
-               while (wSTDataType.HasMoreTokens() == TRUE){
+               PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
                
-                       wxSPhotoURI = wSTDataType.GetNextToken();
-                       wxSPhotoMIME = wSTDataType.GetNextToken();
-                       break;
+               wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+               PropertyName = PropertyElement.GetNextToken();                          
+               PropertyValue = PropertyElement.GetNextToken();
+               
+               intPrevValue = intiter->second;
+               
+               // Process properties.
+               
+               size_t intPropertyValueLen = PropertyValue.Len();
+               
+               if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+                       
+                       PropertyValue.Trim();
+                       PropertyValue.RemoveLast();
+                       
+               }                               
+               
+               if (PropertyValue.Mid(0, 1) == wxT("\"")){
+                       
+                       PropertyValue.Remove(0, 1);
+                       
+               }                       
+               
+               CaptureString(&PropertyValue, FALSE);
+               
+               if (PropertyName == wxT("ALTID")){
+
+                       CalendarRequestListAltID.erase(*CalAdrURICount);
+                       CalendarRequestListAltID.insert(std::make_pair(*CalAdrURICount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PID")){
+
+                       CalendarRequestListPID.erase(*CalAdrURICount);
+                       CalendarRequestListPID.insert(std::make_pair(*CalAdrURICount, PropertyValue));
+               
+               } else if (PropertyName == wxT("PREF")){
+                       
+                       int PriorityNumber = 0;
+                       bool ValidNumber = TRUE;
+                       
+                       try{
+                               PriorityNumber = std::stoi(PropertyValue.ToStdString());
+                       }
+                       
+                       catch(std::invalid_argument &e){
+                               ValidNumber = FALSE;
+                       }
+
+                       if (ValidNumber == TRUE){
+
+                               CalendarRequestListPref.erase(*CalAdrURICount);
+                               CalendarRequestListPref.insert(std::make_pair(*CalAdrURICount, PriorityNumber));
+
+                       }
                
-               }                       
-       
-               wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(","));                       
-       
-               while (wSTDataInfo.HasMoreTokens() == TRUE){
+               } else if (PropertyName == wxT("MEDIATYPE")){
                
-                       wxSPhotoEncoding = wSTDataInfo.GetNextToken();
-                       wxSPhotoData = wSTDataInfo.GetNextToken();
-                       base64enc = wxSPhotoData.mb_str();
-                       break;
+                       CalendarRequestListMediatype.erase(*CalAdrURICount);
+                       CalendarRequestListMediatype.insert(std::make_pair(*CalAdrURICount, PropertyValue));
+
+               } else {
+               
+                       // Something else we don't know about so append
+                       // to the tokens variable.
+                       
+                       if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+                       
+                               if (FirstToken == TRUE){
+                               
+                                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+                                       FirstToken = FALSE;
+                               
+                               } else {
+                               
+                                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+                               
+                               }
+                       
+                       }
                
                }
        
-       }
+       }       
        
-       // Add the data to the General/Home/Work address variables.
+       intPropertyLen = PropertySeg2.Len();
+       SplitPoints.clear();
+       SplitLength.clear();
+       intSplitsFound = 0;
+       intSplitSize = 0;
+       intPrevValue = 0;
        
-       LogosList.insert(std::make_pair(*LogoCount, base64enc));
-       LogosListPictureType.insert(std::make_pair(*LogoCount, wxSPhotoMIME));
-       LogosListPicEncType.insert(std::make_pair(*LogoCount, wxSPhotoEncoding));
+       CaptureString(&PropertySeg2, FALSE);
        
+       // Add the data to the General/Home/Work address variables.
+               
        switch(PropType){
                case PROPERTY_NONE:
                        break;
                case PROPERTY_HOME:
-                       LogosListType.insert(std::make_pair(*LogoCount, "home"));
+                       CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "home"));
                        break;
                case PROPERTY_WORK:
-                       LogosListType.insert(std::make_pair(*LogoCount, "work"));
+                       CalendarRequestListType.insert(std::make_pair(*CalAdrURICount, "work"));
                        break;
        }
        
+       CalendarRequestList.insert(std::make_pair(*CalAdrURICount, PropertySeg2));
+       
        if (!PropertyTokens.IsEmpty()){
-
-               LogosListTokens.insert(std::make_pair(*LogoCount, PropertyTokens));
        
-       }
-
+               CalendarRequestListTokens.insert(std::make_pair(*CalAdrURICount, PropertyTokens));
+       
+       }       
+       
 }
 
-void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg2, int *SoundCount){
+void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString PropertySeg2, int *FreeBusyAddressCount){
 
        size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
@@ -4572,13 +5526,13 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg
                
                if (PropertyName == wxT("ALTID")){
 
-                       SoundsListAltID.erase(*SoundCount);
-                       SoundsListAltID.insert(std::make_pair(*SoundCount, PropertyValue));
+                       FreeBusyListAltID.erase(*FreeBusyAddressCount);
+                       FreeBusyListAltID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       SoundsListPID.erase(*SoundCount);
-                       SoundsListPID.insert(std::make_pair(*SoundCount, PropertyValue));
+                       FreeBusyListPID.erase(*FreeBusyAddressCount);
+                       FreeBusyListPID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
                        
@@ -4595,20 +5549,15 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg
 
                        if (ValidNumber == TRUE){
 
-                               SoundsListPref.erase(*SoundCount);
-                               SoundsListPref.insert(std::make_pair(*SoundCount, PriorityNumber));
+                               FreeBusyListPref.erase(*FreeBusyAddressCount);
+                               FreeBusyListPref.insert(std::make_pair(*FreeBusyAddressCount, PriorityNumber));
 
                        }
                
                } else if (PropertyName == wxT("MEDIATYPE")){
                
-                       SoundsListMediatype.erase(*SoundCount);
-                       SoundsListMediatype.insert(std::make_pair(*SoundCount, PropertyValue));
-
-               } else if (PropertyName == wxT("LANGUAGE")){
-               
-                       SoundsListLanguage.erase(*SoundCount);
-                       SoundsListLanguage.insert(std::make_pair(*SoundCount, PropertyValue));
+                       FreeBusyListMediatype.erase(*FreeBusyAddressCount);
+                       FreeBusyListMediatype.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue));
 
                } else {
                
@@ -4643,95 +5592,30 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg
        
        CaptureString(&PropertySeg2, FALSE);
        
-       for (int i = 0; i <= intPropertyLen; i++){
-
-               intSplitSize++;
-       
-               if (PropertySeg2.Mid(i, 1) == wxT(";")){
-       
-                       intSplitsFound++;
-                       SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1)));
-                       
-                       if (intSplitsFound == 6){ 
-                       
-                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
-                               break; 
-                               
-                       } else {
-                       
-                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
-                       
-                       }
-                       
-                       intSplitSize = 0;                                       
-       
-               }
-
-       }
-       
-       wxString wxSSoundURI;
-       wxString wxSSoundMIME;
-       wxString wxSSoundEncoding;
-       wxString wxSSoundData;
-       std::string base64enc;
-       
-       if (intSplitsFound == 0){
-       
-       } else {
-       
-               std::map<int, int>::iterator striter;
-       
-               striter = SplitLength.find(1);
-       
-               wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":"));
-       
-               while (wSTDataType.HasMoreTokens() == TRUE){
-               
-                       wxSSoundURI = wSTDataType.GetNextToken();
-                       wxSSoundMIME = wSTDataType.GetNextToken();
-                       break;
-               
-               }                       
-       
-               wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(","));                       
-       
-               while (wSTDataInfo.HasMoreTokens() == TRUE){
-               
-                       wxSSoundEncoding = wSTDataInfo.GetNextToken();
-                       wxSSoundData = wSTDataInfo.GetNextToken();                                      
-                       base64enc = wxSSoundData.mb_str();
-                       break;
-               
-               }
-       
-       }
-       
        // Add the data to the General/Home/Work address variables.
                
        switch(PropType){
                case PROPERTY_NONE:
                        break;
                case PROPERTY_HOME:
-                       SoundsListType.insert(std::make_pair(*SoundCount, "home"));
+                       FreeBusyListType.insert(std::make_pair(*FreeBusyAddressCount, "home"));
                        break;
                case PROPERTY_WORK:
-                       SoundsListType.insert(std::make_pair(*SoundCount, "work"));
+                       FreeBusyListType.insert(std::make_pair(*FreeBusyAddressCount, "work"));
                        break;
        }
        
-       SoundsList.insert(std::make_pair(*SoundCount, base64enc));
-       SoundsListAudioEncType.insert(std::make_pair(*SoundCount, wxSSoundEncoding));
-       SoundsListAudioType.insert(std::make_pair(*SoundCount, wxSSoundMIME));
+       FreeBusyList.insert(std::make_pair(*FreeBusyAddressCount, PropertySeg2));
        
        if (!PropertyTokens.IsEmpty()){
        
-               SoundsListTokens.insert(std::make_pair(*SoundCount, PropertyTokens));
+               FreeBusyListTokens.insert(std::make_pair(*FreeBusyAddressCount, PropertyTokens));
        
        }
-       
+
 }
 
-void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString PropertySeg2, int *CalURICount){
+void ContactDataObject::ProcessKey(wxString PropertySeg1, wxString PropertySeg2, int *KeyCount){
 
        size_t intPropertyLen = PropertySeg1.Len();
        std::map<int, int> SplitPoints;
@@ -4744,21 +5628,22 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
        bool FirstToken = TRUE;
        int intSplitsFound = 0;
        int intSplitSize = 0;
-       int intPrevValue = 8;
+       int intPrevValue = 5;
        int intPref = 0;                        
        int intType = 0;
+       long ListCtrlIndex;
        
        SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
        
-       intPrevValue = 7;
+       intPrevValue = 4;
        
        PropertyType PropType = PROPERTY_NONE;
        
-       // Look for type before continuing.                     
+       // Look for type before continuing.
 
        CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
 
-       intPrevValue = 7;
+       intPrevValue = 4;
 
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -4788,19 +5673,17 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
                        
                        PropertyValue.Remove(0, 1);
                        
-               }                       
-               
-               CaptureString(&PropertyValue, FALSE);
+               }                               
                
                if (PropertyName == wxT("ALTID")){
 
-                       CalendarListAltID.erase(*CalURICount);
-                       CalendarListAltID.insert(std::make_pair(*CalURICount, PropertyValue));
+                       KeyListAltID.erase(*KeyCount);
+                       KeyListAltID.insert(std::make_pair(*KeyCount, PropertyValue));
                
                } else if (PropertyName == wxT("PID")){
 
-                       CalendarListPID.erase(*CalURICount);
-                       CalendarListPID.insert(std::make_pair(*CalURICount, PropertyValue));
+                       KeyListPID.erase(*KeyCount);
+                       KeyListPID.insert(std::make_pair(*KeyCount, PropertyValue));
                
                } else if (PropertyName == wxT("PREF")){
                        
@@ -4817,16 +5700,11 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
 
                        if (ValidNumber == TRUE){
 
-                               CalendarListPref.erase(*CalURICount);
-                               CalendarListPref.insert(std::make_pair(*CalURICount, PriorityNumber));
+                               KeyListPref.erase(*KeyCount);
+                               KeyListPref.insert(std::make_pair(*KeyCount, PriorityNumber));
 
                        }
                
-               } else if (PropertyName == wxT("MEDIATYPE")){
-               
-                       CalendarListMediatype.erase(*CalURICount);
-                       CalendarListMediatype.insert(std::make_pair(*CalURICount, PropertyValue));
-
                } else {
                
                        // Something else we don't know about so append
@@ -4849,35 +5727,151 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
                
                }
        
-       }       
+       }                               
        
        intPropertyLen = PropertySeg2.Len();
        SplitPoints.clear();
        SplitLength.clear();
        intSplitsFound = 0;
        intSplitSize = 0;
-       intPrevValue = 0;
+       intPrevValue = 0;                       
        
-       CaptureString(&PropertySeg2, FALSE);
+       for (int i = 0; i <= intPropertyLen; i++){
+
+               intSplitSize++;
+       
+               if (PropertySeg2.Mid(i, 1) == wxT(";") && PropertySeg2.Mid((i - 1), 1) != wxT("\\")){
+       
+                       intSplitsFound++;
+                       SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1)));
+                       
+                       if (intSplitsFound == 6){ 
+                       
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                               break; 
+                               
+                       } else {
+                       
+                               SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+                       
+                       }
+                       
+                       intSplitSize = 0;                                       
+       
+               }
+
+       }
+       
+       wxString wxSKeyURI;
+       wxString wxSKeyMIME;
+       wxString wxSKeyEncoding;
+       wxString wxSKeyData;
+       std::string base64enc;
+       
+       if (intSplitsFound == 0){
+       
+       } else {
+       
+               std::map<int, int>::iterator striter;
+       
+               striter = SplitLength.find(1);
+       
+               wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":"));
+       
+               while (wSTDataType.HasMoreTokens() == TRUE){
+               
+                       wxSKeyURI = wSTDataType.GetNextToken();
+                       wxSKeyMIME = wSTDataType.GetNextToken();
+                       break;
+               
+               }                       
+       
+               if (wxSKeyURI == wxT("data")){
+               
+                               wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(","));                       
+       
+                               while (wSTDataInfo.HasMoreTokens() == TRUE){
+               
+                               wxSKeyEncoding = wSTDataInfo.GetNextToken();
+                               wxSKeyData = wSTDataInfo.GetNextToken();
+                               break;
+               
+                       }
+               
+               }
+       
+       }
        
        // Add the data to the General/Home/Work address variables.
+       
+       if (wxSKeyURI == wxT("data")){
                
-       switch(PropType){
+               KeyListDataEncType.erase(*KeyCount);
+               KeyListKeyType.erase(*KeyCount);
+               KeyListDataEncType.insert(std::make_pair(*KeyCount, wxSKeyEncoding));
+               KeyListKeyType.insert(std::make_pair(*KeyCount, TRUE));
+               
+               KeyList.erase(*KeyCount);
+               KeyList.insert(std::make_pair(*KeyCount, wxSKeyData));
+       
+       } else {
+               
+               KeyList.erase(*KeyCount);
+               KeyList.insert(std::make_pair(*KeyCount, PropertySeg2));
+       
+       }
+       
+       KeyListDataType.insert(std::make_pair(*KeyCount, wxSKeyMIME));
+               
+       switch (PropType){
                case PROPERTY_NONE:
                        break;
-               case PROPERTY_HOME:
-                       CalendarListType.insert(std::make_pair(*CalURICount, "home"));
+               case PROPERTY_HOME: 
+                       KeyListType.insert(std::make_pair(*KeyCount, wxT("home")));
                        break;
-               case PROPERTY_WORK:
-                       CalendarListType.insert(std::make_pair(*CalURICount, "work"));
+               case PROPERTY_WORK: 
+                       KeyListType.insert(std::make_pair(*KeyCount, wxT("work")));
                        break;
        }
+
+       if (!PropertyTokens.IsEmpty()){
+
+               KeyListTokens.insert(std::make_pair(*KeyCount, PropertyTokens));
+
+       }
+
+}
+
+void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySeg2, int *VendorCount){
+
+       // Split the Vendor three ways.
        
-       CalendarList.insert(std::make_pair(*CalURICount, PropertySeg2));
+       wxStringTokenizer wSTVendorDetails(PropertySeg1, wxT("-"));
        
-       if (!PropertyTokens.IsEmpty()){
+       wxString wxSVNDID;
+       wxString wxSVNDPropName;
+       long ListCtrlIndex;                     
+
+       while (wSTVendorDetails.HasMoreTokens() == TRUE){
        
-               CalendarListTokens.insert(std::make_pair(*CalURICount, PropertyTokens));
+               wSTVendorDetails.GetNextToken();
+               wxSVNDID = wSTVendorDetails.GetNextToken();
+               wxSVNDPropName = wSTVendorDetails.GetNextToken();
+               break;
+       
+       }
+       
+       if (!wxSVNDID.IsEmpty() && !wxSVNDPropName.IsEmpty()){
+       
+               // Add the data to the vendor variables.
+       
+               VendorList.erase(*VendorCount);
+               VendorListPEN.erase(*VendorCount);
+               VendorListElement.erase(*VendorCount);
+       
+               VendorList.insert(std::make_pair(*VendorCount, PropertySeg2));
+               VendorListPEN.insert(std::make_pair(*VendorCount, wxSVNDID));
+               VendorListElement.insert(std::make_pair(*VendorCount, wxSVNDPropName));
        
        }
 
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy