diff --git a/.meteor/packages b/.meteor/packages
index bb1cefc2..d3c78957 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -42,10 +42,10 @@ npdev:react-loadable
 littledata:synced-cron
 
 # CLINICAL INFRASTRUCTURE
-# clinical:extended-api
-# clinical:fonts
-# clinical:hl7-resource-datatypes
-# clinical:hl7-fhir-data-infrastructure
+clinical:extended-api
+clinical:fonts
+clinical:hl7-resource-datatypes
+clinical:hl7-fhir-data-infrastructure
 # clinical:json-routes
 # clinical:vault-server
 # clinical:uscore
diff --git a/.meteor/versions b/.meteor/versions
index 340651f3..5429fc88 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -13,14 +13,10 @@ caching-compiler@1.2.2
 caching-html-compiler@1.2.1
 callback-hook@1.4.0
 check@1.3.1
-clinical:csv@0.1.0
 clinical:extended-api@2.5.2
 clinical:fonts@1.2.0
 clinical:hl7-fhir-data-infrastructure@6.34.7
 clinical:hl7-resource-datatypes@4.0.8
-clinical:json-routes@2.3.0
-clinical:uscore@0.4.13
-clinical:vault-server@8.12.2
 ddp@1.4.0
 ddp-client@2.5.0
 ddp-common@1.4.0
@@ -34,43 +30,25 @@ ecmascript-runtime-client@0.12.1
 ecmascript-runtime-server@0.11.0
 ejson@1.1.1
 es5-shim@4.8.0
-evaisse:csv@0.1.4
 fetch@0.1.1
-fourseven:scss@4.15.0
 geojson-utils@1.0.10
-harrison:babyparse@1.0.1
-harrison:papa-parse@1.0.19
 hot-code-push@1.0.4
 html-tools@1.1.2
 htmljs@1.1.1
 http@1.4.4
 id-map@1.1.1
 inter-process-messaging@0.1.1
-jparker:crypto-aes@0.1.0
-jparker:crypto-base64@0.1.0
-jparker:crypto-cipher-core@0.1.1
-jparker:crypto-core@0.1.0
-jparker:crypto-evpkdf@0.1.1
-jparker:crypto-md5@0.1.1
-jparker:crypto-mode@0.1.1
-jparker:crypto-padding@0.1.0
-jquery@1.0.2
 launch-screen@1.3.0
 littledata:synced-cron@1.5.1
 livedata@1.0.18
 localstorage@1.2.0
 logging@1.3.1
-matb33:collection-hooks@1.1.0
+matb33:collection-hooks@1.1.4
 meteor@1.10.4
 meteor-base@1.5.1
-meteorhacks:async@1.0.0
 minifier-css@1.6.0
 minifier-js@2.7.3
 minimongo@1.7.0
-mitre:fhir-side@0.3.2
-mitre:international-patient-summary@0.4.0
-mitre:space-health-registry@0.5.0
-mitre:sphr-record-analyzer@0.3.2
 mobile-experience@1.1.0
 mobile-status-bar@1.1.0
 modern-browsers@0.1.7
@@ -104,10 +82,6 @@ spacebars-compiler@1.3.0
 standard-minifier-css@1.7.4
 standard-minifier-js@2.7.3
 static-html@1.3.2
-symptomatic:data-importer@0.15.47
-symptomatic:data-relay@0.11.17
-symptomatic:structured-data-capture@0.6.4
-symptomatic:timelines@0.6.1
 templating-tools@1.2.1
 tmeasday:check-npm-versions@1.0.2
 tracker@1.2.0
diff --git a/app/core/CapabilityStatementCheck.jsx b/app/core/CapabilityStatementCheck.jsx
index e04d12c1..37d3b9e6 100644
--- a/app/core/CapabilityStatementCheck.jsx
+++ b/app/core/CapabilityStatementCheck.jsx
@@ -26,7 +26,8 @@ import { Session } from 'meteor/session';
 import { HTTP } from 'meteor/http';
 import JSON5 from 'json5';
 
-import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+// import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+import { FhirUtilities } from '../FhirUtilities';
 
 
 //=============================================================================================================================================
diff --git a/app/core/ErrorDialog.jsx b/app/core/ErrorDialog.jsx
index 14666cb3..fa5d105b 100644
--- a/app/core/ErrorDialog.jsx
+++ b/app/core/ErrorDialog.jsx
@@ -26,7 +26,8 @@ import { Session } from 'meteor/session';
 import { HTTP } from 'meteor/http';
 import JSON5 from 'json5';
 
