         case PropertyName.address.rawValue:  // postal address
             var addressProperty = AdrProperty()
             
-            addressProperty.parameters = extractParameters(JSONParameters: property[PropertyIndex.Parameters.rawValue])
-            
-            let addressComponents = property[PropertyIndex.Value.rawValue]  // an array of components
+            addressProperty.parameters = extractParameters(JSONParameters: property[PropertyIndex.parameters.rawValue])
+            
+            let addressComponents = property[PropertyIndex.value.rawValue]  // an array of components
             if addressComponents.count != 7 {
                 print("ERROR: address property has \(addressComponents.count) components, not 7 - NOT OK")
             }

            
        case PropertyName.telephone.rawValue:
            var telProperty = TelProperty()
            telProperty.parameters = extractParameters(JSONParameters: property[PropertyIndex.Parameters.rawValue])
            let value = property[PropertyIndex.Value.rawValue].stringValue
            
            // TODO: Do some tel: URL processing
            telProperty.value = value as AnyObject

            
        case PropertyName.email.rawValue:
            var emailProperty = EmailProperty()
            emailProperty.parameters = extractParameters(JSONParameters: property[PropertyIndex.parameters.rawValue])
            emailProperty.value = property[PropertyIndex.value.rawValue].stringValue as AnyObject
            emails.append(emailProperty)
            
        case PropertyName.title.rawValue:
            var titleProperty = TitleProperty()
            titleProperty.value = property[PropertyIndex.value.rawValue].stringValue as AnyObject
            card.title = titleProperty
            
        case PropertyName.URL.rawValue:
            var urlProperty = URLProperty()
            urlProperty.parameters = extractParameters(JSONParameters: property[PropertyIndex.parameters.rawValue])
            urlProperty.value = property[PropertyIndex.value.rawValue].stringValue as AnyObject
            urls.append(urlProperty)
            
        case PropertyName.organization.rawValue:
            var orgProperty = OrgProperty()
            
            let orgValues = property[PropertyIndex.value.rawValue]
            if let orgType = orgValues.type as? String {
                orgProperty.value = [orgValues.stringValue]
            }
