diff --git a/input/fsh/cert-divoc-core-data-set.fsh b/input/fsh/cert-divoc-core-data-set.fsh
index c32d22b965..4088b09f19 100644
--- a/input/fsh/cert-divoc-core-data-set.fsh
+++ b/input/fsh/cert-divoc-core-data-set.fsh
@@ -1,14 +1,6 @@
 Logical:        CertDIVOC
 Title:          "Certificate - DIVOC Verifiable Credential Logical Model"
-Description:    "Data elements for the DIVOC Core Data Set.
-
-The official DIVOC documentation appears to be at <https://divoc.digit.org>. However, this does not include a full list of elements included in DIVOC certificates.
-
-There is a JSON-LD context referenced in DIVOC certificate examples (`https://cowin.gov.in/credentials/vaccination/v1`), which would provide some element-level information, but this URL does not resolve. There is a copy of this JSON-LD context at <https://github.com/egovernments/DIVOC/blob/main/vaccination-context/vaccination-context.js>.
-
-It was not possible to find any online documentation regarding DIVOC proof of testing. Information on this was provided by the DIVOC team via email.
-
-Some element descriptions in this logical model provide details that are not in publicly available DIVOC documentation."
+Description:    "Data elements for the DIVOC Core Data Set."
 
 * ^url = "http://worldhealthorganization.github.io/ddcc/StructureDefinition/CertDIVOC"
 * ^version = "1"
