From 76c69069dd8117db06100135b570696178308250 Mon Sep 17 00:00:00 2001
From: "Scott J. Pearson" <scott.j.pearson@vumc.org>
Date: Fri, 19 Feb 2021 13:03:39 -0600
Subject: [PATCH] 2.31.1

---
 CareerDev.php                        |  23 +++-
 FlightTrackerExternalModule.php      |   6 +-
 classes/Citation.php                 |   8 +-
 classes/Cohorts.php                  |   4 +
 classes/Crons.php                    |  18 ++-
 classes/Download.php                 |  24 +++-
 classes/Grant.php                    |  27 ++++
 classes/NameMatcher.php              |  15 ++-
 classes/Publications.php             | 150 +++++++++++++++--------
 classes/REDCapManagement.php         |  77 +++++++++---
 classes/Upload.php                   | 103 ++++++++++++----
 cohorts/duplicate.php                | 176 +++++++++++++++++++++++++++
 cronLoad.php                         |  10 +-
 drivers/2m_updateExPORTER.php        | 155 +++++++++++++++--------
 drivers/2n_updateReporters.php       |  82 +++++++++----
 drivers/2q_refreshCohortProjects.php |  36 ++++++
 mentor/index.php                     |   8 ++
 mentor/index_complete.php            |   7 ++
 mentor/index_menteeview.php          |   9 ++
 mentor/index_mentorview.php          |   6 +
 profile.php                          |   8 +-
 small_base.php                       |  35 +-----
 22 files changed, 772 insertions(+), 215 deletions(-)
 create mode 100644 cohorts/duplicate.php
 create mode 100644 drivers/2q_refreshCohortProjects.php

