diff --git a/nbri_ehr/resources/data/birth_condition.tsv b/nbri_ehr/resources/data/birth_condition.tsv
new file mode 100644
index 0000000..bdb4e26
--- /dev/null
+++ b/nbri_ehr/resources/data/birth_condition.tsv
@@ -0,0 +1,3 @@
+value title sort_order
+L Live 1
+D Dead 2
diff --git a/nbri_ehr/resources/data/breeding_type.tsv b/nbri_ehr/resources/data/breeding_type.tsv
new file mode 100644
index 0000000..c7b4b29
--- /dev/null
+++ b/nbri_ehr/resources/data/breeding_type.tsv
@@ -0,0 +1,9 @@
+value title sort_order
+0 Not assigned 1
+A Assigned breeding protocol 2
+C Cull 3
+H Held from mating activity 4
+M Multi-male 5
+Q Testing as breeder 6
+S Single male harem 7
+T Time-mated 8
diff --git a/nbri_ehr/resources/data/delivery_mode.tsv b/nbri_ehr/resources/data/delivery_mode.tsv
new file mode 100644
index 0000000..cea8a58
--- /dev/null
+++ b/nbri_ehr/resources/data/delivery_mode.tsv
@@ -0,0 +1,4 @@
+value title
+V Vaginal
+N Surgical-clinical
+NX Surgical experimental
\ No newline at end of file
diff --git a/nbri_ehr/resources/data/editable_lookups.tsv b/nbri_ehr/resources/data/editable_lookups.tsv
index 90cc8af..7e8c568 100644
--- a/nbri_ehr/resources/data/editable_lookups.tsv
+++ b/nbri_ehr/resources/data/editable_lookups.tsv
@@ -18,6 +18,7 @@ ehr_lookups bcs_score Clinical Body Condition Score Clinical observation fixed v
ehr_lookups behavior_abnormality Clinical Behavior Abnormality Clinical observation fixed values.
ehr_lookups behavior_mgmt_codes Behavior Behavior Management Codes Behavior observation fixed values.
ehr_lookups behavior_types Behavior Behavior Types Behavior observation fixed values.
+ehr_lookups birth_condition Colony Management Birth Condition Birth condition values.
ehr_lookups blood_draw_reason Clinical Blood Draw Reason Used in blood draw datasets.
ehr_lookups blood_draw_tube_type Clinical Blood Draw Tube Type Used in blood draw datasets.
ehr_lookups blood_sample_type Clinical Blood Sample Types Used in blood draw datasets.
@@ -37,6 +38,7 @@ ehr_lookups country_category Colony Management Country Category
ehr_lookups daily_enrich_codes Behavior Daily enrichment codes.
ehr_lookups data_category Clinical Data Categories Used in datasets.
ehr_lookups death_reason Colony Management Death Reason
+ehr_lookups delivery_mode Colony Management Delivery Mode
ehr_lookups delivery_state Colony Management Delivery State
ehr_lookups dental_obs Clinical Dental Observation Types Clinical observation values.
ehr_lookups derm_obs Clinical Dermatologic Observation Types Clinical observation values.
@@ -61,6 +63,7 @@ ehr_lookups general_obs Clinical General Observation Types Clinical observation
ehr_lookups genital_types Colony Management Genital Types Clinical observation fixed values.
ehr_lookups genitourinary_obs Clinical Genitourinary Observation Types Clinical observation fixed values.
ehr_lookups geographic_origins Colony Management Geographic Origins Used in demographics dataset.
+ehr_lookups breeding_type Colony Management Breeding Type Breeding group assignment codes.
ehr_lookups hernia_types Clinical Hernia Types Clinical observation fixed values.
ehr_lookups housing_reason Housing Housing Move Reason Used in housing dataset for location transfers.
ehr_lookups hyd_score Clinical Hydration Score Clinical observation fixed values.
diff --git a/nbri_ehr/resources/data/lookup_sets.tsv b/nbri_ehr/resources/data/lookup_sets.tsv
index 613eb8e..6c6dc48 100644
--- a/nbri_ehr/resources/data/lookup_sets.tsv
+++ b/nbri_ehr/resources/data/lookup_sets.tsv
@@ -16,6 +16,7 @@ bcs_score BCS Store value title
behavior_abnormality Behavior Abnormality value
behavior_mgmt_codes Behavior Management Codes value
behavior_types Behavior Types value
+birth_condition Birth Condition value title
blood_draw_reason Blood Draw Reason value
blood_sample_type Blood Sample Types value
cage_type Cage Type value title
@@ -31,6 +32,7 @@ country_category Country Category value title
daily_enrich_codes Daily Enrichment Codes value
data_category Data Category Field Values value
death_reason Death Reason value
+delivery_mode Delivery Mode value title
delivery_state Delivery State value title
dental_obs Dental Observations value
derm_obs Dermatologic Observations value
@@ -48,6 +50,7 @@ gastro_types Gastrointestinal Types value
general_obs General Observations value
genital_types Genital Types value
genitourinary_obs Genitourinary Observations value
+breeding_type Breeding Type value title
hernia_types Hernia Types value
housing_reason Housing Reason value
hyd_score Hyd Score value
diff --git a/nbri_ehr/resources/data/lookupsManifest.tsv b/nbri_ehr/resources/data/lookupsManifest.tsv
index defb466..4bf0220 100644
--- a/nbri_ehr/resources/data/lookupsManifest.tsv
+++ b/nbri_ehr/resources/data/lookupsManifest.tsv
@@ -18,6 +18,7 @@ bcs_score
behavior_abnormality
behavior_mgmt_codes
behavior_types
+birth_condition
blood_draw_reason
blood_draw_tube_type
blood_sample_type
@@ -35,6 +36,7 @@ country_category
daily_enrich_codes
data_category
death_reason
+delivery_mode
delivery_state
dental_obs
derm_obs
@@ -57,6 +59,7 @@ general_obs
genital_types
genitourinary_obs
geographic_origins
+breeding_type
hernia_types
housing_reason
hyd_score
diff --git a/nbri_ehr/resources/data/lookupsManifestTest.tsv b/nbri_ehr/resources/data/lookupsManifestTest.tsv
index b2006c8..eb35106 100644
--- a/nbri_ehr/resources/data/lookupsManifestTest.tsv
+++ b/nbri_ehr/resources/data/lookupsManifestTest.tsv
@@ -17,6 +17,7 @@ bcs_score
behavior_abnormality
behavior_mgmt_codes
behavior_types
+birth_condition
blood_draw_reason
blood_draw_tube_type
blood_sample_type
@@ -34,6 +35,7 @@ country_category
daily_enrich_codes
data_category
death_reason
+delivery_mode
delivery_state
dental_obs
derm_obs
@@ -56,6 +58,7 @@ general_obs
genital_types
genitourinary_obs
geographic_origins
+breeding_type
hernia_types
housing_reason
hyd_score
diff --git a/nbri_ehr/resources/data/pregnancy_result.tsv b/nbri_ehr/resources/data/pregnancy_result.tsv
index 1c615bc..819182e 100644
--- a/nbri_ehr/resources/data/pregnancy_result.tsv
+++ b/nbri_ehr/resources/data/pregnancy_result.tsv
@@ -1,3 +1,7 @@
value title
-1 Stillborn
-2 Abort
\ No newline at end of file
+NT No Tissue
+FD Fetal Death
+FN Found at necropsy
+FX Live, Term, euthanized at birth
+ND Live, Died day of birth (lungs inflated)
+FL Fetal Delivery, live in Utero
\ No newline at end of file
diff --git a/nbri_ehr/resources/data/source.tsv b/nbri_ehr/resources/data/source.tsv
index 0d893c4..8dc42a1 100644
--- a/nbri_ehr/resources/data/source.tsv
+++ b/nbri_ehr/resources/data/source.tsv
@@ -1,108 +1,103 @@
code meaning
-1 Adv Bioscience Labs
-2 Alamogordo PrimateFaclty
-3 Alpha Genesis, Inc.
-4 Barton West End Farm
-5 Battelle Memorial Inst
-6 Baylor Research Inst
-7 BIOCULTURE (MTIUS) LTD
-8 Bioculture US LLC
-9 BIOQUAL, Inc.
-10 Boehringer Ingelheim
-11 Boston University
-12 Buckshire Corporation
-13 Caribbean Primate Rsrch
-14 CBNC
-15 CDC
-16 Charles River Laboratory
-17 Charles River/Reno
-18 Chimp Haven
-19 China/Guangxi GF Sci Pri
-20 Chiron Corp
-21 CiToxLab North America
-22 Covance Research Prod
-23 CR Rsrch Models Houston
-24 Ctr Captive Chimp Care
-25 Cynologics Ltd
-26 DHMRI
-27 Duke Univ Medical Ctr
-28 Durham Research Center
-29 Emory University YPRC
-30 Envigo Global Services
-31 Guangdong Landau Biotech
-32 Hainan, China
-33 Harvard Medical School
-34 Indonesia (Pt. W. Sat)
-35 Johns Hopkins University
-36 LC Preclinical Research
-37 Lovelace Biomedical
-38 LRRI
-39 LSU Health Science BR
-40 LSU Health Science NO
-41 LSU Health Science Shv
-42 Mannheimer Foundation
-43 Mass. General Hospital
-44 MD Anderson Cancer Ctr.
-45 Merck & Co (Rahway)
-46 Merck & Co (WP)
-47 Merck Research Labs WP
-48 Nationwide Children's
-49 New England NPRC
-50 New York University
-51 NIAID (Bioqual)
-52 NIAID Morgan Island
-53 NIAID NIH Animal Ctr
-54 NICHD/NIH
-55 NIH
-56 NIH Animal Center
-57 NINDS NIH Animal Ctr
-58 Novartis Pharm. Corp.
-59 Novartis Vaccines Srl
-60 NYU School of Medicine
-61 Oregon NPRC
-62 Pfizer
-63 Pfizer-Andover
-64 Pfizer-Pearl River
-65 PreLabs
-66 Primate Products
-67 Primedica Labs
-68 PrimGen
-69 Primgen CSP
-70 RainForest Adventures
-71 Republic of Mauritius
-72 Rocky Mountain Lab
-73 Save the Chimps
-74 Siconbrec Inc
-75 Sierra Biomedical
-76 SNBL-SRC
-77 SRI International
-78 St. Jude Childrens Rsrch
-79 St. Kitts
-80 Stanford Univ School Med
-81 Stony Brook University
-82 SUNY Downstate Medical
-83 SW Found Biomed Rsrch
-84 Texas Biomed
-85 Three Springs Scientific
-86 Tulane NPC (Covington)
-87 Tulane Univ Medical Ctr
-88 Univ Alabama Birmingham
-89 Univ of Illinois
-90 Univ of Kansas Med Ctr
-91 Univ of Maryland
-92 Univ of Nebraska Med Ctr
-93 Univ of Pittsburgh
-94 Univ of Texas at Austin
-95 Univ of Washington NPRC
-96 Univ of Wisconsin
-97 Univ Tex MD Anderson CC
-98 USAMRICD
-99 USAMRIID
-100 Virginia Commonwealth U
-101 WakeForest School of Med
-102 WaNPRC
-103 Worldwide Primates, Inc.
-104 WRAIR
-105 Wyeth-Ayerst Rsrch (PR)
-106 Yale Univ Sch Medicine
-107 Yerkes Regional PRC
\ No newline at end of file
+AAI ASIATIC ANIMAL IMPORTS
+BIOQUAL BIOQUAL, INCORPORATED
+BRANDEIS BRANDEIS UNIVERSITY
+CA-DPH CALIF DEPT PUBLIC HEALTH FACILITIES
+CA-DOH CALIFORNIA STATE DEPARTMENT OF HEALTH
+CPRC CARRIBEAN PRIMATE CENTER
+CWRU CASE WESTERN RESERVE UNIVERSITY
+UCD-CNS CENTER FOR NEUROSCIENCE, UCD
+CR-KL CHARLES RIVER - KEY LOIS
+CRL CHARLES RIVER LABS
+CRRP CHARLES RIVER RESEARCH PRIMATES INC
+BROOKFIELD CHICAGO ZOOLOGICAL PARK (BROOKFIELD ZOO)
+CHILDRENS CHILDRENS HOSPITAL
+CHIMR CHRIST HOSPITAL INST. FOR MEDICAL RES.
+CSU COLORADO STATE UNIVERSITY
+CORNELL CORNELL UNIVERSITY
+COULSTON COULSTON FOUNDATION
+COVANCE COVANCE RESEARCH PRODUCTS, INC.
+PRIMGEN CSP-PRIMGEN
+CUTTER CUTTER LAB
+DMT DEL MUNDO TRADING
+EPZ EL PASO ZOOLOGICAL GARDENS
+ENVIGO ENVIGO
+HAHNEMANN HAHNEMANN UNIVERSITY
+HL HAZELTON LABORATORIES
+HLA HAZELTON LABORATORIES AMERICA INC.
+UNK INSTITUTION UNKNOWN
+ISU-VDL IOWA STATE UNIV, VET DIAGNOSTIC LAB
+JVL JAN VACEK LIMITED
+JHMC JEWISH HOSPITAL & MEDICAL CENTER
+JRI JOHNSON RESEARCH INSTITUTE
+KNLPC KUNMING NATIONAL LABORATORY PRIMATE CTR.
+LABS LABORATORY ANIMAL BREEDERS AND SERVICES
+LABSINDO LABSINDO
+LEMSIP LEMSIP, NEW YORK MEDICAL CENTER, RDI
+LAIR LETTERMAN ARMY RES INST-PRESIDIO
+LB LITTON BIONETICS
+LLU LOMA LINDA UNIVERSITY
+MSU-MI MICHIGAN STATE UNIVERSITY
+MSU-MT MONTANA STATE UNIVERSITY
+MPI MPI RESEARCH
+NASA-ARC NASA-AMES RESEARCH CENTER
+NAMRL NAVAL AEROSPACE MEDICAL RESEARCH LAB
+NEPRC NEW ENGLAND PRIMATE RESEARCH CENTER
+NIHAC NIH ANIMAL CENTER
+ORPRC OREGON REGIONAL PRIMATE RESEARCH CENTER
+PARC-SAF PARC SAFARI AFRICAN
+PPC PERRINE PRIMATE CENTER
+PPP PERUVIAN PRIMATOLOGICAL PROJECT
+PET-FARM PET FARM
+PRIMLAB PRIMATE LABORATORY
+PPI PRIMATE PRODUCTS, INCORPORATED
+PRIVATE PRIVATE PARTY
+RIEPT RES. INST. OF EXP. PATHOLOGY & THERAPY
+SALK SALK INSTITUTE
+SFGH SAN FRANCISCO GENERAL HOSPITAL
+SNBL SHIN NIPPON BIOMEDICAL LABORATORIES
+SICONBREC SICONBREC
+SBM SIERRA BIOMEDICAL
+SKB SMITH, KLINE, BEECHAM
+SIU SOUTHERN ILLINOIS UNIVERSITY
+SIU-SOM SOUTHERN ILLINOIS UNIVERSITY MED SCHOOL
+SORI SOUTHERN RESEARCH INSTITUTE
+SFRE SOUTHWEST FOUNDATION FOR RES. & EDUC.
+SWRF SOUTHWEST RESEARCH FOUNDATION
+SWRI SOUTHWEST RESEARCH INSTITUTE
+SOPF STANFORD OUTDOOR PRIMATE FACILITY
+SRI STANFORD RESEARCH INSTITUTE
+SUNY-SB STATE UNIV OF NEW YORK AT STONY BROOK
+SXZ SUZHOU XISHAN ZHONGKE LAB ANIMAL CO.
+SYNTEX SYNTEX (USA) INCORPORATED
+TARPON TARPON ZOO
+TTUHSC TEXAS TECH HEALTH SCIENCE CENTER
+BROOKS-AFB TEXAS, BROOKS AIR FORCE BASE
+TPI THE PARKINSON'S INSTITUTE
+TNPRC TULANE (DELTA) REGIONAL PRIMATE RES CTR
+UCB UC BERKELEY
+UCLA UC LOS ANGELES
+UCR UC RIVERSIDE
+UCSD UC SAN DIEGO
+UCSF UC SAN FRANCISCO VIVARIUM
+UC-ARS UNIV OF CALIF, ANIMAL RESOURCES SERVICE
+GPC UNIV OF GOTTINGEN PRIMATE CENTER
+UH-RAF UNIV OF HAWAII, RESEARCH ANIMAL FACILITY
+OUHSC UNIV OF OKLAHOMA HEALTH SCI. CENTER
+UTHSC-H UNIV OF TEXAS, HEALTH SCI CTR, HOUSTON
+UCHSC UNIVERSITY OF COLORADO HEALTH SCIENCES
+UCMC UNIVERSITY OF COLORADO MEDICAL CENTER
+UIC UNIVERSITY OF ILLINOIS AT CHICAGO
+UNV UNIVERSITY OF NEVADA
+UNM UNIVERSITY OF NEW MEXICO
+UPR UNIVERSITY OF PUERTO RICO
+UTSCC UNIVERSITY OF TEXAS SYSTEM CANCER CENTER
+UNK-CN UNKNOWN INSTITUTION, CHINA
+VBS VALLEY BIOSYSTEMS
+WFSM WAKE FOREST SCHOOL OF MEDICINE
+WANPRC WASHINGTON REGIONAL PRIMATE RESEARCH CTR
+WHMC WILFORD HALL MEDICAL CENTER
+WRPRC WISCONSIN REGIONAL PRIMATE RESEARCH CTR
+WAI WOODWARD ASIATIC IMPORTS
+WWP WORLD WIDE PRIMATES, INC.
+YPRC YEMASSEE PRIMATE RESEARCH CENTER
diff --git a/nbri_ehr/resources/queries/nbri_ehr/Conception.query.xml b/nbri_ehr/resources/queries/nbri_ehr/Conception.query.xml
index 0eb26a8..27ec879 100644
--- a/nbri_ehr/resources/queries/nbri_ehr/Conception.query.xml
+++ b/nbri_ehr/resources/queries/nbri_ehr/Conception.query.xml
@@ -14,9 +14,6 @@