diff --git a/.dbeaver/.credentials-config.json.bak b/.dbeaver/.credentials-config.json.bak
new file mode 100644
index 0000000..2d11c2b
--- /dev/null
+++ b/.dbeaver/.credentials-config.json.bak
@@ -0,0 +1 @@
+ZéŠ‘Õ;&®îgå¥šr^jN÷àÔwK‚HÉGF5Ø&GÙ5Ž7Î„°È¼4ôüF'ÊiNcbÖòØ¸j†K~ÖCA¹næ–@]M";Ú§§7¢”'»~3�1:¼à½ae!»«¯×õ#7ÌNdåÉ+aWÅà5óî*xå}ÏåÙë¹Un™AêÉ(>©’\‡ÀÓUŸ-­9á²"5Ò“_@> w,] ®v2"™,I€n@Ø›ˆ(´íéodÌ×ãÛ.WéêeÕêc~Éu™yõ†+9ä8�µ¦Ÿhâbfü	(¦Î·OÊ�â¸èÎ±ÅtR?óþ
\ No newline at end of file
diff --git a/.dbeaver/.data-sources.json.bak b/.dbeaver/.data-sources.json.bak
new file mode 100644
index 0000000..b2d156b
--- /dev/null
+++ b/.dbeaver/.data-sources.json.bak
@@ -0,0 +1,45 @@
+{
+	"folders": {},
+	"connections": {
+		"mariaDB-186c896820e-6ff11b5b802d8b82": {
+			"provider": "mysql",
+			"driver": "mariaDB",
+			"name": "rxnav",
+			"save-password": true,
+			"configuration": {
+				"host": "will-office",
+				"port": "3306",
+				"url": "jdbc:mariadb://will-office:3306/",
+				"configurationType": "MANUAL",
+				"type": "dev",
+				"auth-model": "native"
+			}
+		},
+		"postgres-jdbc-186c896a347-2a3d946d2dea4df7": {
+			"provider": "postgresql",
+			"driver": "postgres-jdbc",
+			"name": "aact_db",
+			"save-password": true,
+			"configuration": {
+				"host": "will-office",
+				"port": "5432",
+				"database": "aact_db",
+				"url": "jdbc:postgresql://will-office:5432/aact_db",
+				"configurationType": "MANUAL",
+				"type": "dev",
+				"auth-model": "native"
+			}
+		}
+	},
+	"connection-types": {
+		"dev": {
+			"name": "Development",
+			"color": "255,255,255",
+			"description": "Regular development database",
+			"auto-commit": true,
+			"confirm-execute": false,
+			"confirm-data-change": false,
+			"auto-close-transactions": false
+		}
+	}
+}
\ No newline at end of file
diff --git a/.dbeaver/.project-metadata.json.bak b/.dbeaver/.project-metadata.json.bak
new file mode 100644
index 0000000..9310679
--- /dev/null
+++ b/.dbeaver/.project-metadata.json.bak
@@ -0,0 +1 @@
+{"resources":{"development_sql/ASSOICATING NCTIDs to NDCs and Marketing dates.sql":{"default-datasource":"postgres-jdbc-186c896a347-2a3d946d2dea4df7","default-catalog":"aact_db","default-schema":"public"}}}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 9da644c..0e6b8e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -189,5 +189,9 @@ containers/RxNav-In-a-box/rxnav-in-a-box-*
 #Ignore stuff from AACT_downlaoder
 containers/AACT_downloader/postgresql/*
 containers/AACT_downloader/aact_downloads/*
+#ignore stuff in DrugCentral Downloader
+containers/drugcentral/docker-entrypoint-initdb.d/*.sql
+containers/drugcentral/docker-entrypoint-initdb.d/*.sql.gz
+containers/drugcentral/db_store/*
 
 
diff --git a/development_sql/.project b/.project
similarity index 65%
rename from development_sql/.project
rename to .project
index e4f5aba..14a5efa 100644
--- a/development_sql/.project
+++ b/.project
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>development_sql</name>
+	<name>ClinicalTrialsDataProcessing</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 	</buildSpec>
 	<natures>
+		<nature>org.jkiss.dbeaver.DBeaverNature</nature>
 	</natures>
 </projectDescription>
diff --git a/README.md b/README.md
index f434863..0137bf7 100644
--- a/README.md
+++ b/README.md
@@ -74,19 +74,18 @@ What this means in regards to this project is that docker makes it
 easy to setup containers.
 
 Install docker based on instructions for your linux distribution.
+I use podman (an alternative from RedHat) because it allows for running without root permissions.
 
 ### Docker networking
 
-I have the docker container for the database attached to a 
-network called "pharmaceutical_research" because I have a 
-container with pgadmin4 running on that docker network.
-This can be adjusted in the dockerfile.
+It is helpful to construct an external docker network by running
 
-I also have the database container open on port 5432, the typical 
-postgresql database port.
+`docker network create network_name`
 
-### Database logins
-I have choosen the database user of *root* with a password of *root*
-because I don't really need this database to be secure.
+and then including that network in the docker-compose.yaml
+
+# Environment Variables (`.env` file)
+I use an single .env file to setup the docker containers and pass configuration variables to 
+the python scripts. I would suggest changing the default values in `sample.env` to match your needs.
 If you do need to think about the security of your database I would recommend 
 you start by changing these.
diff --git a/containers/drugcentral/docker-compose.yaml b/containers/drugcentral/docker-compose.yaml
new file mode 100644
index 0000000..9870c73
--- /dev/null
+++ b/containers/drugcentral/docker-compose.yaml
@@ -0,0 +1,23 @@
+version: '3'
+
+networks:
+  pharmaceutical_research: #because it helps to have a way to link specifically to this. 
+
+services:
+  aact_db:
+    image: postgres:14-alpine
+    networks:
+      - pharmaceutical_research
+    container_name: DrugCentral
+    #restart: always #restart after crashes
+    environment:
+      POSTGRES_PASSWORD: root
+    ports:
+      - "54320:5432" #host:container
+    volumes: #host:container is the format.
+      # this is persistant storage for the database  
+      - ./db_store/:/var/lib/postgresql/
+      # this is the folder containing entrypoint info.
+      - ./docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d/
+
+
diff --git a/containers/drugcentral/init.sh b/containers/drugcentral/init.sh
new file mode 100755
index 0000000..791d337
--- /dev/null
+++ b/containers/drugcentral/init.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+filename="drugcentral.dump.08222022.sql.gz"
+
+cd ./docker-entrypoint-initdb.d/
+
+curl "https://unmtid-shinyapps.net/download/$filename" --output "$filename"
+
+gzip -d $filename
diff --git a/development_sql/ASSOICATING NCTIDs to NDCs and Marketing dates.sql b/development_sql/ASSOICATING NCTIDs to NDCs and Marketing dates.sql
index ee986ba..2046f0c 100644
--- a/development_sql/ASSOICATING NCTIDs to NDCs and Marketing dates.sql	
+++ b/development_sql/ASSOICATING NCTIDs to NDCs and Marketing dates.sql	
@@ -1,42 +1,38 @@
 
-/*get all the ndc codes associated with an rxcui
- * Same as query
- * http://will-office:4000/REST/rxcui/1668240/allhistoricalndcs.json
- * note the different formats of the dates.
+/* OVERVIEW
  * 
- * Based on http://will-office:4000/RxNav/search?searchBy=RXCUI&searchTerm=1668240
- * it appears that this rxcui is a sbd or bpck (branded drug or pack)
+ * This links trials to the first date each drug (indexed by NDA/ANDA etc) is
+ * put on the market.
  * 
-
- * If I grab every brand, then every branded drug or pack associated with that drug and then attach that to the nsde data I would get the marketing dates required.
- * --get brand names
- * trial -> mesh_term -> IN/MIN (rxcui) -> BN (rxcui) 
- * -- associate brand names to marketing dates
- * BN (rxcui) --> SBD/BPCK (RXCUI) --> ndc11 --> nsde 
+ * It takes 3 views to build up to it.
  * */
 