diff --git a/CareerDev.php b/CareerDev.php
index 94be4e52..4385f637 100644
--- a/CareerDev.php
+++ b/CareerDev.php
@@ -10,7 +10,7 @@ class CareerDev {
 	public static $passedModule = NULL;
 
 	public static function getVersion() {
-		return "2.31.0";
+		return "2.31.1";
 	}
 
 	public static function getLockFile($pid) {
@@ -555,6 +555,27 @@ public static function isTestGroup($pid) {
         return (SERVER_NAME == "redcap.vanderbilt.edu") && in_array($pid, [105963, 101785]);
     }
 
+    public static function duplicateAllSettings($srcPid, $destPid, $defaultSettings = []) {
+	    if ($srcPid && $destPid) {
+	        self::setPid($srcPid);
+	        $module = self::getModule();
+	        $srcSettings = $module->getProjectSettings($srcPid);
+            $destSettings = $defaultSettings;
+            foreach ($srcSettings as $setting => $value) {
+                if (!$destSettings[$setting] && $value) {
+                    $destSettings[$setting] = $value;
+                }
+            }
+
+            foreach ($destSettings as $setting => $value) {
+                self::saveSetting($setting, $value, $destPid);
+            }
+            self::log("Copied ".count($destSettings)." settings from $srcPid to $destPid");
+        } else {
+	        throw new \Exception("Could not find source PID $srcPid or destination PID $destPid");
+        }
+    }
+
 	public static function getMenu($menuName) {
 		global $pid;
 		$r = self::getREDCapDir();
diff --git a/FlightTrackerExternalModule.php b/FlightTrackerExternalModule.php
index 7d4f07c2..9e81f957 100755
--- a/FlightTrackerExternalModule.php
+++ b/FlightTrackerExternalModule.php
@@ -530,7 +530,7 @@ private function copyFormData(&$completes, &$pidsUpdated, $forms, $sourceInfo, $
     }
 
 	function cron() {
-        \System::increaseMaxExecTime(14400);   // 4 hours
+        \System::increaseMaxExecTime(28800);   // 8 hours
 
 		$this->setupApplication();
         $pids = $this->framework->getProjectsWithModuleEnabled();
@@ -555,10 +555,11 @@ function cron() {
             $server = $this->getProjectSetting("server", $pid);
             $tokenName = $this->getProjectSetting("tokenName", $pid);
             $adminEmail = $this->getProjectSetting("admin_email", $pid);
+            $turnOffSet = $this->getProjectSetting("turn_off", $pid);
             $GLOBALS['namesForMatch'] = array();
             CareerDev::setPid($pid);
             CareerDev::log("Using $tokenName $adminEmail", $pid);
-            if ($token && $server) {
+            if ($token && $server && !$turnOffSet) {
                 # only have token and server in initialized projects
                 $mgr = new CronManager($token, $server, $pid);
                 if ($this->getProjectSetting("run_tonight", $pid)) {
@@ -573,6 +574,7 @@ function cron() {
                 CareerDev::log($this->getName().": cron run complete for pid $pid", $pid);
 			}
 		}
+		REDCapManagement::cleanupDirectory(APP_PATH_TEMP, "/RePORTER_PRJ/");
 	}
 
 	function setupApplication() {
diff --git a/classes/Citation.php b/classes/Citation.php
index 99cb0cb4..dded70b2 100644
--- a/classes/Citation.php
+++ b/classes/Citation.php
@@ -247,11 +247,15 @@ public function toHTML($citationClass) {
 	}
 
 	public function hasAuthor($name) {
-		list($firstName, $lastName) = NameMatcher::splitName($name);
+		list($firstName, $lastName) = NameMatcher::splitName($name, 2, isset($_GET['test']));
 		if ($lastName) {
 			$authorList = $this->getAuthorList();
 			foreach ($authorList as $author) {
+				list($currFirstName, $currLastName) = NameMatcher::splitName($author, 2, isset($_GET['test']));
 				list($currFirstName, $currLastName) = NameMatcher::splitName($author);
+                if (isset($_GET['test'])) {
+                    Application::log("Comparing $firstName $lastName against $currFirstName $currLastName");
+                }
                 if (NameMatcher::matchByInitials($currLastName, $currFirstName, $lastName, $firstName)) {
                     return TRUE;
                 }
@@ -283,7 +287,7 @@ private function isAuthorIdx($pos, $name) {
         }
         $author = $authorList[$idx];
         list($authorFirstName, $authorLastName) = NameMatcher::splitName($author);
-        if (NameMatcher::matchByInitials($authorFirstName, $authorLastName, $lastName, $firstName)) {
+        if (NameMatcher::matchByInitials($authorLastName, $authorFirstName, $lastName, $firstName)) {
             return TRUE;
         }
         return FALSE;
diff --git a/classes/Cohorts.php b/classes/Cohorts.php
index 91aac963..4b6298bb 100644
--- a/classes/Cohorts.php
+++ b/classes/Cohorts.php
@@ -23,6 +23,10 @@ public function __construct($token, $server, $moduleOrMetadata) {
 		$this->configs = $this->getConfigs();
 	}
 
+	public function makeCohortsSelect($defaultCohort, $onchangeJS = "", $displayAllOption = FALSE) {
+	    return $this->makeCohortSelect($defaultCohort, $onchangeJS, $displayAllOption);
+    }
+
 	public function makeCohortSelect($defaultCohort, $onchangeJS = "", $displayAllOption = FALSE) {
         $html = "<label for='cohort'>Cohort:</label> <select id='cohort' name='cohort'";
         if ($onchangeJS) {
diff --git a/classes/Crons.php b/classes/Crons.php
index 77d97b10..09ceafc3 100644
--- a/classes/Crons.php
+++ b/classes/Crons.php
@@ -130,13 +130,23 @@ public function run($adminEmail = "", $tokenName = "", $additionalEmailText = ""
 		Application::log("Looking in ".$this->getNumberOfCrons()." cron jobs");
 		$run = [];
 		$toRun = [];
+        $makeSummaryCronJob = FALSE;
 		foreach ($keys as $key) {
-			if (isset($this->crons[$key])) {
+		    if (isset($this->crons[$key])) {
 				foreach ($this->crons[$key] as $cronjob) {
-					$toRun[] = $cronjob;
+				    if ($cronjob->getMethod() == "makeSummary") {
+				        # set as last
+				        $makeSummaryCronJob = $cronjob;
+                    } else {
+                        $toRun[] = $cronjob;
+                    }
 				}
 			}
 		}
+		if ($makeSummaryCronJob !== FALSE) {
+		    # set as last
+		    $toRun[] = $makeSummaryCronJob;
+        }
 
 		register_shutdown_function(["CronManager", "reportCronErrors"]);
 
@@ -240,6 +250,10 @@ public function getTitle() {
 		return $this->file.": ".$this->method;
 	}
 
+	public function getMethod() {
+	    return $this->method;
+    }
+
 	public function run($passedToken, $passedServer, $passedPid, $records) {
 		if (!$passedToken || !$passedServer || !$passedPid) {
 			throw new \Exception("In cronjob at beginning, could not find token '$passedToken' and/or server '$passedServer' and/or pid '$passedPid'");
diff --git a/classes/Download.php b/classes/Download.php
index 68c162f3..0d887a08 100644
--- a/classes/Download.php
+++ b/classes/Download.php
@@ -289,7 +289,9 @@ public static function formMetadata($token, $server, $forms = array()) {
 	}
 
 	public static function metadata($token, $server, $fields = array()) {
-		Application::log("Download::metadata");
+		if (isset($_GET['test'])) {
+            Application::log("Download::metadata");
+        }
 		$data = array(
 			'token' => $token,
 			'content' => 'metadata',
@@ -578,7 +580,9 @@ public static function names($token, $server) {
 	}
 
 	public static function recordIds($token, $server) {
-		Application::log("Download::recordIds");
+		if (isset($_GET['test'])) {
+            Application::log("Download::recordIds");
+        }
 		$data = array(
 			'token' => $token,
 			'content' => 'record',
@@ -605,7 +609,9 @@ public static function recordIds($token, $server) {
 	public static function fieldsWithConfig($token, $server, $metadata, $fields, $cohortConfig) {
 		$filter = new Filter($token, $server, $metadata);
 		$records = $filter->getRecords($cohortConfig);
-		Application::log("Download::fieldsWithFilter ".count($records)." records; ".count($fields)." fields");
+		if (isset($_GET['test'])) {
+            Application::log("Download::fieldsWithFilter ".count($records)." records; ".count($fields)." fields");
+        }
 		return Download::fieldsForRecords($token, $server, $fields, $records);
 	}
 
@@ -614,7 +620,9 @@ public static function fields($token, $server, $fields) {
 	        Application::log("Error! Download::fields blank ".json_encode(debug_backtrace()));
 	        return [];
         }
-		Application::log("Download::fields ".count($fields)." fields");
+	    if (isset($_GET['test'])) {
+            Application::log("Download::fields ".count($fields)." fields");
+        }
 		$data = array(
             'token' => $token,
             'content' => 'record',
@@ -668,7 +676,9 @@ public function downloads_test($tester) {
 	}
 
 	public static function fieldsForRecords($token, $server, $fields, $records) {
-		Application::log("Download::fieldsForRecords ".count($fields)." fields with ".json_encode($records));
+	    if (isset($_GET['test'])) {
+            Application::log("Download::fieldsForRecords ".count($fields)." fields with ".json_encode($records));
+        }
 		$data = array(
 			'token' => $token,
 			'content' => 'record',
@@ -691,7 +701,9 @@ public static function records($token, $server, $records = NULL) {
 			# assume recordIds was meant if $records null
 			return Download::recordIds($token, $server);
 		}
-		Application::log("Download::records ".json_encode($records));
+		if (isset($_GET['test'])) {
+            Application::log("Download::records ".json_encode($records));
+        }
 		$data = array(
 			'token' => $token,
 			'content' => 'record',
diff --git a/classes/Grant.php b/classes/Grant.php
index 017945dd..1e20d843 100644
--- a/classes/Grant.php
+++ b/classes/Grant.php
@@ -1125,6 +1125,9 @@ private static function getApplicationType($awardNo) {
 
 	public function isFederal() {
 		$src = $this->getVariable("source");
+		if ($this->isNIH()) {
+		    return TRUE;
+        }
 		if (in_array($src, array("exporter", "reporter"))) {
 			return TRUE;
 		} else if ($src == "coeus") {
@@ -1164,38 +1167,62 @@ public function isFederal() {
                 "National Institutes of Health/Unknown",
                 "National Institutes of Health/Office of the Director",
                 "National Institute on Minority Health and Health Disparities",
+                "National Institute on Minority Health & Health Disparities",
                 "National Institute on Drug Abuse",
                 "National Institute on Deafness and Communication Disorders",
                 "National Institute on Deafness and Other Communication Disor",
+                "National Institute on Deafness and Other Communication Disorders",
                 "National Institute on Alcohol Abuse and Alcoholism",
+                "National Institute on Alcohol Abuse & Alcoholism",
                 "National Institute on Aging",
                 "National Institute of Nursing Research",
                 "National Institute of Neurological Disorders and Stroke",
+                "National Institute of Neurological Disorders & Stroke",
                 "National Institute of Mental Health",
                 "National Institute of General Medical Sciences",
                 "National Institute of Environmental Health Sciences",
                 "National Institute of Diabetes & Digestive & Kidney Disease",
+                "National Institute of Diabetes and Digestive and Kidney Disease",
                 "National Institute of Child Health and Human Development",
+                "National Institute of Child Health & Human Development",
                 "National Institute of Dental and Craniofacial Research",
+                "National Institute of Dental & Craniofacial Research",
                 "National Institute of Biomedical Imaging and Bioengineering",
+                "National Institute of Biomedical Imaging & Bioengineering",
                 "National Institute of Arthritis, Musculoskeletal and Skin",
+                "National Institute of Arthritis and Musculoskeletal and Skin Diseases",
+                "National Institute of Arthritis & Musculoskeletal & Skin Diseases",
                 "National Institute of Allergy and Infectious Diseases",
+                "National Institute of Allergy & Infectious Diseases",
                 "National Human Genome Research Institute",
                 "National Heart, Lung, and Blood Institute",
+                "National Heart, Lung, & Blood Institute",
                 "National Eye Institute",
                 "National Center for Research Resources",
                 "National Center for Complementary and Integrative Health",
+                "National Center for Complementary & Integrative Health",
                 "National Center for Advancing Translational Sciences",
                 "National Cancer Institute",
+                "NIH Clinical Center",
+                "Center for Information Technology",
+                "Center for Scientific Review",
+                "Fogarty International Center",
                 "Food and Drug Administration/Other",
                 "Food and Drug Administration",
+                "Food & Drug Administration",
                 "Department of Defense",
                 "Congressionally Directed Medical Research Programs",
                 "Centers for Medicare and Medicaid Services",
+                "Centers for Medicare & Medicaid Services",
                 "Centers For Disease Control and Prevention (CDC)",
+                "Centers For Disease Control and Prevention",
                 "Agency for Healthcare Research and Quality",
+                "Agency for Healthcare Research & Quality",
                 "Department of Health and Human Services",
+                "Department of Health & Human Services",
                 "NIH National Research Service Award",
+                "NIH Office of the Director",
+
             ];
             if (in_array($agency, $federalAgencies) && ($agency != "State of Tennessee")) {
                 return TRUE;
diff --git a/classes/NameMatcher.php b/classes/NameMatcher.php
index bf5cda71..5ad481c3 100644
--- a/classes/NameMatcher.php
+++ b/classes/NameMatcher.php
@@ -245,7 +245,7 @@ public static function explodeLastName($last) {
 	    $newNodes = [$last];
 	    $i = 0;
 	    $suffixesInUpper = ["I", "II", "III", "IV", "JR", "JR.", "SR", "SR."];
-	    $prefixesInLower = ["van", "von", "de"];
+	    $prefixesInLower = ["van", "von", "de", "der"];
 	    foreach ($nodes as $node) {
 	        if (in_array(strtoupper($node), $suffixesInUpper) && ($i == 1)) {
 	            return [$nodes[0]." ".$nodes[1]];
@@ -262,6 +262,9 @@ public static function explodeLastName($last) {
 	public static function downloadNamesForMatch($token, $server) {
 		Application::log("Downloading new names for pid ".Application::getPID($token));
 		self::$namesForMatch = Download::fields($token, $server, array("record_id", "identifier_first_name", "identifier_last_name"));
+		if (self::$namesForMatch === NULL) {
+		    self::$namesForMatch = [[]];
+        }
         Application::log("Downloaded ".count(self::$namesForMatch)." rows");
 		self::$currToken = $token;
 		return self::$namesForMatch;
@@ -495,8 +498,14 @@ public static function splitName($name, $parts = 2, $loggingOn = FALSE) {
                     $changed = FALSE;
                     if ($loggingOn) { echo "In do-while with ".count($nodes)." nodes<br>"; }
                     if (count($nodes) == $parts) {
-                        if ($loggingOn) { echo "Do-while A<br>"; }
-                        return $nodes;
+                        if (strlen($nodes[1]) <= 2) {
+                            # Initials
+                            if ($loggingOn) { echo "Do-while A Initials<br>"; }
+                            return [$nodes[1], $nodes[0]];
+                        } else {
+                            if ($loggingOn) { echo "Do-while A<br>"; }
+                            return $nodes;
+                        }
                     } else if ((count($nodes) == 3) && (self::isInitial($nodes[0]) || self::isInitial($nodes[1]))) {
                         if ($loggingOn) { echo "Do-while B<br>"; }
                         if ($parts == 2) {
diff --git a/classes/Publications.php b/classes/Publications.php
index b8b22e5b..cdf651e6 100644
--- a/classes/Publications.php
+++ b/classes/Publications.php
@@ -43,8 +43,8 @@ public function deduplicateCitations($recordId) {
 	            $duplicateInstances[] = $row['redcap_repeat_instance'];
             }
         }
-	    foreach ($duplicateInstances as $instance) {
-            Upload::deleteForm($this->token, $this->server, $this->pid, "citation_", $recordId, $instance);
+	    if (!empty($duplicateInstances)) {
+            Upload::deleteFormInstances($this->token, $this->server, $this->pid, "citation_", $recordId, $duplicateInstances);
         }
     }
 
@@ -252,6 +252,7 @@ private static function getAltmetricRow($doi, $metadataFields) {
                     }
                 }
             }
+            usleep(1150000);   // altmetric has a 1 second rate-limit
         }
         return $uploadRow;
     }
@@ -492,6 +493,19 @@ public static function uploadBlankPMCsAndPMIDs($token, $server, $recordId, $meta
 	    return 0;
     }
 
+    public function getNumberWithPeople($names, $cat = "Included") {
+	    $numPubsMatched = 0;
+	    foreach ($this->getCitations($cat) as $citation) {
+	        foreach ($names as $name) {
+	            if ($name && $citation->hasAuthor($name)) {
+                    $numPubsMatched++;
+	                break;
+                }
+            }
+        }
+	    return $numPubsMatched."/".$this->getCount($cat);
+    }
+
 	public static function getCitationsFromPubMed($pmids, $metadata, $src = "", $recordId = 0, $startInstance = 1, $confirmedPMIDs = array(), $pid = NULL) {
         $metadataFields = REDCapManagement::getFieldsFromMetadata($metadata);
         $hasAbstract = in_array("citation_abstract", $metadataFields);
@@ -595,14 +609,6 @@ public static function getCitationsFromPubMed($pmids, $metadata, $src = "", $rec
                     $pages = strval($article->Pagination->MedlinePgn);
                 }
                 $pmid = strval($medlineCitation->MedlineCitation->PMID);
-                $pubmed = "PubMed PMID: " . $pmid;
-                $pmcid = self::PMIDToPMC($pmid);
-                $pmcPhrase = "";
-                if ($pmcid) {
-                    if (!preg_match("/PMC/", $pmcid)) {
-                        $pmcid = "PMC" . $pmcid;
-                    }
-                }
                 $pmidsPulled[] = $pmid;
 
                 $row = [
@@ -610,7 +616,6 @@ public static function getCitationsFromPubMed($pmids, $metadata, $src = "", $rec
                     "redcap_repeat_instrument" => "citation",
                     "redcap_repeat_instance" => "$instance",
                     "citation_pmid" => $pmid,
-                    "citation_pmcid" => $pmcid,
                     "citation_include" => "",
                     "citation_source" => $src,
                     "citation_authors" => implode(", ", $authors),
@@ -638,11 +643,18 @@ public static function getCitationsFromPubMed($pmids, $metadata, $src = "", $rec
                 array_push($upload, $row);
                 $instance++;
             }
-
+            $translateFromPMIDToPMC = self::PMIDsToPMCs($pmidsPulled);
             $iCite = new iCite($pmidsPulled);
 			foreach ($pmidsPulled as $pmid) {
                 for ($i = 0; $i < count($upload); $i++) {
                     if ($upload[$i]['citation_pmid'] == $pmid) {
+                        $pmcid = $translateFromPMIDToPMC[$pmid];
+                        if ($pmcid) {
+                            if (!preg_match("/PMC/", $pmcid)) {
+                                $pmcid = "PMC" . $pmcid;
+                            }
+                            $upload[$i]['citation_pmcid'] = $pmcid;
+                        }
                         $upload[$i]["citation_doi"] = $iCite->getVariable($pmid, "doi");
                         $upload[$i]["citation_is_research"] = $iCite->getVariable($pmid, "is_research_article");
                         $upload[$i]["citation_num_citations"] = $iCite->getVariable($pmid, "citation_count");
@@ -656,7 +668,7 @@ public static function getCitationsFromPubMed($pmids, $metadata, $src = "", $rec
                         }
 
                         $altmetricRow = self::getAltmetricRow($iCite->getVariable($pmid, "doi"), $metadataFields);
-                        $row = array_merge($row, $altmetricRow);
+                        $upload[$i] = array_merge($upload[$i], $altmetricRow);
                     }
                 }
             }
@@ -707,7 +719,6 @@ private static function updateAssocGrantsAndBibliometrics(&$upload, $pmids, $met
             if ($row['citation_doi']) {
                 $altmetricRow = self::getAltmetricRow($row['citation_doi'], $metadataFields);
                 $upload[$i] = array_merge($upload[$i], $altmetricRow);
-                usleep(1150000);   // altmetric has a 1 second rate-limit
             }
             $i++;
         }
@@ -910,61 +921,82 @@ public static function getCurrentPMID($citation) {
 
 	public function getUpdatedBlankPMCs($recordId) {
 	    $upload = [];
+	    $affectedPMIDs = [];
         foreach ($this->rows as $row) {
             if (($row['record_id'] == $recordId) && ($row['redcap_repeat_instrument'] == "citation")) {
                 $instance = $row['redcap_repeat_instance'];
                 if (!$row['citation_pmcid']) {
-                    $pmid = $row['citation_pmid'];
-                    if ($pmid) {
-                        $pmcid = self::PMIDToPMC($pmid);
-                        if ($pmcid) {
-                            $uploadRow = [
-                                "record_id" => $recordId,
-                                "redcap_repeat_instrument" => "citation",
-                                "redcap_repeat_instance" => $instance,
-                                "citation_pmcid" => $pmcid,
-                                ];
-                            $upload[] = $uploadRow;
-                        }
-                    }
+                    $affectedPMIDs[$instance] = $row['citation_pmid'];
+                }
+            }
+        }
+        if (!empty($affectedPMIDs)) {
+            $translator = self::PMIDsToPMCs(array_values($affectedPMIDs));
+            foreach ($affectedPMIDs as $instance => $pmid) {
+                $pmcid = $translator[$pmid];
+                if ($pmcid) {
+                    $uploadRow = [
+                        "record_id" => $recordId,
+                        "redcap_repeat_instrument" => "citation",
+                        "redcap_repeat_instance" => $instance,
+                        "citation_pmcid" => $pmcid,
+                    ];
+                    $upload[] = $uploadRow;
                 }
             }
         }
         return $upload;
     }
 
+    public static function PMIDsToPMCs($pmids) {
+        if (is_array($pmids) && !empty($pmids)) {
+            return self::runIDConverter($pmids);
+        }
+        return [];
+    }
 	public static function PMIDToPMC($pmid) {
-		if ($pmid) {
-			$recData = self::runIDConverter($pmid);
-			if ($recData) {
-				foreach ($recData['records'] as $record) {
-					if (isset($record['pmcid'])) {
-						return $record['pmcid'];
-					}
-				}
-			}
-		}
+	    if ($pmid) {
+            $pmcs = self::PMIDsToPMCs([$pmid]);
+            if (count($pmcs) > 0) {
+                return $pmcs[0];
+            }
+        }
 		return "";
 	}
 
+	public static function PMCsToPMIDs($pmcids) {
+	    if (is_array($pmcids)) {
+            foreach ($pmcids as &$pmcid) {
+                if (!preg_match("/PMC/", $pmcid)) {
+                    $pmcid = "PMC".$pmcid;
+                }
+            }
+            if (!empty($pmcids)) {
+                return self::runIDConverter($pmcids);
+            }
+        }
+	    return [];
+    }
+
 	public static function PMCToPMID($pmcid) {
-		if ($pmcid) {
-			if (!preg_match("/PMC/", $pmcid)) {
-				$pmcid = "PMC".$pmcid;
-			}
-			$recData = self::runIDConverter($pmcid);
-			if ($recData) {
-				foreach ($recData['records'] as $record) {
-					if (isset($record['pmid'])) {
-						return $record['pmid'];
-					}
-				}
-			}
-		}
+	    $translator = self::PMCsToPMIDs([$pmcid]);
+	    if (isset($translator[$pmcid])) {
+	        return $translator[$pmcid];
+        }
 		return "";
 	}
 
 	private static function runIDConverter($id) {
+	    if (is_array($id)) {
+	        $ids = $id;
+	        $newIds = [];
+	        foreach ($ids as $i => $item) {
+	            if ($item != "") {
+	                $newIds[] = $item;
+                }
+            }
+	        $id = implode(",", $newIds);
+        }
 		if ($id) {
 			$query = "ids=".$id."&format=json";
 			$url = "https://www.ncbi.nlm.nih.gov/pmc/utils/idconv/v1.0/?".$query;
@@ -972,7 +1004,23 @@ private static function runIDConverter($id) {
 
 			Publications::throttleDown();
 
-			return json_decode($output, true);
+			$results = json_decode($output, true);
+			if ($results) {
+			    $j = 0;
+			    $translator = [];
+			    foreach ($results['records'] as $record) {
+                    if ($newIds[$j]) {
+                        $item = $newIds[$j];
+                        if (preg_match("/PMC/", $item)) {
+                            $translator[$item] = $record['pmid'];
+                        } else {
+                            $translator[$item] = $record['pmcid'];
+                        }
+                    }
+                    $j++;
+                }
+			    return $translator;
+            }
 		}
 		return "";
 	}
diff --git a/classes/REDCapManagement.php b/classes/REDCapManagement.php
index d0e49005..05d4a3c0 100644
--- a/classes/REDCapManagement.php
+++ b/classes/REDCapManagement.php
@@ -760,6 +760,21 @@ public static function isValidSurvey($pid, $hash) {
 	    return FALSE;
     }
 
+    public static function cleanupDirectory($dir, $regex) {
+	    $files = self::regexInDirectory($regex, $dir);
+	    if (!preg_match("/\/$/", $dir)) {
+	        $dir .= "/";
+        }
+	    if (!empty($files)) {
+            Application::log("Removing files (".implode(", ", $files).") from $dir");
+            foreach ($files as $file) {
+                if (file_exists($dir.$file)) {
+                    unlink($dir.$file);
+                }
+            }
+        }
+    }
+
     public static function regexInDirectory($regex, $dir) {
 	    $files = scandir($dir);
 	    $foundFiles = [];
@@ -771,26 +786,58 @@ public static function regexInDirectory($regex, $dir) {
 	    return $foundFiles;
     }
 
-    public static function deduplicateByKey($token, $server, $pid, $records, $field, $prefix, $instrument) {
-	    $fields = ["record_id", $field];
-	    foreach ($records as $recordId) {
-            $redcapData = Download::fieldsForRecords($token, $server, $fields, [$recordId]);
-            $values = [];
-            foreach ($redcapData as $row) {
-                if ($row['redcap_repeat_instrument'] == $instrument) {
-                    if (!in_array($row[$field], $values)) {
-                        $values[] = $row[$field];
-                    } else {
-                        // duplicate => delete
-                        $instance = $row['redcap_repeat_instance'];
-                        Application::log("Removing instance $instance of $recordId because duplicate");
-                        Upload::deleteForm($token, $server, $pid, $prefix, $recordId, $instance);
+    public static function deduplicateByKeys($token, $server, $pid, $records, $fields, $prefix, $instrument) {
+	    Application::log("Deduplicating $prefix/$instrument by keys: ".json_encode($fields)." for records ".json_encode($records), $pid);
+        if (!empty($fields)) {
+            $fieldsToDownload = array_unique(array_merge(["record_id"], $fields));
+            foreach ($records as $recordId) {
+                $redcapData = Download::fieldsForRecords($token, $server, $fieldsToDownload, [$recordId]);
+                $values = [];
+                $instancesToDelete = [];
+                foreach ($redcapData as $row) {
+                    if ($row['redcap_repeat_instrument'] == $instrument) {
+                        $fieldValues = [];
+                        $notBlank = FALSE;
+                        foreach ($fields as $field) {
+                            $fieldValues[] = $row[$field];
+                            if ($row[$field]) {
+                                $notBlank = TRUE;
+                            }
+                        }
+                        $encodedFieldValues = implode("|", $fieldValues);
+                        if (!in_array($encodedFieldValues, $values)) {
+                            if ($notBlank) {
+                                $values[] = $encodedFieldValues;
+                            }
+                        } else {
+                            // duplicate => delete
+                            $instancesToDelete[] = $row['redcap_repeat_instance'];
+                        }
                     }
                 }
+                Application::log("Removing instances ".implode(", ", $instancesToDelete)." from record $recordId because duplicates");
+                if (!empty($instancesToDelete)) {
+                    Upload::deleteFormInstances($token, $server, $pid, $prefix, $recordId, $instancesToDelete);
+                }
             }
         }
     }
 
+    public static function deduplicateByKey($token, $server, $pid, $records, $field, $prefix, $instrument) {
+	    self::deduplicateByKeys($token, $server, $pid, $records, [$field], $prefix, $instrument);
+    }
+
+    public static function getTimestampOfFile($file) {
+	    $nodes = preg_split("/\//", $file);
+	    if (count($nodes) > 1) {
+	        $file = $nodes[count($nodes) - 1];
+        }
+	    if (preg_match("/^\d\d\d\d\d\d\d\d\d\d\d\d\d\d_/", $file, $matches)) {
+	        return preg_replace("/_$/", "", $matches[0]);
+        }
+	    return 0;
+    }
+
     public static function copyTempFileToTimestamp($file, $timespanInSeconds) {
 	    if (strpos($file, APP_PATH_TEMP) === FALSE) {
 	        throw new \Exception("File $file must be in temporary directory");
@@ -801,10 +848,12 @@ public static function copyTempFileToTimestamp($file, $timespanInSeconds) {
 	        $filename = date("YmdHis", time() + $timespanInSeconds)."_".$basename;
             $newLocation = $dir."/".$filename;
             Application::log("Copying $file to $newLocation");
+            flush();
             $fpIn = fopen($file, "r");
             $fpOut = fopen($newLocation, "w");
             while ($line = fgets($fpIn)) {
                 fwrite($fpOut, $line);
+                fflush($fpOut);
             }
             fclose($fpOut);
             fclose($fpIn);
diff --git a/classes/Upload.php b/classes/Upload.php
index ce42f445..53f29cfb 100644
--- a/classes/Upload.php
+++ b/classes/Upload.php
@@ -54,7 +54,7 @@ public static function deleteField($token, $server, $pid, $field, $recordId, $in
                     Application::log("SQL ERROR: " . $error);
                     throw new \Exception($error);
                 } else {
-                    Application::log("SQL: " . $q->affected_rows . " rows affected");
+                    Application::log("SQL: " . db_affected_rows() . " rows affected");
                 }
             } else {
                 throw new \Exception("Could not find record!");
@@ -74,30 +74,47 @@ public static function copyRecord($token, $server, $oldRecordId, $newRecordId) {
         return self::rows($newRecordData, $token, $server);
     }
 
-    public static function deleteForm($token, $server, $pid, $prefix, $recordId, $instance = NULL) {
+    public static function deleteFormInstances($token, $server, $pid, $prefix, $recordId, $instances) {
         $records = Download::recordIds($token, $server);
+        $batchSize = 10;
         if (Download::isCurrentServer($server)) {
             if (in_array($recordId, $records)) {
                 if (!preg_match("/_$/", $prefix)) {
                     $prefix .= "_";
                 }
-                $instanceClause = "";
-                if ($instance) {
-                    if ($instance == 1) {
-                        $instanceClause = " AND instance IS NULL";
-                    } else {
-                        $instanceClause = " AND instance = '$instance'";
+                if (!empty($instances)) {
+                    for ($i = 0; $i < count($instances); $i += $batchSize) {
+                        $batchInstances = [];
+                        for ($j = $i; ($j < $i + $batchSize) && ($j < count($instances)); $j++) {
+                            $batchInstances[] = $instances[$j];
+                        }
+                        $instanceClause = "";
+                        if (!empty($batchInstances)) {
+                            $addOnInstanceClause =  "";
+                            if (in_array(1, $batchInstances)) {
+                                $addOnInstanceClause = " OR instance IS NULL";
+                                $filteredInstances = [];
+                                foreach ($batchInstances as $instance) {
+                                    if ($instance != 1) {
+                                        $filteredInstances[] = $instance;
+                                    }
+                                }
+                            } else {
+                                $filteredInstances = $batchInstances;
+                            }
+                            $instanceClause = " AND (instance IN ('".implode("','", $filteredInstances)."')".$addOnInstanceClause.")";
+                        }
+                        $sql = "DELETE FROM redcap_data WHERE project_id = '$pid' AND record = '$recordId' AND field_name LIKE '$prefix%'".$instanceClause;
+                        Application::log("Running SQL $sql");
+                        $q = db_query($sql);
+                        if ($error = db_error()) {
+                            Application::log("SQL ERROR: " . $error);
+                            throw new \Exception($error);
+                        } else {
+                            Application::log("SQL: " . db_affected_rows() . " rows affected");
+                        }
                     }
                 }
-                $sql = "DELETE FROM redcap_data WHERE project_id = '$pid' AND record = '$recordId' AND field_name LIKE '$prefix%'".$instanceClause;
-                Application::log("Running SQL $sql");
-                $q = db_query($sql);
-                if ($error = db_error()) {
-                    Application::log("SQL ERROR: " . $error);
-                    throw new \Exception($error);
-                } else {
-                    Application::log("SQL: " . $q->affected_rows . " rows affected");
-                }
                 $completeField = REDCapManagement::prefix2CompleteField($prefix);
                 if ($completeField) {
                     $sql = "DELETE FROM redcap_data WHERE project_id = '$pid' AND record = '$recordId' AND field_name = '$completeField'".$instanceClause;
@@ -107,7 +124,33 @@ public static function deleteForm($token, $server, $pid, $prefix, $recordId, $in
                         Application::log("SQL ERROR: " . $error);
                         throw new \Exception($error);
                     } else {
-                        Application::log("SQL: " . $q->affected_rows . " rows affected");
+                        Application::log("SQL: " . db_affected_rows() . " rows affected");
+                    }
+                }
+            } else {
+                throw new \Exception("Could not find record!");
+            }
+        } else {
+            throw new \Exception("Wrong server");
+        }
+    }
+
+    public static function deleteForm($token, $server, $pid, $prefix, $recordId, $instance = NULL) {
+        $records = Download::recordIds($token, $server);
+        $batchSize = 10;
+        if (Download::isCurrentServer($server)) {
+            if (in_array($recordId, $records)) {
+                if ($instance !== NULL) {
+                    self::deleteFormInstances($token, $server, $pid, $prefix, $recordId, [$instance]);
+                } else {
+                    $sql = "DELETE FROM redcap_data WHERE project_id = '$pid' AND record = '$recordId' AND field_name LIKE '$prefix%'";
+                    Application::log("Running SQL $sql");
+                    $q = db_query($sql);
+                    if ($error = db_error()) {
+                        Application::log("SQL ERROR: " . $error);
+                        throw new \Exception($error);
+                    } else {
+                        Application::log("SQL: " . db_affected_rows() . " rows affected");
                     }
                 }
             } else {
@@ -185,7 +228,9 @@ public static function metadata($metadata, $token, $server) {
 
 
 		self::$useAPIOnly[$token] = TRUE;
-		Application::log("Upload::metadata returning $output");
+		if (isset($_GET['test'])) {
+            Application::log("Upload::metadata returning $output");
+        }
 		return $feedback;
 	}
 
@@ -287,7 +332,9 @@ public static function projectSettings($settings, $token, $server) {
         curl_close($ch);
 
 		self::$useAPIOnly[$token] = TRUE;
-		Application::log("Upload::projectSettings returning $output");
+		if (isset($_GET['test'])) {
+            Application::log("Upload::projectSettings returning $output");
+        }
 		return $feedback;
 	}
 
@@ -379,7 +426,9 @@ public static function rows($rows, $token, $server) {
 			throw new \Exception("No token or server supplied!");
 		}
         self::adaptToUTF8($rows);
-        Application::log("Upload::rows uploading ".count($rows)." rows");
+		if (isset($_GET['test'])) {
+            Application::log("Upload::rows uploading ".count($rows)." rows");
+        }
 		if (count($rows) > self::getRowLimit()) {
 			$rowsOfRows = array();
 			$i = 0;
@@ -444,11 +493,13 @@ public static function rows($rows, $token, $server) {
 				curl_close($ch);
 				$time3 = microtime(TRUE);
 			}
-			if ($method == "saveData") {
-				Application::log("Upload::rows $method for pid $pid returning $output in ".($time3 - $time2)." seconds");
-			} else {
-				Application::log("Upload::rows $method returning $output in ".($time3 - $time2)." seconds");
-			}
+			if (isset($_GET['test'])) {
+                if ($method == "saveData") {
+                    Application::log("Upload::rows $method for pid $pid returning $output in ".($time3 - $time2)." seconds");
+                } else {
+                    Application::log("Upload::rows $method returning $output in ".($time3 - $time2)." seconds");
+                }
+            }
 			$allFeedback = self::combineFeedback($allFeedback, $feedback);
 		}
 		return $allFeedback;
diff --git a/cohorts/duplicate.php b/cohorts/duplicate.php
new file mode 100644
index 00000000..b3bb2818
--- /dev/null
+++ b/cohorts/duplicate.php
@@ -0,0 +1,176 @@
+<?php
+
+use \Vanderbilt\FlightTrackerExternalModule\CareerDev;
+use \Vanderbilt\CareerDevLibrary\Download;
+use \Vanderbilt\CareerDevLibrary\Upload;
+use \Vanderbilt\CareerDevLibrary\Cohorts;
+
+require_once(dirname(__FILE__)."/../charts/baseWeb.php");
+require_once(dirname(__FILE__)."/../CareerDev.php");
+require_once(dirname(__FILE__)."/../classes/Download.php");
+require_once(dirname(__FILE__)."/../classes/Upload.php");
+require_once(dirname(__FILE__)."/../classes/Cohorts.php");
+
+$messages = array();
+if ($_POST['cohort']) {
+    $cohort = $_POST['cohort'];
+} else {
+    $cohort = $_GET['cohort'];
+}
+
+$metadata = Download::metadata($token, $server);
+$cohorts = new Cohorts($token, $server, $metadata);
+$cohortNames = $cohorts->getCohortNames();
+
+if ($_POST['supertoken']) {
+    $supertoken = $_POST['supertoken'];
+    CareerDev::saveSetting("supertoken", $supertoken);
+}
+if (!$supertoken) {
+    $supertoken = CareerDev::getSetting("supertoken");
+}
+
+# access supertoken
+if ($supertoken && in_array($cohort, $cohortNames)) {
+	# create project
+	$newProjectToken = "";
+	$newProjectEventId = "";
+	$newProjectPid = "";
+
+	$projectSetup = array(
+				"project_title" => "Flight Tracker - $cohort",
+				"purpose" => "4",
+				"is_longitudinal" => "1",
+				"surveys_enabled" => "1",
+				"record_autonumbering_enabled" => "1"
+				);
+	$data = array(
+		'token' => $supertoken,
+		'content' => 'project',
+		'format' => 'json',
+		'data' => json_encode(array($projectSetup))
+	);
+	$ch = curl_init();
+	curl_setopt($ch, CURLOPT_URL, $server);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+	curl_setopt($ch, CURLOPT_VERBOSE, 0);
+	curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+	curl_setopt($ch, CURLOPT_AUTOREFERER, true);
+	curl_setopt($ch, CURLOPT_MAXREDIRS, 10);
+	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
+	curl_setopt($ch, CURLOPT_FRESH_CONNECT, 1);
+	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data, '', '&'));
+	$newProjectToken = curl_exec($ch);
+	curl_close($ch);
+
+	if ($newProjectToken) {
+		$data = array(
+			'token' => $newProjectToken,
+			'content' => 'project',
+			'format' => 'json',
+			'returnFormat' => 'json'
+		);
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $server);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_VERBOSE, 0);
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($ch, CURLOPT_AUTOREFERER, true);
+		curl_setopt($ch, CURLOPT_MAXREDIRS, 10);
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
+		curl_setopt($ch, CURLOPT_FRESH_CONNECT, 1);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data, '', '&'));
+		$output = curl_exec($ch);
+		curl_close($ch);
+		$projectData = json_decode($output, TRUE);
+		$newProjectPid = $projectData['project_id'];
+
+		$sql = "SELECT m.event_id AS event_id FROM redcap_events_metadata AS m INNER JOIN redcap_events_arms AS a ON a.arm_id = m.arm_id WHERE a.project_id = '".db_real_escape_string($newProjectPid)."'"; 
+		$q = db_query($sql);
+		if ($row = db_fetch_assoc($q)) {
+			$newProjectEventId = $row['event_id'];
+		}
+
+		$sql = "SELECT form_name, custom_repeat_form_label FROM redcap_events_repeat WHERE event_id = '".db_real_escape_string($event_id)."'";
+		$q = db_query($sql);
+		$formsAndLabels = array();
+		while ($row = db_fetch_assoc($q)) {
+			$formsAndLabels[$row['form_name']] = $row['custom_repeat_form_label'];
+		}
+
+		$sqlEntries = array();
+		foreach ($formsAndLabels as $form => $label) {
+			array_push($sqlEntries, "($newProjectEventId, '".db_real_escape_string($form)."', '".db_real_escape_string($label)."')");
+		}
+		if (!empty($sqlEntries)) {
+			$sql = "INSERT INTO redcap_events_repeat (event_id, form_name, custom_repeat_form_label) VALUES".implode(",", $sqlEntries);
+			db_query($sql);
+			if ($error = db_error()) {
+				throw new \Exception("SQL Error: $error<br>$sql");
+			}
+		}
+
+		$projectData['custom_record_label'] = "[identifier_first_name] [identifier_last_name]";
+
+		$data = array(
+			'token' => $newProjectToken,
+			'content' => 'project_settings',
+			'format' => 'json',
+			'data' => json_encode($projectData) 
+		);
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $server);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_VERBOSE, 0);
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($ch, CURLOPT_AUTOREFERER, true);
+		curl_setopt($ch, CURLOPT_MAXREDIRS, 10);
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
+		curl_setopt($ch, CURLOPT_FRESH_CONNECT, 1);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data, '', '&'));
+		$output = curl_exec($ch);
+		curl_close($ch);
+		array_push($messages, "Project Info: $output");
+
+		array_push($messages, "Please enable hooks, individual surveys, and users on the new project!");
+		array_push($messages, "\$info['$cohort'] = array('token' => '$newProjectToken', 'server' => '$server', 'pid' => $newProjectPid, 'event_id' => $newProjectEventId, 'name' => '$cohort', 'env' => '$cohort', 'readonly' => '1');");
+
+		$feedback = Upload::metadata($metadata, $newProjectToken, $server);
+		array_push($messages, "Metadata: ".json_encode($feedback));
+
+        CareerDev::duplicateAllSettings($pid, $newProjectPid, ["turn_off" => TRUE, "tokenName" => $cohort]);
+		# one record at a time, download cohort records; upload to new project
+		$feedbackAry = \Vanderbilt\FlightTrackerExternalModule\copyEntireProject($token, $newProjectToken, $server, $metadata, $cohort);
+		foreach ($feedbackAry as $feedback) {
+			array_push($messages, $feedback);
+		}
+        echo "<h1>Project Creation Complete</h1>\n";
+        echo "<h2>In Project $newProjectPid</h2>\n";
+        foreach ($messages as $mssg) {
+            if (is_array($mssg)) {
+                echo "<p class='green centered'>".json_encode($mssg)."</p>\n";
+            } else {
+                echo "<p class='green centered'>$mssg</p>\n";
+            }
+        }
+	} else {
+		throw new \Exception("No project token!");
+	}
+} else if (!$supertoken) {
+    echo "<h1>Input a Supertoken</h1>";
+    $link = CareerDev::link("cohorts/duplicate.php");
+    echo "<form action='$link' method='POST'>";
+    echo "<p class='centered'><input type='text' name='supertoken' value='' style='width: 200px;'></p>"
+    echo "<p class='centered'><button>Go!</button></p>";
+    echo "</form>";
+} else {
+    echo "<h1>Select a Cohort</h1>";
+    $link = CareerDev::link("cohorts/duplicate.php");
+    echo "<form action='$link' method='POST'>";
+    echo "<p class='centered'>".$cohorts->makeCohortSelect("")."</p>";
+    echo "<p class='centered'><button>Go!</button></p>";
+    echo "</form>";
+}
diff --git a/cronLoad.php b/cronLoad.php
index 16f1c418..e54ceff4 100644
--- a/cronLoad.php
+++ b/cronLoad.php
@@ -26,11 +26,8 @@ function loadCrons(&$manager, $specialOnly = FALSE, $token = "", $server = "") {
 		$has = checkMetadataForFields($token, $server);
         $pid = CareerDev::getPid();
 
-        if ($pid == 126829) {
-            $manager->addCron("drivers/2m_updateExPORTER.php", "updateExPORTER", "2021-02-10");
-            $manager->addCron("drivers/2n_updateReporters.php", "updateReporter", "2021-02-10");
-        }
         $manager->addCron("drivers/2m_updateExPORTER.php", "updateExPORTER", "Monday");
+        $manager->addCron("drivers/2m_updateExPORTER.php", "updateExPORTER", "2021-02-17");
 		$manager->addCron("drivers/2n_updateReporters.php", "updateReporter", "Tuesday");
 		if ($has['coeus']) {
 			// $manager->addCron("drivers/2o_updateCoeus.php", "processCoeus", "Thursday");
@@ -65,6 +62,11 @@ function loadCrons(&$manager, $specialOnly = FALSE, $token = "", $server = "") {
 		if ($has['vfrs']) {
 			$manager->addCron("drivers/11_vfrs.php", "updateVFRS", "Thursday");
 		}
+
+		# Research in Medicine -> Projects for Divisions
+		if (CareerDev::isVanderbilt() && in_array($pid, [126297])) {
+            $manager->addCron("drivers/2q_refreshCohortProjects.php", "copyAllCohortProjects", "Saturday");
+        }
 	}
 	echo $manager->getNumberOfCrons()." crons loaded\n";
 }
diff --git a/drivers/2m_updateExPORTER.php b/drivers/2m_updateExPORTER.php
index e8f48779..e20f2169 100644
--- a/drivers/2m_updateExPORTER.php
+++ b/drivers/2m_updateExPORTER.php
@@ -68,16 +68,6 @@ function getExPORTERInstance($recordId, $redcapData, $upload, $uploadLine) {
 }
 
 function downloadURLAndUnzip($file) {
-    $baseName = preg_replace("/\.zip/", "", basename($file));
-    $regex = "/".$baseName."/";
-    if ($files = REDCapManagement::regexInDirectory($regex, APP_PATH_TEMP)) {
-        foreach ($files as $candidateFile) {
-            if (preg_match("/\.csv$/", $candidateFile)) {
-                return REDCapManagement::copyTempFileToTimestamp(APP_PATH_TEMP.$candidateFile, 4 * 3600);
-            }
-        }
-    }
-
     CareerDev::log("Downloading $file...");
 
     $url = "https://exporter.nih.gov/CSVs/final/".$file;
@@ -154,45 +144,57 @@ function updateAbstracts($token, $server, $pid) {
     $records = Download::recordIds($token, $server);
     $files = [];
     $abstractFiles = [];
-    $lifespanOfFileInHours = 4;
+    $lifespanOfFileInHours = 12;
 
     # find relevant zips
     # download relevent zips into APP_PATH_TEMP
     # unzip zip files
     for ($year = 1985; $year <= date("Y"); $year++) {
         $url = "RePORTER_PRJ_C_FY".$year.".zip";
-        $origFile = downloadURLAndUnzip($url);
-        if ($origFile) {
-            $file = REDCapManagement::copyTempFileToTimestamp($origFile, $lifespanOfFileInHours * 3600);
+        if ($file = searchForFileWithTimestamp($url)) {
             $files[$file] = $year;
-            unlink($origFile);
+        } else {
+            $origFile = downloadURLAndUnzip($url);
+            if ($origFile) {
+                $file = REDCapManagement::copyTempFileToTimestamp($origFile, $lifespanOfFileInHours * 3600);
+                $files[$file] = $year;
+            }
         }
 
         $abstractURL = "RePORTER_PRJABS_C_FY".$year.".zip";
-        $origAbstractFile = downloadURLAndUnzip($abstractURL);
-        if ($origAbstractFile) {
-            $abstractFile = REDCapManagement::copyTempFileToTimestamp($origAbstractFile, $lifespanOfFileInHours * 3600);
+        if ($abstractFile = searchForFileWithTimestamp($abstractURL)) {
             $abstractFiles[$file] = $abstractFile;
-            unlink($origAbstractFile);
+        } else {
+            $origAbstractFile = downloadURLAndUnzip($abstractURL);
+            if ($origAbstractFile) {
+                $abstractFile = REDCapManagement::copyTempFileToTimestamp($origAbstractFile, $lifespanOfFileInHours * 3600);
+                $abstractFiles[$file] = $abstractFile;
+            }
         }
    }
     for ($year = date("Y") - 1; $year <= date("Y") + 1; $year++) {
         for ($week = 1; $week <= 53; $week++) {
             $weekWithLeading0s = sprintf('%03d', $week);
             $url = "RePORTER_PRJ_C_FY".$year."_".$weekWithLeading0s.".zip";
-            $origFile = downloadURLAndUnzip($url);
-            if ($origFile) {
-                $file = REDCapManagement::copyTempFileToTimestamp($origFile, $lifespanOfFileInHours * 3600);
+            if ($file = searchForFileWithTimestamp($url)) {
                 $files[$file] = $year;
-                unlink($origFile);
+            } else {
+                $origFile = downloadURLAndUnzip($url);
+                if ($origFile) {
+                    $file = REDCapManagement::copyTempFileToTimestamp($origFile, $lifespanOfFileInHours * 3600);
+                    $files[$file] = $year;
+                }
             }
 
             $abstractURL = "RePORTER_PRJABS_C_FY".$year."_".$weekWithLeading0s.".zip";
-            $origAbstractFile = downloadURLAndUnzip($abstractURL);
-            if ($origAbstractFile) {
-                $abstractFile = REDCapManagement::copyTempFileToTimestamp($origAbstractFile, $lifespanOfFileInHours * 3600);
+            if ($abstractFile = searchForFileWithTimestamp($url)) {
                 $abstractFiles[$file] = $abstractFile;
-                unlink($origAbstractFile);
+            } else {
+                $origAbstractFile = downloadURLAndUnzip($abstractURL);
+                if ($origAbstractFile) {
+                    $abstractFile = REDCapManagement::copyTempFileToTimestamp($origAbstractFile, $lifespanOfFileInHours * 3600);
+                    $abstractFiles[$file] = $abstractFile;
+                }
             }
         }
     }
@@ -207,37 +209,53 @@ function updateExPORTER($token, $server, $pid, $records) {
 	# find relevant zips
 	# download relevent zips into APP_PATH_TEMP
 	# unzip zip files
-    $lifespanOfFileInHours = 4;
+    $lifespanOfFileInHours = 12;
     for ($year = 1985; $year <= date("Y"); $year++) {
 		$url = "RePORTER_PRJ_C_FY".$year.".zip";
-		$file = downloadURLAndUnzip($url);
-		if ($file) {
-            $file = REDCapManagement::copyTempFileToTimestamp($file, $lifespanOfFileInHours * 3600);
-			$files[$file] = $year;
-		}
+		if ($file = searchForFileWithTimestamp($url)) {
+            $files[$file] = $year;
+        } else {
+            $file = downloadURLAndUnzip($url);
+            if ($file) {
+                $file = REDCapManagement::copyTempFileToTimestamp($file, $lifespanOfFileInHours * 3600);
+                $files[$file] = $year;
+            }
+        }
 
 		$abstractURL = "RePORTER_PRJABS_C_FY".$year.".zip";
-        $abstractFile = downloadURLAndUnzip($abstractURL);
-        if ($abstractFile) {
-            $abstractFile = REDCapManagement::copyTempFileToTimestamp($abstractFile, $lifespanOfFileInHours * 3600);
+        if ($abstractFile = searchForFileWithTimestamp($abstractURL)) {
             $abstractFiles[$file] = $abstractFile;
+        } else {
+            $abstractFile = downloadURLAndUnzip($abstractURL);
+            if ($abstractFile) {
+                $abstractFile = REDCapManagement::copyTempFileToTimestamp($abstractFile, $lifespanOfFileInHours * 3600);
+                $abstractFiles[$file] = $abstractFile;
+            }
         }
 	}
 	for ($year = date("Y") - 1; $year <= date("Y") + 1; $year++) {
 		for ($week = 1; $week <= 53; $week++) {
 			$weekWithLeading0s = sprintf('%03d', $week);
 			$url = "RePORTER_PRJ_C_FY".$year."_".$weekWithLeading0s.".zip";
-			$file = downloadURLAndUnzip($url);
-			if ($file) {
-                $file = REDCapManagement::copyTempFileToTimestamp($file, $lifespanOfFileInHours * 3600);
-				$files[$file] = $year;
-			}
+            if ($file = searchForFileWithTimestamp($url)) {
+                $files[$file] = $year;
+            } else {
+                $file = downloadURLAndUnzip($url);
+                if ($file) {
+                    $file = REDCapManagement::copyTempFileToTimestamp($file, $lifespanOfFileInHours * 3600);
+                    $files[$file] = $year;
+                }
+            }
 
             $abstractURL = "RePORTER_PRJABS_C_FY".$year."_".$weekWithLeading0s.".zip";
-            $abstractFile = downloadURLAndUnzip($abstractURL);
-            if ($abstractFile) {
-                $abstractFile = REDCapManagement::copyTempFileToTimestamp($abstractFile, $lifespanOfFileInHours * 3600);
+            if ($abstractFile = searchForFileWithTimestamp($abstractURL)) {
                 $abstractFiles[$file] = $abstractFile;
+            } else {
+                $abstractFile = downloadURLAndUnzip($abstractURL);
+                if ($abstractFile) {
+                    $abstractFile = REDCapManagement::copyTempFileToTimestamp($abstractFile, $lifespanOfFileInHours * 3600);
+                    $abstractFiles[$file] = $abstractFile;
+                }
             }
 		}
 	}
@@ -289,7 +307,6 @@ function updateExPORTER($token, $server, $pid, $records) {
             fwrite($fp2, $line);
         }
         fclose($fp);
-        unlink($file);
         fclose($fp2);
 
         $fp2 = fopen($file2, "r");
@@ -401,7 +418,6 @@ function updateExPORTER($token, $server, $pid, $records) {
 		CareerDev::log("Inspected $i lines");
 		echo "Inspected $i lines\n";
 		fclose($fp2);
-		unlink($file2);
 	}
 
 	# add newUploads to uploads
@@ -444,15 +460,54 @@ function updateExPORTER($token, $server, $pid, $records) {
 	// $mssg = "NIH Exporter run\n\n".count($upload)." rows\n".$output."\n\n";
 	// \REDCap::email($adminEmail, "no-reply@vanderbilt.edu", "CareerDev NIH Exporter", $mssg);
 
-    foreach ($abstractFiles as $projectFile => $abstractFile) {
-        unlink($abstractFile);
-    }
-
     REDCapManagement::deduplicateByKey($token, $server, $pid, $records, "exporter_application_id", "exporter", "exporter");
 
 	CareerDev::saveCurrentDate("Last NIH ExPORTER Download", $pid);
 }
 
+function getSuffix($file) {
+    $nodes = preg_split("/\./", $file);
+    return $nodes[count($nodes) - 1];
+}
+
+function searchForFileWithTimestamp($filename) {
+    $suffix = getSuffix($filename);
+    $fileWithoutSuffix = preg_replace("/\.$suffix$/", "", $filename);
+    $fileRegex = "/$fileWithoutSuffix/";
+    $dir = APP_PATH_TEMP;
+    $files = REDCapManagement::regexInDirectory($fileRegex, $dir);
+    $foundFiles = [];
+    foreach ($files as $file) {
+        $fileSuffix = getSuffix($file);
+        if ($suffix == $fileSuffix) {
+            $foundFiles[] = $file;
+        }
+    }
+    $oneHour = 3600;
+    $minTimestamp = date("YmdHis", time() + $oneHour);
+    if (count($foundFiles) == 1) {
+        $file = $foundFiles[0];
+        $ts = REDCapManagement::getTimestampOfFile($file);
+        if ($ts > $minTimestamp) {
+            return $dir.$foundFiles[0];
+        }
+    } else if (count($foundFiles) > 1) {
+        $maxTimestamp = 0;
+        $maxFile = "";
+        foreach ($foundFiles as $file) {
+            $ts = REDCapManagement::getTimestampOfFile($file);
+            if (($ts >= $maxTimestamp) && ($ts > $minTimestamp)) {
+                $maxTimestamp = $ts;
+                $maxFile = $file;
+            }
+        }
+        if ($maxFile) {
+            return $dir.$maxFile;
+        }
+    }
+    return FALSE;
+}
+
 function readAbstracts($file) {
     $data = [];
     if (file_exists($file)) {
diff --git a/drivers/2n_updateReporters.php b/drivers/2n_updateReporters.php
index bea922ab..e191803a 100644
--- a/drivers/2n_updateReporters.php
+++ b/drivers/2n_updateReporters.php
@@ -51,7 +51,9 @@ function isNewItem($oldReporters, $item, $recordId) {
 
 function updateReporter($token, $server, $pid, $recordIds) {
 	# clear out old data
-	CareerDev::log("Clearing out old data");
+    if (isset($_GET['test'])) {
+        CareerDev::log("Clearing out old data");
+    }
 	$oldReporters = array();
 	$redcapRows = array();
 	$uploadRows = array();
@@ -102,7 +104,7 @@ function updateReporter($token, $server, $pid, $recordIds) {
 				}
 			}
 		} 
-		if ($firstName && $lastName && !in_array($firstName." ".$lastName, $listOfNames)) {
+		if ($firstName && $lastName && !in_array(strtoupper($firstName." ".$lastName), $listOfNames)) {
 			$listOfNames[] = strtoupper($firstName." ".$lastName);
 		}
 
@@ -119,7 +121,9 @@ function updateReporter($token, $server, $pid, $recordIds) {
 			}
 		}
         $institutions = REDCapManagement::explodeInstitutions($institutions);
-		Application::log("Institutions: ".REDCapManagement::json_encode_with_spaces($institutions));
+		if (isset($_GET['test'])) {
+            Application::log("Institutions: ".REDCapManagement::json_encode_with_spaces($institutions));
+        }
 
         $included = array();
 		foreach ($listOfNames as $myName) {
@@ -136,19 +140,36 @@ function updateReporter($token, $server, $pid, $recordIds) {
 				$url = "https://api.federalreporter.nih.gov".$query."&offset=".($max + 1);
                 list($resp, $output) = REDCapManagement::downloadURL($url);
                 $myData = json_decode($output, true);
-				if ($myData && $myData['items']) {
-						foreach ($myData['items'] as $item) {
-						$currData[] = $item;
-					}
-					$max = $myData['offset'] + $myData['limit'] - 1;
-						// echo "Checking {$myData['totalCount']} (".count($myData['items'])." here) and ".($myData['offset'] - 1 + $myData['limit'])."\n";
-					usleep(400000);     // up to 3 per second
-				} else {
-					$myData = array("totalCount" => 0, "limit" => 0, "offset" => 0);
-				}
-				CareerDev::log($myName." (".$lastName.") $try: Checking {$myData['totalCount']} and {$myData['offset']} and {$myData['limit']}");
-			} while (($myData['totalCount'] > $myData['limit'] + $myData['offset']) || (($myData['offset'] == 0) && ($try < $maxTries)));
-			CareerDev::log("{$row['record_id']}: $lastName currData ".count($currData));
+                $currDataChanged = FALSE;
+                if ($myData) {
+                    if (isset($myData['items'])) {
+                        foreach ($myData['items'] as $item) {
+                            $currData[] = $item;
+                            $currDataChanged = TRUE;
+                        }
+                        // echo "Checking {$myData['totalCount']} (".count($myData['items'])." here) and ".($myData['offset'] - 1 + $myData['limit'])."\n";
+                    }
+                    if (isset($myData['offset']) && isset($myData['limit'])) {
+                        $max = $myData['offset'] + $myData['limit'] - 1;
+                    } else {
+                        $myData = FALSE;
+                    }
+                    if (!$currDataChanged) {
+                        # protect from infinite loops
+                        $try++;
+                    }
+                    usleep(400000);     // up to 3 per second
+                } else {
+                    $myData = FALSE;
+                    $try++;
+                }
+                if (isset($_GET['test'])) {
+                    Application::log($myName . " (" . $lastName . ") $try: Checking {$myData['totalCount']} and {$myData['offset']} and {$myData['limit']}");
+                }
+            } while (!$myData || (count($currData) < $myData['totalCount']) && ($try <= 5));
+            if (isset($_GET['test'])) {
+                CareerDev::log("{$row['record_id']}: $lastName currData ".count($currData));
+            }
 
 			# dissect current data; must have first name to include
 			$pis = array();
@@ -182,14 +203,19 @@ function updateReporter($token, $server, $pid, $recordIds) {
 								$myFirstName = preg_replace("/^\(/", "", $myFirstName);
 								$myFirstName = preg_replace("/\)$/", "", $myFirstName);
 								if (preg_match("/".strtoupper($myFirstName)."/", $itemFirstName) && (preg_match("/$institution/i", $item['orgName']))) {
-									Application::log("Possible match $itemFirstName and $institution vs. '{$item['orgName']}'");
+									if (isset($_GET['test'])) {
+                                        Application::log("Possible match $itemFirstName and $institution vs. '{$item['orgName']}'");
+                                    }
 								    if (in_array($institution, $helperInstitutions)) {
-								        Application::log("Helper institution ($institution)?");
+								        if (isset($_GET['test'])) {
+                                            Application::log("Helper institution ($institution)?");
+                                        }
 									    $proceed = FALSE;
-                                        Application::log("Helper institution inspecting cities: ".json_encode(CareerDev::getCities())." vs. '".$item['orgCity']."'");
+								        if (isset($_GET['test'])) {
+                                            Application::log("Helper institution inspecting cities: ".json_encode(CareerDev::getCities())." vs. '".$item['orgCity']."'");
+                                        }
 									    foreach (CareerDev::getCities() as $city) {
                                             if (preg_match("/".$city."/i", $item['orgCity'])) {
-                                                Application::log("Matched city");
                                                 $proceed = TRUE;
                                             }
                                         }
@@ -201,7 +227,9 @@ function updateReporter($token, $server, $pid, $recordIds) {
                                         }
                                     }
 								    if ($proceed) {
-										CareerDev::log("Including $itemFirstName {$item['orgName']}");
+								        if (isset($_GET['test'])) {
+                                            CareerDev::log("Including $itemFirstName {$item['orgName']}");
+                                        }
 										$included[] = $item;
 										$found = true;
 										break;
@@ -220,7 +248,9 @@ function updateReporter($token, $server, $pid, $recordIds) {
 					}
 				}
 			}
-			CareerDev::log("{$row['record_id']}: $firstName $lastName included ".count($included));
+			if (isset($_GET['test'])) {
+                CareerDev::log("{$row['record_id']}: $firstName $lastName included ".count($included));
+            }
 			// echo "itemNames: ".json_encode($pis)."\n";
 		}
 
@@ -257,7 +287,9 @@ function updateReporter($token, $server, $pid, $recordIds) {
 				$notUpload[] = $item;
 			}
 		}
-		CareerDev::log($row['record_id']." ".count($upload)." rows to upload; skipped ".count($notUpload)." rows from original of ".getReporterCount($oldReporters, $row['record_id']));
+		if (isset($_GET['test'])) {
+            CareerDev::log($row['record_id']." ".count($upload)." rows to upload; skipped ".count($notUpload)." rows from original of ".getReporterCount($oldReporters, $row['record_id']));
+        }
 
 		foreach ($upload as $uploadRow) {
 			if (!isset($uploadRows[$uploadRow['record_id']])) {
@@ -270,7 +302,9 @@ function updateReporter($token, $server, $pid, $recordIds) {
 		if (!empty($upload)) {
 			$feedback = Upload::rows($upload, $token, $server);
 			$output = json_encode($feedback);
-			CareerDev::log("Upload $firstName $lastName ({$row['record_id']}): ".$output);
+			if (isset($_GET['test'])) {
+                CareerDev::log("Upload $firstName $lastName ({$row['record_id']}): ".$output);
+            }
 		}
 	}
 
diff --git a/drivers/2q_refreshCohortProjects.php b/drivers/2q_refreshCohortProjects.php
new file mode 100644
index 00000000..aa988b46
--- /dev/null
+++ b/drivers/2q_refreshCohortProjects.php
@@ -0,0 +1,36 @@
+<?php
+
+use \Vanderbilt\FlightTrackerExternalModule\CareerDev;
+use \Vanderbilt\CareerDevLibrary\Upload;
+use \Vanderbilt\CareerDevLibrary\Application;
+use \Vanderbilt\CareerDevLibrary\Download;
+use \Vanderbilt\CareerDevLibrary\Cohorts;
+use \Vanderbilt\CareerDevLibrary\REDCapManagement;
+
+require_once(dirname(__FILE__)."/../CareerDev.php");
+require_once(dirname(__FILE__)."/../Application.php");
+require_once(dirname(__FILE__)."/../small_base.php");
+require_once(dirname(__FILE__)."/../classes/Upload.php");
+require_once(dirname(__FILE__)."/../classes/Download.php");
+require_once(dirname(__FILE__)."/../classes/Cohorts.php");
+require_once(dirname(__FILE__)."/../classes/Grants.php");
+require_once(dirname(__FILE__)."/../classes/REDCapManagement.php");
+
+function copyAllCohortProjects($token, $server, $pid, $records) {
+	$metadata = Download::metadata($token, $server);
+	$cohorts = new Cohorts($token, $server, $metadata);
+	$cohortNames = $cohorts->getCohortNames();
+
+	$module = CareerDev::getModule();
+    $pids = $module->framework->getProjectsWithModuleEnabled();
+	foreach ($cohortNames as $cohort) {
+	    foreach ($pids as $destPid) {
+	        $tokenName = CareerDev::getSetting("tokenName", $destPid);
+	        if ($tokenName == $cohort) {
+                $destToken = CareerDev::getSetting("token", $destPid);
+                CareerDev::log("Copying project to cohort $cohort. From pid $pid, to pid $destPid");
+                \Vanderbilt\FlightTrackerExternalModule\copyEntireProject($token, $destToken, $server, $metadata, $cohort);
+            }
+        }
+	}
+}
diff --git a/mentor/index.php b/mentor/index.php
index 9ceefb2d..2dfcdf6c 100644
--- a/mentor/index.php
+++ b/mentor/index.php
@@ -34,6 +34,7 @@
 }
 
 $metadata = Download::metadata($token, $server);
+$allMetadataForms = REDCapManagement::getFormsFromMetadata($metadata);
 $metadata = filterMetadata($metadata, FALSE);
 $metadataFields = REDCapManagement::getFieldsFromMetadata($metadata);
 
@@ -202,6 +203,13 @@
               ?>
               </tbody>
           </table>
+
+            <?php
+            if (in_array("mentoring_agreement_evaluations", $allMetadataForms)) {
+                $link = \REDCap::getSurveyLink($menteeRecordIds[0], "mentoring_agreement_evaluations");
+                echo "<h3><a href='$link'>When done, please provide feedback on the Mentoring Agreement</a></h3>";
+            }
+            ?>
       </div>
     </div>
   </div>
diff --git a/mentor/index_complete.php b/mentor/index_complete.php
index dfd0032c..2efdbd31 100644
--- a/mentor/index_complete.php
+++ b/mentor/index_complete.php
@@ -42,6 +42,7 @@
 list($firstName, $lastName) = getNameFromREDCap($username, $token, $server);
 $userids = Download::userids($token, $server);
 $metadata = Download::metadata($token, $server);
+$allMetadataForms = REDCapManagement::getFormsFromMetadata($metadata);
 $metadata = filterMetadata($metadata);
 $metadataFields = REDCapManagement::getFieldsFromMetadata($metadata);
 $notesFields = getNotesFields($metadataFields);
@@ -144,6 +145,12 @@
 
           ?>
       </div>
+        <?php
+        if (in_array("mentoring_agreement_evaluations", $allMetadataForms)) {
+            $link = \REDCap::getSurveyLink($menteeRecordId, "mentoring_agreement_evaluations");
+            echo "<h3><a href='$link'>When done, please provide feedback on the Mentoring Agreement</a></h3>";
+        }
+        ?>
     </div>
   </div>
 </section>
diff --git a/mentor/index_menteeview.php b/mentor/index_menteeview.php
index 76fdb756..f3fcbe9a 100644
--- a/mentor/index_menteeview.php
+++ b/mentor/index_menteeview.php
@@ -45,6 +45,7 @@
 }
 
 $metadata = Download::metadata($token, $server);
+$allMetadataForms = REDCapManagement::getFormsFromMetadata($metadata);
 $metadata = filterMetadata($metadata);
 $metadataFields = REDCapManagement::getFieldsFromMetadata($metadata);
 $choices = REDCapManagement::getChoices($metadata);
@@ -287,6 +288,14 @@ function() {
 
 
 ?>
+              </tbody>
+          </table>
+              <?php
+              if (in_array("mentoring_agreement_evaluations", $allMetadataForms)) {
+                  $link = \REDCap::getSurveyLink($menteeRecordId, "mentoring_agreement_evaluations");
+                  echo "<h3><a href='$link'>When done, please provide feedback on the Mentoring Agreement</a></h3>";
+              }
+              ?>
 
 
           </div>
diff --git a/mentor/index_mentorview.php b/mentor/index_mentorview.php
index a8b4e125..e13e1eba 100644
--- a/mentor/index_mentorview.php
+++ b/mentor/index_mentorview.php
@@ -48,6 +48,7 @@
 $menteeName = $names[$menteeRecordId];
 
 $metadata = Download::metadata($token, $server);
+$allMetadataForms = REDCapManagement::getFormsFromMetadata($metadata);
 $metadata = filterMetadata($metadata);
 $metadataFields = REDCapManagement::getFieldsFromMetadata($metadata);
 $choices = REDCapManagement::getChoices($metadata);
@@ -211,6 +212,11 @@
                     $htmlRows[] = "</tbody></table>";
                     echo implode("\n", $htmlRows)."\n";
 
+                    if (in_array("mentoring_agreement_evaluations", $allMetadataForms)) {
+                        $link = \REDCap::getSurveyLink($menteeRecordId, "mentoring_agreement_evaluations");
+                        echo "<h3><a href='$link'>When done, please provide feedback on the Mentoring Agreement</a></h3>";
+                    }
+
                     ?>
 
                 <style type="text/css">
diff --git a/profile.php b/profile.php
index ddf8516e..141f4415 100644
--- a/profile.php
+++ b/profile.php
@@ -97,6 +97,7 @@
 $numPublications = $pubs->getNumber("Original Included");
 $numFirstAuthors = $pubs->getNumberFirstAuthors();
 $numLastAuthors = $pubs->getNumberLastAuthors();
+$numMentorArticles = $pubs->getNumberWithPeople($mentors);
 $numCitations = $pubs->getNumberOfCitationsByOthers("Original Included");
 $dollarsSummaryTotal = $grants->getTotalDollars("prior");
 $dollarsSummaryDirect = $grants->getDirectDollars("prior");
@@ -217,13 +218,18 @@ function refreshProfile(page) {
 	echo "<td class='label profileHeader'>Total Dollars<br>All Grants<br>(Internal and External;<br>recorded in COEUS):</td>\n";
 	echo "<td class='value profileHeader'>".REDCapManagement::prettyMoney($dollarsCompiledTotal)."</td>\n";
 }
+
+$numMentorArticlesHTML = "";
+if (!empty($mentors)) {
+    $numMentorArticlesHTML = "<br>[Collaborating on ".REDCapManagement::pretty($numMentorArticles)." articles]";
+}
 ?>
 		<td class='label profileHeader'>Total Dollars<br>from Grants<br>(External Sources Only):</td>
 		<td class='value profileHeader'><?= REDCapManagement::prettyMoney($dollarsSummaryTotal) ?></td>
 	</tr>
 	<tr>
 		<td class='label profileHeader'>Mentors:</td>
-		<td class='value profileHeader'><?= printList($mentors) ?></td>
+		<td class='value profileHeader'><?= printList($mentors).$numMentorArticlesHTML ?></td>
 		<td class='label profileHeader'>Resources Used:</td>
 		<td class='value profileHeader'><?= printList($resources) ?></td>
 	</tr>
diff --git a/small_base.php b/small_base.php
index 257523c0..3f3806a4 100644
--- a/small_base.php
+++ b/small_base.php
@@ -1267,47 +1267,24 @@ function resetRepeatingInstruments($srcToken, $srcServer, $destToken, $destServe
 }
 
 function deleteRecords($token, $server, $records) {
-	if (!empty($records)) {
-		$data = array(
-			'token' => $token,
-			'action' => 'delete',
-			'content' => 'record',
-			'records' => $records
-		);
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $server);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-		curl_setopt($ch, CURLOPT_VERBOSE, 0);
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($ch, CURLOPT_AUTOREFERER, true);
-		curl_setopt($ch, CURLOPT_MAXREDIRS, 10);
-		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
-		curl_setopt($ch, CURLOPT_FRESH_CONNECT, 1);
-		curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data, '', '&'));
-		$output = curl_exec($ch);
-		curl_close($ch);
-
-		return json_decode($output, TRUE);
-	}
-	return array();
+    return Upload::deleteRecords($token, $server, $records);
 }
 
 function copyEntireProject($srcToken, $destToken, $server, $metadata, $cohort) {
 	$allFeedback = array();
 	$destRecords = Download::recordIds($destToken, $server);
 	if (!empty($destRecords)) {
-		$feedback = deleteRecords($destToken, $server, $destRecords);
+		$feedback = \Vanderbilt\FlightTrackerExternalModule\deleteRecords($destToken, $server, $destRecords);
 		$output = json_encode($feedback);
 		CareerDev::log("Delete project: ".count($destRecords)." records: $output");
 		array_push($allFeedback, $feedback);
 	}
 
-	resetRepeatingInstruments($srcToken, $server, $destToken, $server);
+	\Vanderbilt\FlightTrackerExternalModule\resetRepeatingInstruments($srcToken, $server, $destToken, $server);
 
-	$feedback = Upload::metadata(cleanOutJSONs($metadata), $destToken, $server);
-	$calcFields = getFieldsOfType($metadata, "calc");
-	$timeFields = getFieldsOfType($metadata, "text", "datetime_ymd");
+	$feedback = Upload::metadata(\Vanderbilt\FlightTrackerExternalModule\cleanOutJSONs($metadata), $destToken, $server);
+	$calcFields = \Vanderbilt\FlightTrackerExternalModule\getFieldsOfType($metadata, "calc");
+	$timeFields = \Vanderbilt\FlightTrackerExternalModule\getFieldsOfType($metadata, "text", "datetime_ymd");
 
 	$records = Download::cohortRecordIds($srcToken, $server, $metadata, $cohort);
 	foreach ($records as $record) {