diff --git a/input/fsh/tx-cm-lab-test-pathogen-divoc-to-icd11.fsh b/input/fsh/tx-cm-lab-test-pathogen-divoc-to-icd11.fsh
index c1f49f32b4..900226a0bd 100644
--- a/input/fsh/tx-cm-lab-test-pathogen-divoc-to-icd11.fsh
+++ b/input/fsh/tx-cm-lab-test-pathogen-divoc-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Lab Test - Pathogen - DIVOC](ValueSet-lab-test-pathogen-divoc.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-21"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -35,4 +29,3 @@ Usage: #definition
       * code = #XN109
       * display = "SARS-CoV-2"
       * equivalence = #equivalent
-
diff --git a/input/fsh/tx-cm-lab-test-pathogen-snomed-to-icd11.fsh b/input/fsh/tx-cm-lab-test-pathogen-snomed-to-icd11.fsh
index 14f1dc82d7..14e2dedb67 100644
--- a/input/fsh/tx-cm-lab-test-pathogen-snomed-to-icd11.fsh
+++ b/input/fsh/tx-cm-lab-test-pathogen-snomed-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Lab Test - Pathogen - COVID-19 - SNOMED CT](ValueSet-lab-test-pathogen-covid19-snomed.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-20"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -27,4 +21,3 @@ Usage: #definition
       * code = #XN109
       * display = "SARS-CoV-2"
       * equivalence = #equivalent
-
diff --git a/input/fsh/tx-cm-lab-test-qual-result-divoc-to-icd11.fsh b/input/fsh/tx-cm-lab-test-qual-result-divoc-to-icd11.fsh
index 22dae269c0..d5f73488a4 100644
--- a/input/fsh/tx-cm-lab-test-qual-result-divoc-to-icd11.fsh
+++ b/input/fsh/tx-cm-lab-test-qual-result-divoc-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Lab Test - Qualitative Result - DIVOC](ValueSet-lab-test-qual-result-divoc.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-21"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -51,4 +45,3 @@ Usage: #definition
       * code = #RA01.0
       * display = "COVID-19, virus identified"
       * equivalence = #equivalent
-
diff --git a/input/fsh/tx-cm-lab-test-qual-result-icao-to-icd11.fsh b/input/fsh/tx-cm-lab-test-qual-result-icao-to-icd11.fsh
index 1ea8a76b63..c736738c50 100644
--- a/input/fsh/tx-cm-lab-test-qual-result-icao-to-icd11.fsh
+++ b/input/fsh/tx-cm-lab-test-qual-result-icao-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Lab Test - Qualitative Result - ICAO](ValueSet-lab-test-qual-result-icao.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-15"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -35,4 +29,3 @@ Usage: #definition
       * code = #RA01.1
       * display = "COVID-19, virus not identified"
       * equivalence = #equivalent
-
diff --git a/input/fsh/tx-cm-lab-test-qual-result-snomed-to-icd11.fsh b/input/fsh/tx-cm-lab-test-qual-result-snomed-to-icd11.fsh
index 52f280bb78..3c26cb532b 100644
--- a/input/fsh/tx-cm-lab-test-qual-result-snomed-to-icd11.fsh
+++ b/input/fsh/tx-cm-lab-test-qual-result-snomed-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Lab Test - Qualitative Result - SNOMED CT](ValueSet-lab-test-qual-result-snomed.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-20"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -51,4 +45,3 @@ Usage: #definition
       * code = #RA01.1
       * display = "COVID-19, virus not identified"
       * equivalence = #equivalent
-
diff --git a/input/fsh/tx-cm-lab-test-sample-origin-divoc-to-icd11.fsh b/input/fsh/tx-cm-lab-test-sample-origin-divoc-to-icd11.fsh
index 15cc18b0e5..243d631684 100644
--- a/input/fsh/tx-cm-lab-test-sample-origin-divoc-to-icd11.fsh
+++ b/input/fsh/tx-cm-lab-test-sample-origin-divoc-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Lab Test - Sample Origin - DIVOC](ValueSet-lab-test-sample-origin-divoc.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-21"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -67,4 +61,3 @@ Usage: #definition
       * code = #50872817
       * display = "Nasopharyngeal swab"
       * equivalence = #wider
-
diff --git a/input/fsh/tx-cm-lab-test-sample-origin-icao-to-icd11.fsh b/input/fsh/tx-cm-lab-test-sample-origin-icao-to-icd11.fsh
index e640d0337c..2c33df33ef 100644
--- a/input/fsh/tx-cm-lab-test-sample-origin-icao-to-icd11.fsh
+++ b/input/fsh/tx-cm-lab-test-sample-origin-icao-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Lab Test - Sample Origin - ICAO](ValueSet-lab-test-sample-origin-icao.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-20"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -51,4 +45,3 @@ Usage: #definition
       * code = #1695591348
       * display = "Blood specimen"
       * equivalence = #equivalent
-
diff --git a/input/fsh/tx-cm-lab-test-type-covid19-loinc-to-icd11.fsh b/input/fsh/tx-cm-lab-test-type-covid19-loinc-to-icd11.fsh
index 35e6003bc5..edd0368acd 100644
--- a/input/fsh/tx-cm-lab-test-type-covid19-loinc-to-icd11.fsh
+++ b/input/fsh/tx-cm-lab-test-type-covid19-loinc-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Lab Test - Type - COVID-19 - LOINC](ValueSet-lab-test-type-covid19-loinc.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-20"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -859,4 +853,3 @@ Usage: #definition
       * code = #1334426561
       * display = "Viral nucleic acid amplification test or NAAT"
       * equivalence = #wider
-
diff --git a/input/fsh/tx-cm-lab-test-type-divoc-to-icd11.fsh b/input/fsh/tx-cm-lab-test-type-divoc-to-icd11.fsh
index 139c58483e..da8f81267a 100644
--- a/input/fsh/tx-cm-lab-test-type-divoc-to-icd11.fsh
+++ b/input/fsh/tx-cm-lab-test-type-divoc-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Lab Test - Type - DIVOC](ValueSet-lab-test-type-divoc.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-21"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -51,4 +45,3 @@ Usage: #definition
       * code = #2056159157
       * display = "Rapid immunoassay detecting viral proteins or Ag-RDT"
       * equivalence = #equivalent
-
diff --git a/input/fsh/tx-cm-lab-test-type-icao-to-icd11.fsh b/input/fsh/tx-cm-lab-test-type-icao-to-icd11.fsh
index 3271ce91ed..ede7080d0d 100644
--- a/input/fsh/tx-cm-lab-test-type-icao-to-icd11.fsh
+++ b/input/fsh/tx-cm-lab-test-type-icao-to-icd11.fsh
@@ -7,13 +7,6 @@ Usage: #definition
 * description = "[Lab Test - Type - ICAO](ValueSet-lab-test-type-icao.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-20"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
 
 * copyright = "TODO: provide copyright information"
 
@@ -35,4 +28,4 @@ Usage: #definition
       * code = #2056159157
       * display = "Rapid immunoassay detecting viral proteins or Ag-RDT"
       * equivalence = #narrower
-
+      * comment = "'Molecular (Other)' is most likely a rapid antigen test, but this cannot be guaranteed."
diff --git a/input/fsh/tx-cm-lab-test-type-snomed-to-icd11.fsh b/input/fsh/tx-cm-lab-test-type-snomed-to-icd11.fsh
index e1b5015d66..43bd53c946 100644
--- a/input/fsh/tx-cm-lab-test-type-snomed-to-icd11.fsh
+++ b/input/fsh/tx-cm-lab-test-type-snomed-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Lab Test - Type - Generic - LOINC](ValueSet-lab-test-type-loinc.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-20"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -35,4 +29,3 @@ Usage: #definition
       * code = #2056159157
       * display = "Rapid immunoassay detecting viral proteins or Ag-RDT"
       * equivalence = #equivalent
-
diff --git a/input/fsh/tx-cm-vaccine-covid19-cvx-to-icd11.fsh b/input/fsh/tx-cm-vaccine-covid19-cvx-to-icd11.fsh
index 008b4b31e4..50cd29b0ee 100644
--- a/input/fsh/tx-cm-vaccine-covid19-cvx-to-icd11.fsh
+++ b/input/fsh/tx-cm-vaccine-covid19-cvx-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Vaccine - COVID-19 - CVX](ValueSet-vaccine-covid19-cvx.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-15"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -339,4 +333,3 @@ Usage: #definition
       * code = #XM8NQ0
       * display = "Comirnaty"
       * equivalence = #equivalent
-
diff --git a/input/fsh/tx-cm-vaccine-covid19-euur-to-icd11.fsh b/input/fsh/tx-cm-vaccine-covid19-euur-to-icd11.fsh
index f9b84ec1f3..56a75f7d65 100644
--- a/input/fsh/tx-cm-vaccine-covid19-euur-to-icd11.fsh
+++ b/input/fsh/tx-cm-vaccine-covid19-euur-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Vaccine - COVID-19 - EU Union Register of Medicinial Products](ValueSet-vaccine-covid19-euur.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-15"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -323,4 +317,3 @@ Usage: #definition
       * code = #XM3CT4
       * display = "Recombinant SARS-CoV-2 vaccine"
       * equivalence = #wider
-
diff --git a/input/fsh/tx-cm-vaccine-covid19-snomed-to-icd11.fsh b/input/fsh/tx-cm-vaccine-covid19-snomed-to-icd11.fsh
index 459bc63efb..276f4cc6fd 100644
--- a/input/fsh/tx-cm-vaccine-covid19-snomed-to-icd11.fsh
+++ b/input/fsh/tx-cm-vaccine-covid19-snomed-to-icd11.fsh
@@ -7,13 +7,7 @@ Usage: #definition
 * description = "[Vaccine - COVID-19 - SNOMED CT](ValueSet-vaccine-covid19-snomed.html) mapped to ICD-11"
 * status = #draft
 * date = "2023-02-20"
-// * publisher = "TBD"
-// * url = "https://github.com/ddcc/TBD"
-// * version = "TBD"
-// * contact.name = "TBD"
-// * contact.telecom.system = 
-// * contact.telecom.value = 
-// * jurisdiction =
+
 
 * copyright = "TODO: provide copyright information"
 
@@ -795,4 +789,3 @@ Usage: #definition
       * code = #XM6QV1
       * display = "COVID-19 Vaccine Janssen"
       * equivalence = #wider
-
diff --git a/input/fsh/tx-cs-divoc-lab-test-origin.fsh b/input/fsh/tx-cs-divoc-lab-test-origin.fsh
index 97888481f4..4e31312868 100644
--- a/input/fsh/tx-cs-divoc-lab-test-origin.fsh
+++ b/input/fsh/tx-cs-divoc-lab-test-origin.fsh
@@ -3,7 +3,6 @@ Title: "DIVOC lab test origin codes used in this IG"
 Description: "All DIVOC lab test origin codes from its internally defined code system used in this IG. Provided so the FHIR server can perform expansions."
 * ^experimental = true
 * ^caseSensitive = true
-* ^url = http://worldhealthorganization.github.io/ddcc/CodeSystem/lab-test-sample-origin-divoc
 
 * #"Nasopharyngeal Swab" "Nasopharyngeal Swab"
 * #"Throat swab" "Throat swab"
diff --git a/input/fsh/tx-cs-divoc-lab-test-pathogen.fsh b/input/fsh/tx-cs-divoc-lab-test-pathogen.fsh
index 0e0c3b54ed..3dbca28ed6 100644
--- a/input/fsh/tx-cs-divoc-lab-test-pathogen.fsh
+++ b/input/fsh/tx-cs-divoc-lab-test-pathogen.fsh
@@ -3,7 +3,6 @@ Title: "DIVOC lab test pathogen codes used in this IG"
 Description: "All DIVOC lab test pathogen codes from its internally defined code system used in this IG. Provided so the FHIR server can perform expansions."
 * ^experimental = true
 * ^caseSensitive = true
-* ^url = http://worldhealthorganization.github.io/ddcc/CodeSystem/lab-test-pathogen-divoc
 
 * #COVID-19 "Concerns the detection of SARS-CoV-2 infection."
 * #covid-19 "Concerns the detection of SARS-CoV-2 infection."
diff --git a/input/fsh/tx-cs-divoc-lab-test-result.fsh b/input/fsh/tx-cs-divoc-lab-test-result.fsh
index ca76fe9d11..7a24782a86 100644
--- a/input/fsh/tx-cs-divoc-lab-test-result.fsh
+++ b/input/fsh/tx-cs-divoc-lab-test-result.fsh
@@ -3,7 +3,6 @@ Title: "DIVOC lab test result codes used in this IG"
 Description: "All DIVOC lab test result codes from its internally defined code system used in this IG. Provided so the FHIR server can perform expansions."
 * ^experimental = true
 * ^caseSensitive = true
-* ^url = http://worldhealthorganization.github.io/ddcc/CodeSystem/lab-test-qual-result-divoc
 
 * #Negative "Negative"
 * #Positive "Positive"
diff --git a/input/fsh/tx-cs-divoc-lab-test-type.fsh b/input/fsh/tx-cs-divoc-lab-test-type.fsh
index 5bff2a07fb..52b9321318 100644
--- a/input/fsh/tx-cs-divoc-lab-test-type.fsh
+++ b/input/fsh/tx-cs-divoc-lab-test-type.fsh
@@ -3,7 +3,6 @@ Title: "DIVOC lab test type codes used in this IG"
 Description: "All DIVOC lab test type codes from its internally defined code system used in this IG. Provided so the FHIR server can perform expansions."
 * ^experimental = true
 * ^caseSensitive = true
-* ^url = http://worldhealthorganization.github.io/ddcc/CodeSystem/lab-test-type-divoc
 
 * #RT-PCR "RT-PCR"
 * #"Rapid Antigen Test (RAT)" "Rapid Antigen Test (RAT)"
diff --git a/input/fsh/tx-cs-icao-lab-test-origin.fsh b/input/fsh/tx-cs-icao-lab-test-origin.fsh
index aa07344171..76e91038e9 100644
--- a/input/fsh/tx-cs-icao-lab-test-origin.fsh
+++ b/input/fsh/tx-cs-icao-lab-test-origin.fsh
@@ -3,7 +3,6 @@ Title: "ICAO lab test origin codes used in this IG"
 Description: "All ICAO lab test origin codes from its internally defined code system used in this IG. Provided so the FHIR server can perform expansions."
 * ^experimental = true
 * ^caseSensitive = true
-* ^url = http://worldhealthorganization.github.io/ddcc/CodeSystem/lab-test-sample-origin-icao
 
 * #nasopharyngeal "Sampling method: nasopharyngeal"
 * #oropharyngeal "Sampling method: oropharyngeal"
diff --git a/input/fsh/tx-cs-icao-lab-test-result.fsh b/input/fsh/tx-cs-icao-lab-test-result.fsh
index c9e3c6bcd6..17ca799a81 100644
--- a/input/fsh/tx-cs-icao-lab-test-result.fsh
+++ b/input/fsh/tx-cs-icao-lab-test-result.fsh
@@ -3,7 +3,6 @@ Title: "ICAO lab test result codes used in this IG"
 Description: "All ICAO lab test result codes from its internally defined code system used in this IG. Provided so the FHIR server can perform expansions."
 * ^experimental = true
 * ^caseSensitive = true
-* ^url = http://worldhealthorganization.github.io/ddcc/CodeSystem/lab-test-qual-result-icao
 
 * #normal "Normal"
 * #abnormal "Abnormal"
diff --git a/input/fsh/tx-cs-icao-lab-test-type.fsh b/input/fsh/tx-cs-icao-lab-test-type.fsh
index 199e949d3c..77c6ea966e 100644
--- a/input/fsh/tx-cs-icao-lab-test-type.fsh
+++ b/input/fsh/tx-cs-icao-lab-test-type.fsh
@@ -3,7 +3,6 @@ Title: "ICAO lab test type codes used in this IG"
 Description: "All ICAO lab test type codes from its internally defined code system used in this IG. Provided so the FHIR server can perform expansions."
 * ^experimental = true
 * ^caseSensitive = true
-* ^url = http://worldhealthorganization.github.io/ddcc/CodeSystem/lab-test-type-icao
 
 * #molecular(PCR) "Molecular (PCR)"
 * #molecular(other) "Molecular (Other)"
diff --git a/input/includes/fsh-link-references.md b/input/includes/fsh-link-references.md
new file mode 100644
index 0000000000..fd6ce46765
--- /dev/null
+++ b/input/includes/fsh-link-references.md
@@ -0,0 +1,212 @@
+[Any Dose Pass]: Library-AnyDosePass-1.0.0.html
+[BundleVSToAddBundle]: StructureMap-BundleVSToAddBundle.html
+[CertDCCtoCoreDataSet]: StructureMap-CertDCCtoCoreDataSet.html
+[CertDIVOCtoCoreDataSet]: StructureMap-CertDIVOCtoCoreDataSet.html
+[CertICAOtoCoreDataSet]: StructureMap-CertICAOtoCoreDataSet.html
+[CertDIVOC]: StructureDefinition-CertDIVOC.html
+[CertDCC]: StructureDefinition-CertDCC.html
+[CertICAO]: StructureDefinition-CertICAO.html
+[CertSHC]: StructureDefinition-CertSHC.html
+[CertSHCtoCoreDataSet]: StructureMap-CertSHCtoCoreDataSet.html
+[CoreDataSetLibrary]: StructureMap-CoreDataSetLibrary.html
+[CoreDataSetToAddBundle]: StructureMap-coredataset-to-addbundle.html
+[CoreDataSetVSLibrary]: StructureMap-CoreDataSetVSLibrary.html
+[CoreDataSetVSToAddBundle]: StructureMap-CoreDataSetVSToAddBundle.html
+[CoreDataSetVSToSHC]: StructureMap-CoreDataSetVSToSHC.html
+[DIVOC_ValueSet]: ValueSet-DIVOC-ValueSet.html
+[DIVOC_CodeSystem]: CodeSystem-DIVOC-CodeSystem.html
+[WHO_DDCC_cvx]: CodeSystem-WHO-DDCC-cvx.html
+[DDCC_Example_Test_CodeSystem]: CodeSystem-DDCC-Example-Test-CodeSystem.html
+[ICAOV1_ValueSet]: ValueSet-ICAOVaccineListV1.html
+[ICAOV1_CodeSystem]: CodeSystem-ICAOVaccineListV1.html
+[DDCC_ICD11_CodeSystem]: CodeSystem-DDCC-ICD11-CodeSystem.html
+[DDCCComposition]: StructureDefinition-DDCCComposition.html
+[DDCC_Composition_Category_ValueSet]: ValueSet-DDCC-Composition-Category-ValueSet.html
+[DDCC_Composition_Category_CodeSystem]: CodeSystem-DDCC-Composition-Category-CodeSystem.html
+[DDCCCoreDataSet]: StructureDefinition-DDCCCoreDataSet.html
+[DDCCCoreDataSet_VS_CoC]: StructureDefinition-DDCCCoreDataSet.VS.CoC.html
+[DDCCCoreDataSet_VS_PoV]: StructureDefinition-DDCCCoreDataSet.VS.PoV.html
+[DDCCCoreDataSet_TR]: StructureDefinition-DDCCCoreDataSet.TR.html
+[DDCCCoreDataSet_VS]: StructureDefinition-DDCCCoreDataSet.VS.html
+[DDCCCountryOfEvent]: StructureDefinition-DDCCCountryOfEvent.html
+[DDCC_Folder_DesignationType_Codesystem]: CodeSystem-DDCC-Folder-DesignationType.html
+[DDCC_Folder_DesignationType_ValueSet]: ValueSet-DDCC-Folder-DesignationType.html
+[DDCC_Device_Property_ValueSet]: ValueSet-DDCC-Device-Property-ValueSet.html
+[DDCC_Device_Property_CodeSystem]: CodeSystem-DDCC-Device-Property-CodeSystem.html
+[DDCCDiagnosticReport]: StructureDefinition-DDCCDiagnosticReport.html
+[DDCCDocument]: StructureDefinition-DDCCDocument.html
+[DDCCDocumentReference]: StructureDefinition-DDCCDocumentReference.html
+[DDCCDocumentReferenceQR]: StructureDefinition-DDCCDocumentReferenceQR.html
+[DDCCDocumentSigned]: StructureDefinition-DDCCDocumentSigned.html
+[DDCCEventBrand]: StructureDefinition-DDCCEventBrand.html
+[DDCCFolder]: StructureDefinition-DDCCFolder.html
+[DDCCGenerateHealthCertificateParameters]: StructureDefinition-DDCCGenerateHealthCertificateParameters.html
+[DDCCGenerateHealthFolderParameters]: StructureDefinition-DDCCGenerateHealthFolderParameters.html
+[DDCCImmunization]: StructureDefinition-DDCCImmunization.html
+[DDCCImmunizationRecommendation]: StructureDefinition-DDCCImmunizationRecommendation.html
+[DDCCObservation]: StructureDefinition-DDCCObservation.html
+[DDCCOrganization]: StructureDefinition-DDCCOrganization.html
+[DDCCPatient]: StructureDefinition-DDCCPatient.html
+[DDCCPractitioner]: StructureDefinition-DDCCPractitioner.html
+[DDCCPractitionerRole]: StructureDefinition-DDCCPractitionerRole.html
+[DDCCProcedure]: StructureDefinition-DDCCProcedure.html
+[DDCCProvideDocumentBundle]: StructureDefinition-DDCCProvideDocumentBundle.html
+[DDCC_QR_Type_CodeSystem]: CodeSystem-DDCC-QR-Type-CodeSystem.html
+[DDCC_QR_Format_ValueSet]: ValueSet-DDCC-QR-Format-ValueSet.html
+[DDCC_QR_Format_CodeSystem]: CodeSystem-DDCC-QR-Format-CodeSystem.html
+[DDCC_QR_Type_ValueSet]: ValueSet-DDCC-QR-Type-ValueSet.html
+[DDCCQuestionnaireSDC]: StructureDefinition-DDCCQuestionnaireSDC.html
+[DDCCQuestionnaireResponse]: StructureDefinition-DDCCQuestionnaireResponse.html
+[DDCCQuestionnaire]: StructureDefinition-DDCCQuestionnaire.html
+[DDCCRevokeHealthCertificateParameters]: StructureDefinition-DDCCRevokeHealthCertificateParameters.html
+[DDCCSpecimen]: StructureDefinition-DDCCSpecimen.html
+[DDCCSubmissionSet]: StructureDefinition-DDCCSubmissionSet.html
+[DDCCSubmitHealthEventRequest]: StructureDefinition-DDCCSubmitHealthEventRequest.html
+[DDCCSubmitHealthEventResponse]: StructureDefinition-DDCCSubmitHealthEventResponse.html
+[DDCCTest]: StructureDefinition-DDCCTest.html
+[DDCCVaccineMarketAuthorization]: StructureDefinition-DDCCVaccineMarketAuthorization.html
+[DDCCVaccineValidFrom]: StructureDefinition-DDCCVaccineValidFrom.html
+[DDCC-Composition-Example-Arabic]: Composition-DDCC-Composition-Example-Arabic.html
+[DDCC-Composition-Example-Chinese]: Composition-DDCC-Composition-Example-Chinese.html
+[DDCC-Composition-Example-English]: Composition-DDCC-Composition-Example-English.html
+[DDCC-Composition-Example-French]: Composition-DDCC-Composition-Example-French.html
+[DDCC-Composition-Example-Russian]: Composition-DDCC-Composition-Example-Russian.html
+[DDCC-Composition-Example-Spanish]: Composition-DDCC-Composition-Example-Spanish.html
+[DDCC-Immunization-Arabic]: Immunization-DDCC-Immunization-Arabic.html
+[DDCC-Immunization-Chinese]: Immunization-DDCC-Immunization-Chinese.html
+[DDCC-Immunization-English]: Immunization-DDCC-Immunization-English.html
+[DDCC-Immunization-French]: Immunization-DDCC-Immunization-French.html
+[DDCC-Immunization-Russian]: Immunization-DDCC-Immunization-Russian.html
+[DDCC-Immunization-Spanish]: Immunization-DDCC-Immunization-Spanish.html
+[DDCC-ImmunizationRecommendation-Arabic]: ImmunizationRecommendation-DDCC-ImmunizationRecommendation-Arabic.html
+[DDCC-ImmunizationRecommendation-Chinese]: ImmunizationRecommendation-DDCC-ImmunizationRecommendation-Chinese.html
+[DDCC-ImmunizationRecommendation-English]: ImmunizationRecommendation-DDCC-ImmunizationRecommendation-English.html
+[DDCC-ImmunizationRecommendation-French]: ImmunizationRecommendation-DDCC-ImmunizationRecommendation-French.html
+[DDCC-ImmunizationRecommendation-Russian]: ImmunizationRecommendation-DDCC-ImmunizationRecommendation-Russian.html
+[DDCC-ImmunizationRecommendation-Spanish]: ImmunizationRecommendation-DDCC-ImmunizationRecommendation-Spanish.html
+[DDCC-Organization-Arabic]: Organization-DDCC-Organization-Arabic.html
+[DDCC-Organization-Chinese]: Organization-DDCC-Organization-Chinese.html
+[DDCC-Organization-English]: Organization-DDCC-Organization-English.html
+[DDCC-Organization-French]: Organization-DDCC-Organization-French.html
+[DDCC-Organization-Russian]: Organization-DDCC-Organization-Russian.html
+[DDCC-Organization-Spanish]: Organization-DDCC-Organization-Spanish.html
+[DDCC-Patient-Arabic]: Patient-DDCC-Patient-Arabic.html
+[DDCC-Patient-Chinese]: Patient-DDCC-Patient-Chinese.html
+[DDCC-Patient-English]: Patient-DDCC-Patient-English.html
+[DDCC-Patient-French]: Patient-DDCC-Patient-French.html
+[DDCC-Patient-Russian]: Patient-DDCC-Patient-Russian.html
+[DDCC-Patient-Spanish]: Patient-DDCC-Patient-Spanish.html
+[DDCC-QuestionnaireResponse-generateHealthCertificate]: OperationDefinition-DDCC-QuestionnaireResponse-generateHealthCertificate.html
+[DDCC-QuestionnaireResponse-generateHealthFolder]: OperationDefinition-DDCC-QuestionnaireResponse-generateHealthFolder.html
+[DDCC-QuestionnaireResponse-revokeHealthCertificate]: OperationDefinition-DDCC-QuestionnaireResponse-revokeHealthCertificate.html
+[DDCC-TX-SHE-bundle-example-1]: Bundle-DDCC-TX-SHE-bundle-example-1.html
+[DDCC-TX-SHE-bundle-example-Arabic]: Bundle-DDCC-TX-SHE-bundle-example-Arabic.html
+[DDCC-TX-SHE-bundle-example-Chinese]: Bundle-DDCC-TX-SHE-bundle-example-Chinese.html
+[DDCC-TX-SHE-bundle-example-French]: Bundle-DDCC-TX-SHE-bundle-example-French.html
+[DDCC-TX-SHE-bundle-example-Russian]: Bundle-DDCC-TX-SHE-bundle-example-Russian.html
+[DDCC-TX-SHE-bundle-example-Spanish]: Bundle-DDCC-TX-SHE-bundle-example-Spanish.html
+[DDCC-VS-QuestionnaireResponse-Arabic]: QuestionnaireResponse-DDCC-VS-QuestionnaireResponse-Arabic.html
+[DDCC-VS-QuestionnaireResponse-Chinese]: QuestionnaireResponse-DDCC-VS-QuestionnaireResponse-Chinese.html
+[DDCC-VS-QuestionnaireResponse-Example]: QuestionnaireResponse-DDCC-VS-QuestionnaireResponse-Example.html
+[DDCC-VS-QuestionnaireResponse-French]: QuestionnaireResponse-DDCC-VS-QuestionnaireResponse-French.html
+[DDCC-VS-QuestionnaireResponse-Russian]: QuestionnaireResponse-DDCC-VS-QuestionnaireResponse-Russian.html
+[DDCC-VS-QuestionnaireResponse-Spanish]: QuestionnaireResponse-DDCC-VS-QuestionnaireResponse-Spanish.html
+[DDCCTRComposition]: StructureDefinition-DDCCTRComposition.html
+[DDCCTRDocumentSigned]: StructureDefinition-DDCCTRDocumentSigned.html
+[DDCCVSAddBundle]: StructureDefinition-DDCCVSAddBundle.html
+[DDCCVSComposition]: StructureDefinition-DDCCVSComposition.html
+[DDCCVSDocument]: StructureDefinition-DDCCVSDocument.html
+[DDCCTRDocument]: StructureDefinition-DDCCTRDocument.html
+[DDCCVSDocumentSigned]: StructureDefinition-DDCCVSDocumentSigned.html
+[DDCCHCIDRegistrationQuestionnaire]: Questionnaire-DDCCHCIDRegistrationQuestionnaire.html
+[DDCC Pass]: Library-DDCCPass-1.0.0.html
+[DDCCtoCoredataset]: StructureMap-DDCCtoCoredataset.html
+[DDCCtoEUdcc]: StructureMap-DDCCtoEUdcc.html
+[DDCCTRCoreDataSetQuestionnaire]: Questionnaire-DDCCTRCoreDataSetQuestionnaire.html
+[DDCCVSCoreDataSetQuestionnaire]: Questionnaire-DDCCVSCoreDataSetQuestionnaire.html
+[WHO_DDCC_divoc_lab_test_origin]: CodeSystem-WHO-DDCC-divoc-lab-test-origin.html
+[WHO_DDCC_divoc_lab_test_pathogen]: CodeSystem-WHO-DDCC-divoc-lab-test-pathogen.html
+[WHO_DDCC_divoc_lab_test_result]: CodeSystem-WHO-DDCC-divoc-lab-test-result.html
+[WHO_DDCC_divoc_lab_test_type]: CodeSystem-WHO-DDCC-divoc-lab-test-type.html
+[EU_DCC_ValueSet]: ValueSet-vaccines-covid-19-names.html
+[WHO_DDCC_euur]: CodeSystem-WHO-DDCC-euur.html
+[Example-Arabic]: Bundle-Example-Arabic.html
+[Example-Chinese]: Bundle-Example-Chinese.html
+[Example-English]: Bundle-Example-English.html
+[Example-French]: Bundle-Example-French.html
+[Example-Russian]: Bundle-Example-Russian.html
+[Example-Spanish]: Bundle-Example-Spanish.html
+[WHO_DDCC_icao_lab_test_origin]: CodeSystem-WHO-DDCC-icao-lab-test-origin.html
+[WHO_DDCC_icao_lab_test_result]: CodeSystem-WHO-DDCC-icao-lab-test-result.html
+[WHO_DDCC_icao_lab_test_type]: CodeSystem-WHO-DDCC-icao-lab-test-type.html
+[ImmunizationUvIps]: StructureDefinition-Immunization-pre-uv-ips.html
+[IPS-Immunization-Example-Bundle-01]: Bundle-IPS-Immunization-Example-Bundle-01.html
+[IPSToCoreDataSetVS]: StructureMap-IPSToCoreDataSetVS.html
+[LabTestPathogenCovid19SnomedValueSet]: ValueSet-lab-test-pathogen-covid19-snomed.html
+[LabTestPathogenDivocValueSet]: ValueSet-lab-test-pathogen-divoc.html
+[LabTestQualitativeResultDivocValueSet]: ValueSet-lab-test-qual-result-divoc.html
+[LabTestResultIcaoValueSet]: ValueSet-lab-test-qual-result-icao.html
+[LabTestQualitativeResultSnomedValueSet]: ValueSet-lab-test-qual-result-snomed.html
+[LabTestSampleOriginDivocValueSet]: ValueSet-lab-test-sample-origin-divoc.html
+[LabTestSampleOriginIcaoValueSet]: ValueSet-lab-test-sample-origin-icao.html
+[LabTestTypeCovid19LoincValueSet]: ValueSet-lab-test-type-covid19-loinc.html
+[LabTestTypeDivocValueSet]: ValueSet-lab-test-type-divoc.html
+[LabTestTypeLoincValueSet]: ValueSet-lab-test-type-loinc.html
+[LabTestTypeIcaoValueSet]: ValueSet-lab-test-type-icao.html
+[lab-test-pathogen-divoc-to-icd11]: ConceptMap-lab-test-pathogen-divoc-to-icd11.html
+[lab-test-pathogen-snomed-to-icd11]: ConceptMap-lab-test-pathogen-snomed-to-icd11.html
+[lab-test-qual-result-divoc-to-icd11]: ConceptMap-lab-test-qual-result-divoc-to-icd11.html
+[lab-test-qual-result-icao-to-icd11]: ConceptMap-lab-test-qual-result-icao-to-icd11.html
+[lab-test-qual-result-snomed-to-icd11]: ConceptMap-lab-test-qual-result-snomed-to-icd11.html
+[lab-test-sample-origin-divoc-to-icd11]: ConceptMap-lab-test-sample-origin-divoc-to-icd11.html
+[lab-test-sample-origin-icao-to-icd11]: ConceptMap-lab-test-sample-origin-icao-to-icd11.html
+[lab-test-type-covid19-loinc-to-icd11]: ConceptMap-lab-test-type-covid19-loinc-to-icd11.html
+[lab-test-type-divoc-to-icd11]: ConceptMap-lab-test-type-divoc-to-icd11.html
+[lab-test-type-icao-to-icd11]: ConceptMap-lab-test-type-icao-to-icd11.html
+[lab-test-type-snomed-to-icd11]: ConceptMap-lab-test-type-snomed-to-icd11.html
+[WHO_DDCC_loinc]: CodeSystem-WHO-DDCC-loinc.html
+[Moderna Or Pfizer Pass]: Library-ModernaOrPfizerPass-1.0.0.html
+[PatientUvIps]: StructureDefinition-Patient-pre-uv-ips.html
+[QRespToCoreDataSet]: StructureMap-ddcc-qresp-to-coredataset.html
+[QRespToVSCoreDataSet]: StructureMap-QRespToVSCoreDataSet.html
+[ResourcesToCoreDataSet]: StructureMap-ResourcesToCoreDataSet.html
+[ResourcesToCoreDataSet]: StructureMap-ddcc-resources-to-coredataset.html
+[ResourcesToVSCoreDataSet]: StructureMap-ResourcesToVSCoreDataSet.html
+[SHCToCoreDataSetTR]: StructureMap-SHCToCoreDataSetTR.html
+[SHCToCoreDataSetVS]: StructureMap-SHCToCoreDataSetVS.html
+[SHCVaccinationBundleDM-Example-English-From-ddcc-to-shc]: Bundle-SHCVaccinationBundleDM-Example-English-From-ddcc-to-shc.html
+[WHO_DDCC_snomed]: CodeSystem-WHO-DDCC-snomed.html
+[VaccineCovid19CvxValueSet]: ValueSet-vaccine-covid19-cvx.html
+[VaccineCovid19EUUnionRegisterValueSet]: ValueSet-vaccine-covid19-euur.html
+[VaccineCovid19Icd11ValueSet]: ValueSet-vaccine-covid19-icd11.html
+[VaccineCovid19SnomedValueSet]: ValueSet-vaccine-covid19-snomed.html
+[vaccine-covid19-cvx-to-icd11]: ConceptMap-vaccine-covid19-cvx-to-icd11.html
+[vaccine-covid19-euur-to-icd11]: ConceptMap-vaccine-covid19-euur-to-icd11.html
+[vaccine-covid19-snomed-to-icd11]: ConceptMap-vaccine-covid19-snomed-to-icd11.html
+[WHO_DDCC_Agent_Targeted_COVID_19]: ValueSet-who-ddcc-agent-targeted-covid-19.html
+[WHO_DDCC_Brands_COVID_19]: ValueSet-who-ddcc-brands-covid-19.html
+[WHO_DDCC_Generator]: CapabilityStatement-WHO.DDCC.Generator.html
+[WHO_DDCC_RegistryService]: CapabilityStatement-WHO.DDCC.RegistryService.html
+[WHO_DDCC_Disease_Targeted_COVID_19]: ValueSet-who-ddcc-disease-targeted-covid-19.html
+[WHO_DDCC_Sample_Origin_COVID_19]: ValueSet-who-ddcc-sample-origin-covid-19.html
+[WHO_DDCC_Test_Result_COVID_19]: ValueSet-who-ddcc-test-result-covid-19.html
+[WHO_DDCC_Type_of_Test_COVID_19]: ValueSet-who-ddcc-type-of-test-covid-19.html
+[WHO_DDCC_Vaccines_COVID_19]: ValueSet-who-ddcc-vaccines-covid-19.html
+[who-ddcc-map-cvx-icd11-brands]: ConceptMap-who-ddcc-map-cvx-icd11-brands.html
+[who-ddcc-map-cvx-icd11-vaccines]: ConceptMap-who-ddcc-map-cvx-icd11-vaccines.html
+[who-ddcc-map-divoc-icd11-vaccines]: ConceptMap-who-ddcc-map-divoc-icd11-vaccines.html
+[who-ddcc-map-eudcc-icd11-vaccines]: ConceptMap-who-ddcc-map-eudcc-icd11-vaccines.html
+[who-ddcc-map-icao-icd11-vaccines]: ConceptMap-who-ddcc-map-icao-icd11-vaccines.html
+[who-ddcc-map-icd11-divoc-vaccines]: ConceptMap-who-ddcc-map-icd11-divoc-vaccines.html
+[who-ddcc-map-icd11-eudcc-vaccines]: ConceptMap-who-ddcc-map-icd11-eudcc-vaccines.html
+[who-ddcc-map-icd11-icao-vaccines]: ConceptMap-who-ddcc-map-icd11-icao-vaccines.html
+[who-ddcc-map-icd11-icd10-disease-targeted]: ConceptMap-who-ddcc-map-icd11-icd10-disease-targeted.html
+[who-ddcc-map-icd11-sct-agent-targeted]: ConceptMap-who-ddcc-map-icd11-sct-agent-targeted.html
+[who-ddcc-map-icd11-sct-disease-targeted]: ConceptMap-who-ddcc-map-icd11-sct-disease-targeted.html
+[who-ddcc-map-icd11-sct-test-result]: ConceptMap-who-ddcc-map-icd11-sct-test-result.html
+[who-ddcc-map-icd11-sct-vaccines]: ConceptMap-who-ddcc-map-icd11-sct-vaccines.html
+[who-ddcc-map-ichi-loinc-type-of-test]: ConceptMap-who-ddcc-map-ichi-loinc-type-of-test.html
+[who-ddcc-map-ichi-sct-specimen-origin]: ConceptMap-who-ddcc-map-ichi-sct-specimen-origin.html
+[who-ddcc-map-ichi-sct-type-of-test]: ConceptMap-who-ddcc-map-ichi-sct-type-of-test.html
+[who-ddcc-map-loinc-sct-type-of-test]: ConceptMap-who-ddcc-map-loinc-sct-type-of-test.html
+[who-ddcc-map-sct-ichi-specimen-origin]: ConceptMap-who-ddcc-map-sct-ichi-specimen-origin.html
\ No newline at end of file
diff --git a/input/includes/logical-model-sources.md b/input/includes/logical-model-sources.md
new file mode 100644
index 0000000000..b71d5e10b4
--- /dev/null
+++ b/input/includes/logical-model-sources.md
@@ -0,0 +1 @@
+The element descriptions whenever possible contain verbatim content from the relevant specifications for the convenience of the reader, but due to limitations in the FHIR Implementation Guide format, this content is not quoted or cited inline. [Readers should refer to the original specifications listed here](terminology_mapping.html#source-specifications). Any discrepancies between this logical model and the original specification should be viewed as a bug with the logical model and should be reported via the "Feedback" link to the right.
\ No newline at end of file
diff --git a/input/includes/menu.xml b/input/includes/menu.xml
index 528097030c..a28a2ac658 100644
--- a/input/includes/menu.xml
+++ b/input/includes/menu.xml
@@ -1,5 +1,5 @@
 <ul xmlns="http://www.w3.org/1999/xhtml" class="nav navbar-nav">
-	
+
 <!--
 	<li class="dropdown">
 		<a data-toggle="dropdown" href="#" class="dropdown-toggle">Background<b class="caret"></b>
@@ -22,13 +22,13 @@
 			<li><a href="references.html">References</a></li>
 		</ul>
 	</li>
-	
+
 	<li class="dropdown">
 		<a data-toggle="dropdown" href="requirements.html" class="dropdown-toggle">Business Requirements<b class="caret"></b>
 		</a>
 		<ul class="dropdown-menu">
 		  <li><a href="concepts.html">Key Concepts</a></li>
-		  <li><a href="functional_requirements.html">Functional Requirements</a></li>    
+		  <li><a href="functional_requirements.html">Functional Requirements</a></li>
 		  <li><a href="use_cases.html">Use Cases</a></li>
 		  <li><a href="dictionary.html">Data Dictionary</a></li>
 		</ul>
@@ -42,6 +42,7 @@
 		  <li><a href="transactions.html">Transactions</a></li>
 		  <li><a href="workflows.html">Workflows</a></li>
 		  <li><a href="content_profiles.html">Content Profiles</a></li>
+		  <li><a href="terminology_mapping.html">Terminology Mapping</a></li>
 		</ul>
 	</li>
 	<li class="dropdown">
@@ -61,4 +62,4 @@
 		   <li><a href="maps.html">Maps</a></li>
 		</ul>
 	</li>
-</ul>      
+</ul>
diff --git a/input/pagecontent/StructureDefinition-CertDCC-intro.md b/input/pagecontent/StructureDefinition-CertDCC-intro.md
new file mode 100644
index 0000000000..19e9ed7af5
--- /dev/null
+++ b/input/pagecontent/StructureDefinition-CertDCC-intro.md
@@ -0,0 +1 @@
+{% include logical-model-sources.md %}
diff --git a/input/pagecontent/StructureDefinition-CertDCC-notes.md b/input/pagecontent/StructureDefinition-CertDCC-notes.md
new file mode 100644
index 0000000000..19e9ed7af5
--- /dev/null
+++ b/input/pagecontent/StructureDefinition-CertDCC-notes.md
@@ -0,0 +1 @@
+{% include logical-model-sources.md %}
diff --git a/input/pagecontent/StructureDefinition-CertDIVOC-intro.md b/input/pagecontent/StructureDefinition-CertDIVOC-intro.md
new file mode 100644
index 0000000000..19e9ed7af5
--- /dev/null
+++ b/input/pagecontent/StructureDefinition-CertDIVOC-intro.md
@@ -0,0 +1 @@
+{% include logical-model-sources.md %}
diff --git a/input/pagecontent/StructureDefinition-CertICAO-intro.md b/input/pagecontent/StructureDefinition-CertICAO-intro.md
new file mode 100644
index 0000000000..19e9ed7af5
--- /dev/null
+++ b/input/pagecontent/StructureDefinition-CertICAO-intro.md
@@ -0,0 +1 @@
+{% include logical-model-sources.md %}
diff --git a/input/pagecontent/StructureDefinition-CertSHC-intro.md b/input/pagecontent/StructureDefinition-CertSHC-intro.md
new file mode 100644
index 0000000000..19e9ed7af5
--- /dev/null
+++ b/input/pagecontent/StructureDefinition-CertSHC-intro.md
@@ -0,0 +1 @@
+{% include logical-model-sources.md %}
diff --git a/input/pagecontent/terminology_mapping.md b/input/pagecontent/terminology_mapping.md
new file mode 100644
index 0000000000..84d5366e24
--- /dev/null
+++ b/input/pagecontent/terminology_mapping.md
@@ -0,0 +1,173 @@
+---
+layout: default
+title: Terminology Mapping
+---
+
+This page explains the approach taken in this IG to map data elements with terminology bindings in DIVOC, EU DCC, ICAO, and SHC credential types.
+
+### Strategy for mapping COVID certificate terminologies to the DDCC core data sets
+
+#### Test result
+
+The core data set ([FHIR.WHO.DDCC\\DDCC Core Data Set Logical Model for Test Result](StructureDefinition-DDCCCoreDataSet.TR.html)) has bindings to the following terminology:
+
+- **Pathogen targeted** (`pathogen`):<br/>ICD-11 MMS codes for COVID and COVID variants - [FHIR.WHO.DDCC\\WHO Agent Targeted (COVID-19)](ValueSet-who-ddcc-agent-targeted-covid-19.html)
+
+- **Type of test** (`type`):<br/>ICD-11 Foundation Component entities for NAAT or rapid tests - [FHIR.WHO.DDCC\\WHO Type of Covid-19 Test](ValueSet-who-ddcc-type-of-test-covid-19.html)
+
+- **Specimen sample origin** (`origin`):<br/>ICD-11 Foundation Component entities for the source of the specimen (e.g., nasopharyngeal swab) - [FHIR.WHO.DDCC\\WHO Speciman Sample Origin (COVID-19)](ValueSet-who-ddcc-sample-origin-covid-19.html)
+
+- **Test result** (`result`):<br/>ICD-11 MMS codes for "detected" or "not detected" - [FHIR.WHO.DDCC\\WHO Test Result (COVID-19)](ValueSet-who-ddcc-test-result-covid-19.html)
+
+- **Test centre country** (`country`):<br/>Three character country codes - [Valueset-iso3166-1-3](http://hl7.org/fhir/R4/valueset-iso3166-1-3.html)
+
+{:.table-striped.table.table-bordered}
+| Cert. type  | Element                                        | Core data mapping | Approach                                          | Source ValueSet                          | Mapping                                 |
+| ----------- | ---------------------------------------------- | ----------------- | ------------------------------------------------- | ---------------------------------------- | --------------------------------------- |
+| DIVOC       | `evidence.disease`                             | `pathogen`        | Map custom code system to ICD-11                  | [LabTestPathogenDivocValueSet]           | [lab-test-pathogen-divoc-to-icd11]      |
+| DIVOC       | `evidence.testType`                            | `type`            | Map custom code system to ICD-11                  | [LabTestTypeDivocValueSet]               | [lab-test-type-divoc-to-icd11]          |
+| DIVOC       | `evidence.sampleOrigin`                        | `origin`          | Map custom code system to ICD-11                  | [LabTestSampleOriginDivocValueSet]       | [lab-test-sample-origin-divoc-to-icd11] |
+| DIVOC       | `evidence.result`                              | `result`          | Map custom code system to ICD-11                  | [LabTestQualitativeResultDivocValueSet]  | [lab-test-qual-result-divoc-to-icd11]   |
+| DIVOC       | `evidence.facility.address.addressCountry`     | `country`         | ISO-3166 two or three character                   | [ISO-3166]                               | n/a                                     |
+| EU&nbsp;DCC | `-260.t.tg`                                    | `pathogen`        | Map SNOMED CT to ICD-11                           | [LabTestPathogenCovid19SnomedValueSet]   | [lab-test-pathogen-snomed-to-icd11]     |
+| EU&nbsp;DCC | `-260.t.tt`                                    | `type`            | Map generic LOINCs to ICD-11                      | [LabTestTypeLoincValueSet]               | [lab-test-type-covid19-loinc-to-icd11]  |
+| EU&nbsp;DCC | Not present                                    | `origin`          | n/a                                               | n/a                                      | n/a                                     |
+| EU&nbsp;DCC | `-260.t.tr`                                    | `result`          | Map SNOMED CT to ICD-11                           | [LabTestQualitativeResultSnomedValueSet] | [lab-test-qual-result-snomed-to-icd11]  |
+| EU&nbsp;DCC | `-260.t.to`                                    | `country`         | ISO-3166 two character                            | [ISO-3166]                               | n/a                                     |
+| ICAO        | Not present                                    | `pathogen`        | n/a                                               | n/a                                      | n/a                                     |
+| ICAO        | `data.msg.tr.tc`                               | `type`            | Map custom code system to ICD-11                  | [LabTestTypeIcaoValueSet]                | [lab-test-type-icao-to-icd11]           |
+| ICAO        | `data.msg.tr.m`                                | `origin`          | Map custom code system to ICD-11                  | [LabTestSampleOriginIcaoValueSet]        | [lab-test-sample-origin-icao-to-icd11]  |
+| ICAO        | `data.msg.tr.r`                                | `result`          | Map custom code system to ICD-11                  | [LabTestResultIcaoValueSet]              | [lab-test-qual-result-icao-to-icd11]    |
+| ICAO        | `data.msg.sp.ctr`                              | `country`         | Assuming ISO-3166 three character                 | [ISO-3166]                               | n/a                                     |
+| SHC         | Inferred from `code`                           | `pathogen`        | Assume COVID-19 if LOINC [listed here][loinclist] | n/a                                      | n/a                                     |
+| SHC         | `code`*                                        | `type`            | Map LOINC to ICD-11                               | [LabTestTypeCovid19LoincValueSet]        | [lab-test-type-covid19-loinc-to-icd11]  |
+| SHC         | Not currently present, but will be `bodySite`* | `origin`          | n/a                                               | n/A                                      | n/a                                     |
+| SHC         | `valueCodeableConcept.coding[0].code`*         | `result`          | Map SNOMED CT to ICD-11                           | [LabTestQualitativeResultSnomedValueSet] | [lab-test-qual-result-snomed-to-icd11]  |
+
+\* Note that these elements are within the FHIR Bundle that is part of the SMART Health Card. The full path to this is `vc.credentialSubject.fhirBundle.entry[].resource`.
+
+[loinclist]: https://loinc.org/sars-cov-2-and-covid-19/
+[ISO-3166]: https://www.hl7.org/fhir/iso3166.html
+
+#### Proof of vaccination
+
+The core data set ([FHIR.WHO.DDCC\\DDCC Core Data Set Logical Model - Vaccination Status - Proof of Vaccination](StructureDefinition-DDCCCoreDataSet.VS.PoV.html)) has bindings to the following terminology:
+
+- **Vaccine** (`vaccine`):<br/>ICD-11 MMS codes for both types of vaccine (e.g., `XM5DF6 COVID-19 vaccine, live attenuated virus`) and specific vaccine products (e.g., `XM3DT5  COVID-19 Vaccine Moderna`)
+
+- **Vaccine brand** (`brand`):<br/>Not currently bound to a ValueSet
+
+- **Country of vaccination** (`country`):<br/>Three character country codes - [Valueset-iso3166-1-3](http://hl7.org/fhir/R4/valueset-iso3166-1-3.html)
+
+##### Mapping approach
+
+{:.table-striped.table.table-bordered}
+| Cert. type  | Element                                    | Core data mapping | Approach                                                                                                                                   | Source ValueSet                                                                                | Mapping                                                             |
+| ----------- | ------------------------------------------ | ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------- | ------------------------------------------------------------------- |
+| DIVOC       | `evidence.icd11Code`                       | `vaccine`         | Presumably already ICD-11 MMS (see below)                                                                                                  | [VaccineCovid19Icd11ValueSet]                                                                  | n/a                                                                 |
+| DIVOC       | `evidence.facility.address.addressCountry` | `country`         | ISO-3166 two or three character                                                                                                            | [ISO-3166]                                                                                     | n/a                                                                 |
+| EU&nbsp;DCC | `-260.1.v.mp`                              | `vaccine`         | Preferred binding is Union Register, but could also be ICD-11 or arbitrary strings. Only Union Register is considered in our mapping code. | [VaccineCovid19EUUnionRegisterValueSet]                                                        | [vaccine-covid19-euur-to-icd11]                                     |
+| EU&nbsp;DCC | `-260.1.v.co`                              | `country`         | ISO-3166 two character                                                                                                                     | [ISO-3166]                                                                                     | n/a                                                                 |
+| ICAO        | `data.msg.ve.des`                          | `vaccine`         | Already ICD-11 MMS                                                                                                                         | [VaccineCovid19Icd11ValueSet]                                                                  | n/a                                                                 |
+| ICAO        | `data.msg.ve.vd[].ctr`                     | `country`         | Already ISO-3166 three character                                                                                                           | [ISO-3166]                                                                                     | n/a                                                                 |
+| SHC         | `vaccineCode.coding[0].code`*              | `vaccine`         | ICD-11 MMS, CVX, or SNOMED CT; latter two mapped to ICD-11 MMS                                                                             | [VaccineCovid19CvxValueSet]<br>[VaccineCovid19Icd11ValueSet]<br>[VaccineCovid19SnomedValueSet] | [vaccine-covid19-cvx-to-icd11]<br>[vaccine-covid19-snomed-to-icd11] |
+| SHC         | Not present in computable form             | `country`         | n/a                                                                                                                                        | n/a                                                                                            | n/a                                                                 |
+
+\* Note that these elements are within the FHIR Bundle that is part of the SMART Health Card. The full path to this is `vc.credentialSubject.fhirBundle.entry[].resource`.
+
+#### FHIR Resource naming conventions
+
+##### ValueSets
+
+- Lab test - pathogen (COVID-19):
+  - `name`: `LabTestPathogenCovid19{TerminologyName}ValueSet`
+  - `id`: `lab-test-pathogen-covid19-{terminology-name}`
+  - `title`: `Lab Test - Pathogen - COVID-19 - {Terminology Name}`
+- Lab test - type (COVID-19-specific):
+  - `name`: `LabTestTypeCovid19{TerminologyName}ValueSet`
+  - `id`: `lab-test-type-covid19-{terminology-name}`
+  - `title`: `Lab Test - Type - COVID-19 - {Terminology Name}`
+- Lab test - type (generic):
+  - `name`: `LabTestType{TerminologyName}ValueSet`
+  - `id`: `lab-test-type-{terminology-name}`
+  - `title`: `Lab Test - Type - {Terminology Name}`
+- Lab test - sample origin:
+  - `name`: `LabTestSampleOrigin{TerminologyName}ValueSet`
+  - `id`: `lab-test-sample-origin-{terminology-name}`
+  - `title`: `Lab Test - Sample Origin - {Terminology Name}`
+- Lab test - qualitative result:
+  - `name`: `LabTestQualitativeResult{TerminologyName}ValueSet`
+  - `id`: `lab-test-qual-result-{terminology-name}`
+  - `title`: `Lab Test - Qualitative Result - {Terminology Name}`
+- Vaccine (COVID-19):
+  - `name`: `VaccineCovid19{TerminologyName}ValueSet`
+  - `id`: `vaccine-covid19-{terminology-name}`
+  - `title`: `Vaccine - COVID-19 - {Terminology Name}`
+
+FSH filenames should be `tx-vs-{id}.fsh`. Each ValueSet should be in a separate file.
+
+All ValueSet descriptions should describe where the codes in the value set came from and when the snapshot was taken. This should have enough information for someone to verify the contents of the value set or update it using the same approach.
+
+The goal is that `name` should clearly identify both the resource type and contents when used in [FSH](https://hl7.org/fhir/uv/shorthand/) within this IG, and the canonical URI (based on `id`) should not have any redundant information in it. The `title` should not include the resource type as this is implicit in how the resources are displayed in the IG.
+
+Terminology names in `id`s should be shortened as much as possible while still being readable. For example, SNOEMD CT becomes `snomed`; ICD-11 becomes `icd11`.
+
+"COVID-19" should appear in `id`/`name`/`title` when using a COVID-specific subset of a broader terminology system. For internally defined code systems (like those used by DIVOC and ICAO), "COVID-19" should _not_ appear in case those specifications are expanded in the future (otherwise it would be necessary to create a 2nd value set, which would be problematic for terminology bindings in the logical model).
+
+##### CodeSystems
+
+Code systems are included to allow for expansion.
+
+FSH filenames should be `tx-cs-{alias}.fsh`, like `tx-cs-snomed.fsh`. Each CodeSystem should be in a separate file. In cases where the IG already has a code system defined, the codes should be merged into the existing system rather than placed in a separate file.
+
+##### ConceptMaps
+
+In the naming scheme below:
+
+- `$type` = `LabTestPathogenCovid19`/`lab-test-pathogen-covid19`/`Lab Test - Pathogen - COVID-19`, etc.; for vaccines it is `VaccineCovid19`/`vaccine-covid19`/`Vaccine - COVID-19`
+- `$source` = terminology name for the source terminology
+- `$target` = terminology name for the target terminology
+
+With these variables defined, ConceptMaps should be named as follows:
+
+- `name`: `{$type}{$source}To{$target}ConceptMap`
+- `id`: `{$type}-{$source}-to-{$target}`
+- `title`: `{$type} - mapping {$source} to {$target}`
+
+For example, if:
+
+- `$type` = `Vaccine - COVID-19` (and variants)
+- `$source` = `CVX`
+- `$target` = `ICD-11`
+
+...then we would have:
+
+- `id`: `vaccine-covid19-cvx-to-icd-11`
+- `title`: `Vaccine - COVID-19 - mapping CVX to ICD-11`
+- Filename: `tx-cm-vaccine-covid19-cvx-to-icd-11.fsh`
+
+Each ConceptMap should be in a separate file.
+
+### Source specifications
+
+It can be difficult to find the "source of truth" specifications for the certificate formats that are mapped to the DDCC core data sets. The following are links to the best known documentation for each of the certificate formats listed above:
+
+- **DIVOC**
+  - Elements are defined by JSON-LD. As of 2023-02-12, we were told by the DIVOC team that the most current JSON-LD context for [vaccines is here](https://github.com/egovernments/DIVOC/blob/icmr/vaccination-context/vaccination-context.js) and for [test results is here](https://github.com/egovernments/DIVOC/blob/icmr/test-certificate-context/test-certificate-context.js).
+    - Note that the URIs for the DIVOC-specific JSON-LD contexts embedded in the certificates do not resolve.
+  - [DIVOC's documentation is here](https://divoc.digit.org), but this does not include element-level descriptions (e.g., terminology bindings at a per-element level).
+    - Terminology bindings at the element level must be inferred from [more general documentation](https://divoc.digit.org/platform/divocs-verifiable-certificate-features/what-information-goes-into-a-qr-code).
+    - The `v2` JSON-LD context introduces the `evidence.icd11Code` element for vaccines, but there is no documentation on which codes this element is bound to or whether this is used in production.
+    - There is no other computable representation of vaccine type/product.
+  - As of 2023-02-12, the public documentation does not include any information on test result certificates. The information we have was provided privately by the DIVOC team.
+- **EU DCC**
+  - Starting place: [Technical specifications for EU Digital COVID Certificates - Volumes 1-5](https://health.ec.europa.eu/publications/technical-specifications-eu-digital-covid-certificates-volumes-1-5_en).
+  - This led to [Volume 1: Formats and trust management](https://health.ec.europa.eu/system/files/2022-02/digital-covid-certificates_v1_en.pdf), which references "Implementing Decision (EU) 2021/1073, Annex I".
+  - [Implementing Decision (EU) 2021/1073, Annex I can be found here](https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=uriserv%3AOJ.L_.2021.230.01.0032.01.ENG), along with other relevant Annexes.
+- **[ICAO](https://www.icao.int/vdsnc-spec)**
+- **SMART Health Cards**
+  - [General SMART Health Card specification](https://spec.smarthealth.cards/)
+  - [COVID-19 vaccine and testing-specific specification](http://vci.org/ig/vaccination-and-testing)
+
+
+{% include fsh-link-references.md %}
diff --git a/sushi-config.yaml b/sushi-config.yaml
index 16280aba9a..bef3d7941d 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -33,4 +33,12 @@ dependencies:
     version: 4.2.0
 
 parameters:
-  special-url: [ http://worldhealthorganization.github.io/ddcc/DIVOC, https://ec.europa.eu/health/documents/community-register/html/, http://worldhealthorganization.github.io/ddcc/ICAOV1, http://id.who.int/icd11/mms]
\ No newline at end of file
+  special-url:
+    - http://worldhealthorganization.github.io/ddcc/DIVOC
+    - https://ec.europa.eu/health/documents/community-register/html/
+    - http://worldhealthorganization.github.io/ddcc/ICAOV1
+    - http://id.who.int/icd11/mms
+    - http://hl7.org/fhir/sid/cvx
+    - http://worldhealthorganization.github.io/ddcc/CodeSystem/lab-test-sample-origin-divoc
+    - http://loinc.org
+    - http://snomed.info/sct
\ No newline at end of file