-/*
- * I do need to figure out a way to change the date types when importing into postgres. In mariadb they ar mmYYYY wheras in the jsonapi they are YYYYmm but I want is YYYY-mm-01
- */
-
----assoicate ingredients, brands, and approved packaging RXCUIs.
-create temp table tmp_trial_to_ingred as
+--Match trials to brands and ingredients
+create or replace view public.match_trials_to_bn_in as
 with trialncts as (
         SELECT DISTINCT nct_id  FROM history.trial_snapshots TS
     )
 SELECT 
     bi.nct_id ,
     bi.downcase_mesh_term, 
-    rp.rxcui  AS drug_rxcui
+    rr.tty2 ,
+    rr.rxcui2 as bn_or_in_cui --brand or ingredient
+    ,count(*)
 FROM ctgov.browse_interventions bi
-    INNER JOIN rxnorm_migrated.rxnorm_props AS rp
-        on bi.downcase_mesh_term  = rp.propvalue1  --Link drug ingredient
+    left outer JOIN rxnorm_migrated.rxnorm_props AS rp
+        on bi.downcase_mesh_term  = rp.propvalue1 --link names to drug cuis ()
+    left outer join rxnorm_migrated.rxnorm_relations rr 
+    	on rr.rxcui1 = rp.rxcui 
 WHERE
     bi.nct_id in (
         SELECT nct_id  FROM trialncts
         )
     and
     bi.mesh_type='mesh-list'