-import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+// import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+import { FhirUtilities } from '../FhirUtilities';
 
 
 export function ErrorDialog(props){
diff --git a/app/core/ForgotPasswordDialog.jsx b/app/core/ForgotPasswordDialog.jsx
index cd5ac823..e6e3b8fe 100644
--- a/app/core/ForgotPasswordDialog.jsx
+++ b/app/core/ForgotPasswordDialog.jsx
@@ -25,7 +25,8 @@ import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
 import JSON5 from 'json5';
 
-import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+// import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+import { FhirUtilities } from '../FhirUtilities';
 
 import ResetPassword from '../accounts/ResetPassword';
 import ForgotPassword from '../accounts/ForgotPassword';
diff --git a/app/core/LoginDialog.jsx b/app/core/LoginDialog.jsx
index 49496782..5f37d9f2 100644
--- a/app/core/LoginDialog.jsx
+++ b/app/core/LoginDialog.jsx
@@ -25,7 +25,8 @@ import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
 import JSON5 from 'json5';
 
-import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+// import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+import { FhirUtilities } from '../FhirUtilities';
 
 import Login from '../accounts/Login';
 
diff --git a/app/core/LogoutDialog.jsx b/app/core/LogoutDialog.jsx
index c0b665eb..60ad906c 100644
--- a/app/core/LogoutDialog.jsx
+++ b/app/core/LogoutDialog.jsx
@@ -25,7 +25,8 @@ import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
 import JSON5 from 'json5';
 
-import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+// import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+import { FhirUtilities } from '../FhirUtilities';
 
 import Logout from '../accounts/Logout';
 
diff --git a/app/core/ResetPasswordDialog.jsx b/app/core/ResetPasswordDialog.jsx
index ce95cf94..f323ef1f 100644
--- a/app/core/ResetPasswordDialog.jsx
+++ b/app/core/ResetPasswordDialog.jsx
@@ -25,7 +25,8 @@ import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
 import JSON5 from 'json5';
 
-import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+// import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+import { FhirUtilities } from '../FhirUtilities';
 
 import ResetPassword from '../accounts/ResetPassword';
 
diff --git a/app/core/SignUpDialog.jsx b/app/core/SignUpDialog.jsx
index 02980657..1cff9470 100644
--- a/app/core/SignUpDialog.jsx
+++ b/app/core/SignUpDialog.jsx
@@ -26,7 +26,8 @@ import { Session } from 'meteor/session';
 import { HTTP } from 'meteor/http';
 import JSON5 from 'json5';
 
-import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+// import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+import { FhirUtilities } from '../FhirUtilities';
 
 import SignUp from '../accounts/SignUp';
 
diff --git a/app/layout/Header.jsx b/app/layout/Header.jsx
index 52b99391..debfe8d3 100644
--- a/app/layout/Header.jsx
+++ b/app/layout/Header.jsx
@@ -19,7 +19,8 @@ import moment from 'moment';
 import { useTracker } from 'meteor/react-meteor-data';
 import PatientChartWorkflowTabs from '../patient/PatientChartWorkflowTabs';
 
-import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+// import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+import { FhirUtilities } from '../FhirUtilities';
 
 import theme from '../Theme';
 import { logger } from '../Logger';
@@ -314,6 +315,7 @@ function Header(props) {
         if(Session.get("selectedPatient")){
           selectedPatient = Session.get("selectedPatient");
   
+          // titleText = FhirUtilities.pluckName(selectedPatient); 
           titleText = FhirUtilities.pluckName(selectedPatient); 
           logger.verbose("Selected patients name that we're displaying in the Title: " + titleText)
         } else {
diff --git a/app/layout/SettingsPage.jsx b/app/layout/SettingsPage.jsx
index a088e25d..13940561 100644
--- a/app/layout/SettingsPage.jsx
+++ b/app/layout/SettingsPage.jsx
@@ -40,7 +40,7 @@ import { oauth2 as SMART } from "fhirclient";
 // import Client from 'fhir-kit-client';
 // import simpleOauthModule from 'simple-oauth2';
 
-import { Patients } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+// import { Patients } from 'meteor/clinical:hl7-fhir-data-infrastructure';
 // import GravityMethods from '../../lib/GravityMethods';
 
 
@@ -270,21 +270,25 @@ function SettingsPage(props){
   function indexPatientNames(){
     if(confirm('This process will generate patient name.text fields for indexing.  Are you sure you want to continue?')){      
 
-      Patients.find().forEach(function(patientRecord){
-        console.log('name.text', FhirUtilities.assembleName(get(patientRecord, 'name[0]')))
-        if(!get(patientRecord, 'name[0].text')){
-          Patients.update({_id: patientRecord._id}, {$set: {
-            "name.0.text": FhirUtilities.assembleName(get(patientRecord, 'name[0]'))
-          }}, function(error, result){
-            if(error){
-              console.error('Patients.update error', error)
-            }
-            if(result){
-              console.log('Patients.update result', result)
-            }
-          });
-        }
-      })
+      if(typeof Patients === "object"){
+        Patients.find().forEach(function(patientRecord){
+          console.log('name.text', FhirUtilities.assembleName(get(patientRecord, 'name[0]')))
+          if(!get(patientRecord, 'name[0].text')){
+            Patients.update({_id: patientRecord._id}, {$set: {
+              "name.0.text": FhirUtilities.assembleName(get(patientRecord, 'name[0]'))
+            }}, function(error, result){
+              if(error){
+                console.error('Patients.update error', error)
+              }
+              if(result){
+                console.log('Patients.update result', result)
+              }
+            });
+          }
+        })
+      } else {
+        console.log('Patients collection not found.  Skipping indexing.  Please make sure the Patients collection is available.')
+      }
 
       
     }
diff --git a/app/patient/Dashboard.jsx b/app/patient/Dashboard.jsx
index 3c3b6d92..4a47a1e0 100644
--- a/app/patient/Dashboard.jsx
+++ b/app/patient/Dashboard.jsx
@@ -19,7 +19,8 @@ import Grid from '@material-ui/core/Grid';
 
 import { Session } from 'meteor/session';
 
-import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+// import { FhirUtilities } from 'meteor/clinical:hl7-fhir-data-infrastructure';
+import { FhirUtilities } from '../FhirUtilities';
 
 import { 
     DynamicSpacer,