+    and rp.propname = 'Active_ingredient_name'
+    and rr.tty2 in ('BN', 'IN', 'MIN')
+group by bi.nct_id, bi.downcase_mesh_term , rr.tty2 ,rr.rxcui2 
+order by bi.nct_id 
 ;
 --running out of space.
 
@@ -87,42 +83,44 @@ where
 
 
 
---link brand names to drug applications (NDA/ANDA etc)
-select rr.rxcui1 as BN, rr.rxcui2 as pack, ah.ndc as pack_ndc11
-from 
-    rxnorm_migrated.rxnorm_relations rr 
+--match trials to through brands NDC11
+create or replace view public.match_trial_to_ndc11 as
+select 
+	mttbi.nct_id,
+	ah.ndc,
+	count(*)
+from public.match_trials_to_bn_in as mttbi
+    left outer join rxnorm_migrated.rxnorm_relations as rr 
+    	on mttbi.bn_or_in_cui = rr.rxcui1
     left outer join rxnorm_migrated."ALLNDC_HISTORY" as ah 
         on rr.rxcui2 = ah.rxcui 
 where 
-    tty1 = 'BN' 
+    rr.tty1 = 'BN' 
     and
-    tty2 in ('SBD', 'BPCK')
+    rr.tty2 in ('SBD', 'BPCK')
     and 
-    ah.sab='RXNORM'
-    
+    ah.sab='RXNORM' 
+group by mttbi.nct_id, ah.ndc
+order by mttbi.nct_id, ah.ndc
 ;
 
 
----associate NDAs/ANDAs to marketing start dates
----Get start of coverage periods for NSDE dates grouped by arbitrary grouping.
-SELECT n.application_number_or_citation, count(*), min( marketing_start_date )
-FROM spl.nsde as n
-where product_type = 'HUMAN PRESCRIPTION DRUG'
-group by n.application_number_or_citation ;
-
-
----For a given date, find which NDAs/ANDAs were active were active.
-SELECT n.application_number_or_citation, count(*)
-FROM spl.nsde as n
-where 
-    product_type = 'HUMAN PRESCRIPTION DRUG'
-    and
-    marketing_start_date < '2010-05-01'
-    and
-    marketing_end_date > '2010-05-01'
-group by n.application_number_or_citation ;
-
-
 
+---associate trials to marketing start dates
+create or replace view public.match_trial_to_marketing_start_date as
+select 
+	mttn.nct_id,
+	n.application_number_or_citation,
+	min(n.marketing_start_date )
+from match_trial_to_ndc11 mttn 
+	inner join spl.nsde n 
+		on mttn.ndc = n.package_ndc11 
+where 	
+	n.product_type = 'HUMAN PRESCRIPTION DRUG'
+	and
+	n.marketing_category in ('NDA','ANDA','BLA', 'NDA authorized generic', 'NDA AUTHORIZED GENERIC')
+group by mttn.nct_id,n.application_number_or_citation 
+order by mttn.nct_id 
+;
 
 
diff --git a/development_sql/Script.sql b/development_sql/Script.sql
new file mode 100644
index 0000000..e69de29
diff --git a/development_sql/views to history.sql b/development_sql/views to history.sql
index 3e9d6fc..9d79d31 100644
--- a/development_sql/views to history.sql	
+++ b/development_sql/views to history.sql	
@@ -1,5 +1,5 @@
 /***************CREATE VIEWS*******************/
-create view if not exists 
+create or replace view 
 	history.match_drugs_to_trials as
 select nct_id,  rxcui, propvalue1
 from 
diff --git a/non-db_data_sources/GBD and ICD-10_(2019 version)/ICD10-to-GDB_expander.py b/non-db_data_sources/GBD and ICD-10_(2019 version)/ICD10-to-GDB_expander.py
index beeacc5..9090c4e 100644
--- a/non-db_data_sources/GBD and ICD-10_(2019 version)/ICD10-to-GDB_expander.py	
+++ b/non-db_data_sources/GBD and ICD-10_(2019 version)/ICD10-to-GDB_expander.py	
@@ -3,7 +3,7 @@ import numpy as np
 
 IHME_COD_FILEPATH = "./IHME_GBD_2019_COD_CAUSE_ICD_CODE_MAP_Y2020M10D15.XLSX"
 IHME_NONFATAL_FILEPATH = "./IHME_GBD_2019_NONFATAL_CAUSE_ICD_CODE_MAP_Y2020M10D15.XLSX"
-ICD10CM_ORDER_FILEPATH = "./icd10-2019_categories_only.psv"
+ICD10CM_ORDER_FILEPATH = "./icd10_combined-who-cms.psv"
 
 #READ in ICD10CM codes
 
