diff --git a/www/__mocks__/cordovaMocks.ts b/www/__mocks__/cordovaMocks.ts
index deb5e0a35..c45a01734 100644
--- a/www/__mocks__/cordovaMocks.ts
+++ b/www/__mocks__/cordovaMocks.ts
@@ -30,6 +30,9 @@ export const mockFile = () => {
                               "applicationStorageDirectory" : "../path/to/app/storage/directory"};
 }
 
+//for consent document
+const _storage = {};
+
 export const mockBEMUserCache = () => {
   const _cache = {};
   const messages = [];
@@ -98,15 +101,28 @@ export const mockBEMUserCache = () => {
       // this was mocked specifically for enketoHelper's use, could be expanded if needed
       const fakeSurveyConfig = fakeConfig;
 
-      if(key == "config/app_ui_config"){
+      if (key == "config/app_ui_config") {
         return new Promise<any>((rs, rj) =>
-        setTimeout(() => {
-          rs(fakeSurveyConfig);
-        }, 100)
-      );
+          setTimeout(() => {
+            rs(fakeSurveyConfig);
+          }, 100)
+        );
       }
       else {
-        return null;
+        return new Promise<any[]>((rs, rj) =>
+          setTimeout(() => {
+            rs(_storage[key]);
+          }, 100)
+        );
+      }
+    },
+    isEmptyDoc: (doc) => {
+      if (doc == undefined) { return true }
+      let string = doc.toString();
+      if (string.length == 0) {
+        return true;
+      } else {
+        return false;
       }
     }
   }
@@ -114,3 +130,15 @@ export const mockBEMUserCache = () => {
   window['cordova'].plugins ||= {};
   window['cordova'].plugins.BEMUserCache = mockBEMUserCache;
 }
+
+export const mockBEMDataCollection = () => {
+  const mockBEMDataCollection = {
+    markConsented: (consentDoc) => {
+      setTimeout(() => {
+        _storage['config/consent'] = consentDoc;
+      }, 100)
+    }
+  }
+  window['cordova'] ||= {};
+  window['cordova'].plugins.BEMDataCollection = mockBEMDataCollection;
+}
diff --git a/www/__tests__/startprefs.test.ts b/www/__tests__/startprefs.test.ts
new file mode 100644
index 000000000..1e62e7b5e
--- /dev/null
+++ b/www/__tests__/startprefs.test.ts
@@ -0,0 +1,24 @@
+import { markConsented, isConsented, readConsentState, getConsentDocument } from '../js/splash/startprefs';
+
+import { mockBEMUserCache, mockBEMDataCollection } from "../__mocks__/cordovaMocks";
+import { mockLogger } from "../__mocks__/globalMocks";
+
+mockBEMUserCache();
+mockBEMDataCollection();
+mockLogger();
+
+global.fetch = (url: string) => new Promise((rs, rj) => {
+  setTimeout(() => rs({
+    json: () => new Promise((rs, rj) => {
+      let myJSON = { "emSensorDataCollectionProtocol": { "protocol_id": "2014-04-6267", "approval_date": "2016-07-14" } };
+      setTimeout(() => rs(myJSON), 100);
+    })
+  }));
+}) as any;
+
+it('checks state of consent before and after marking consent', async () => {
+  expect(await readConsentState().then(isConsented)).toBeFalsy();
+  let marked = await markConsented();
+  expect(await readConsentState().then(isConsented)).toBeTruthy();
+  expect(await getConsentDocument()).toEqual({"approval_date": "2016-07-14", "protocol_id": "2014-04-6267"});
+});
\ No newline at end of file
diff --git a/www/i18n/en.json b/www/i18n/en.json
index 9217339f7..4d9aea168 100644
--- a/www/i18n/en.json
+++ b/www/i18n/en.json
@@ -64,9 +64,10 @@
         "confirm": "Confirm",
         "user-data-erased": "User data erased.",
         "consent-not-found": "Consent for data collection not found, consent now?",
+        "no-consent-logout": "Consent for data collection not found, please save your opcode, log out, and log back in with the same opcode. Note that you won't get any personalized stats until you do!",
         "no-consent-message": "OK! Note that you won't get any personalized stats until you do!",
         "consent-found": "Consent found!",
-        "consented-to": "Consented to protocol {{protocol_id}}, {{approval_date}}",
+        "consented-to": "Consented to protocol last updated on {{approval_date}}",
         "consented-ok": "OK",
         "qrcode": "My OPcode",
         "qrcode-share-title": "You can save your OPcode to login easily in the future!"
@@ -154,9 +155,10 @@
         "scootershare": "Scooter share",
         "drove_alone": "Gas Car Drove Alone",
         "shared_ride": "Gas Car Shared Ride",
+        "hybrid_drove_alone": "Hybrid Drove Alone",
+        "hybrid_shared_ride": "Hybrid Shared Ride",
         "e_car_drove_alone": "E-Car Drove Alone",
         "e_car_shared_ride": "E-Car Shared Ride",
-        "moped": "Moped",
         "taxi": "Taxi / Uber / Lyft",
         "bus": "Bus",
         "train": "Train",
diff --git a/www/index.js b/www/index.js
index b93fcd3b1..a4d448202 100644
--- a/www/index.js
+++ b/www/index.js
@@ -5,7 +5,6 @@ import 'leaflet/dist/leaflet.css';
 
 import './js/ngApp.js';
 import './js/splash/referral.js';
-import './js/splash/startprefs.js';
 import './js/splash/pushnotify.js';
 import './js/splash/storedevicesettings.js';
 import './js/splash/localnotify.js';
diff --git a/www/js/App.tsx b/www/js/App.tsx
index 3c6c8bec9..b1806a5cc 100644
--- a/www/js/App.tsx
+++ b/www/js/App.tsx
@@ -31,8 +31,6 @@ const App = () => {
   const { colors } = useTheme();
   const { t } = useTranslation();
 
-  const StartPrefs = getAngularService('StartPrefs');
-
   const routes = useMemo(() => {
     const showMetrics = appConfig?.survey_info?.['trip-labels'] == 'MULTILABEL';
     return showMetrics ? defaultRoutes(t) : defaultRoutes(t).filter(r => r.key != 'metrics');
diff --git a/www/js/control/ProfileSettings.jsx b/www/js/control/ProfileSettings.jsx
index 7678cae6b..e2e6d04fd 100644
--- a/www/js/control/ProfileSettings.jsx
+++ b/www/js/control/ProfileSettings.jsx
@@ -25,6 +25,8 @@ import { AppContext } from "../App";
 import { shareQR } from "../components/QrCode";
 import { storageClear } from "../plugin/storage";
 import { getAppVersion } from "../plugin/clientStats";
+import { getConsentDocument } from "../splash/startprefs";
+import { logDebug } from "../plugin/logger";
 
 //any pure functions can go outside
 const ProfileSettings = () => {
@@ -39,7 +41,6 @@ const ProfileSettings = () => {
     const EmailHelper = getAngularService('EmailHelper');
     const NotificationScheduler = getAngularService('NotificationScheduler');
     const ControlHelper = getAngularService('ControlHelper');
-    const StartPrefs = getAngularService('StartPrefs');
 
     //functions that come directly from an Angular service
     const editCollectionConfig = () => setEditCollectionVis(true);
@@ -314,8 +315,9 @@ const ProfileSettings = () => {
 
     //in ProfileSettings in DevZone (above two functions are helpers)
     async function checkConsent() {
-        StartPrefs.getConsentDocument().then(function(resultDoc){
+        getConsentDocument().then(function(resultDoc){
             setConsentDoc(resultDoc);
+            logDebug("In profile settings, consent doc found", resultDoc);
             if (resultDoc == null) {
                 setNoConsentVis(true);
             } else {
@@ -482,17 +484,13 @@ const ProfileSettings = () => {
                         onDismiss={()=>setNoConsentVis(false)} 
                         style={settingStyles.dialog(colors.elevation.level3)}>
                     <Dialog.Title>{t('general-settings.consent-not-found')}</Dialog.Title>
+                    <Dialog.Content>
+                        <Text variant="">{t('general-settings.no-consent-logout')}</Text>
+                    </Dialog.Content>
                     <Dialog.Actions>
                         <Button onPress={()=>{
-                            setNoConsentVis(false);
-                            setNoConsentMessageVis(true)}}>
-                                {t('general-settings.cancel')}
-                        </Button>
-                        <Button onPress={()=>{
-                            setNoConsentVis(false);
-                            // $state.go("root.reconsent"); //don't know how to do this yet
-                            }}>
-                                {t('general-settings.confirm')}
+                            setNoConsentVis(false); }}>
+                                {t('general-settings.consented-ok')}
                         </Button>
                     </Dialog.Actions>
                 </Dialog>
@@ -503,7 +501,7 @@ const ProfileSettings = () => {
                 <Dialog visible={consentVis} 
                         onDismiss={()=>setConsentVis(false)} 
                         style={settingStyles.dialog(colors.elevation.level3)}>
-                    <Dialog.Title>{t('general-settings.consented-to', {protocol_id: consentDoc.protocol_id, approval_date: consentDoc.approval_date})}</Dialog.Title>
+                    <Dialog.Title>{t('general-settings.consented-to', {approval_date: consentDoc.approval_date})}</Dialog.Title>
                     <Dialog.Actions>
                         <Button onPress={()=>{
                             setConsentDoc({});
diff --git a/www/js/controllers.js b/www/js/controllers.js
index 75124efce..5a4de0cb4 100644
--- a/www/js/controllers.js
+++ b/www/js/controllers.js
@@ -2,9 +2,9 @@
 
 import angular from 'angular';
 import { addStatError, addStatReading, statKeys } from './plugin/clientStats';
+import { getPendingOnboardingState } from './onboarding/onboardingHelper';
 
-angular.module('emission.controllers', ['emission.splash.startprefs',
-                                        'emission.splash.pushnotify',
+angular.module('emission.controllers', ['emission.splash.pushnotify',
                                         'emission.splash.storedevicesettings',
                                         'emission.splash.localnotify',
                                         'emission.splash.remotenotify'])
@@ -14,7 +14,7 @@ angular.module('emission.controllers', ['emission.splash.startprefs',
 .controller('DashCtrl', function($scope) {})
 
 .controller('SplashCtrl', function($scope, $state, $interval, $rootScope, 
-    StartPrefs, PushNotify, StoreDeviceSettings,
+    PushNotify, StoreDeviceSettings,
     LocalNotify, RemoteNotify)  {
   console.log('SplashCtrl invoked');
   // alert("attach debugger!");
@@ -49,7 +49,7 @@ angular.module('emission.controllers', ['emission.splash.startprefs',
                           'root.main.metrics']
       if (isInList(toState.name, personalTabs)) {
         // toState is in the personalTabs list
-        StartPrefs.getPendingOnboardingState().then(function(result) {
+        getPendingOnboardingState().then(function(result) {
           if (result != null) {
             event.preventDefault();
             $state.go(result);
diff --git a/www/js/onboarding/ProtocolPage.tsx b/www/js/onboarding/ProtocolPage.tsx
index 73961245a..a047a0aae 100644
--- a/www/js/onboarding/ProtocolPage.tsx
+++ b/www/js/onboarding/ProtocolPage.tsx
@@ -4,9 +4,9 @@ import { View, ScrollView } from 'react-native';
 import { Button, Surface } from 'react-native-paper';
 import { resetDataAndRefresh } from '../config/dynamicConfig';
 import { AppContext } from '../App';
-import { getAngularService } from '../angular-react-helper';
 import PrivacyPolicy from './PrivacyPolicy';
 import { onboardingStyles } from './OnboardingStack';
+import { markConsented } from '../splash/startprefs';
 import { setProtocolDone } from './onboardingHelper';
 
 const ProtocolPage = () => {
diff --git a/www/js/onboarding/SaveQrPage.tsx b/www/js/onboarding/SaveQrPage.tsx
index d5d25ac23..3bfc93bb4 100644
--- a/www/js/onboarding/SaveQrPage.tsx
+++ b/www/js/onboarding/SaveQrPage.tsx
@@ -12,6 +12,7 @@ import { preloadDemoSurveyResponse } from "./SurveyPage";
 import { storageSet } from "../plugin/storage";
 import { registerUser } from "../commHelper";
 import { resetDataAndRefresh } from "../config/dynamicConfig";
+import { markConsented } from "../splash/startprefs";
 import i18next from "i18next";
 
 const SaveQrPage = ({  }) => {
@@ -22,16 +23,16 @@ const SaveQrPage = ({  }) => {
 
   useEffect(() => {
     if (overallStatus == true && !registerUserDone) {
-      const StartPrefs = getAngularService('StartPrefs');
-      StartPrefs.markConsented().then((response) => {
-        logDebug('permissions done, going to log in');
-        login(onboardingState.opcode).then((response) => {
-          logDebug('login done, refreshing onboarding state');
-          setRegisterUserDone(true);
-          preloadDemoSurveyResponse();
-          refreshOnboardingState();
-        });
-      });
+      logDebug('permissions done, going to log in');
+      markConsented()
+        .then(login(onboardingState.opcode)
+          .then((response) => {
+            logDebug('login done, refreshing onboarding state');
+            setRegisterUserDone(true);
+            preloadDemoSurveyResponse();
+            refreshOnboardingState();
+          })
+        );
     } else {
       logDebug('permissions not done, waiting');
     }
diff --git a/www/js/onboarding/onboardingHelper.ts b/www/js/onboarding/onboardingHelper.ts
index abd8e78aa..4110c2394 100644
--- a/www/js/onboarding/onboardingHelper.ts
+++ b/www/js/onboarding/onboardingHelper.ts
@@ -1,8 +1,9 @@
 import { DateTime } from "luxon";
-import { getAngularService } from "../angular-react-helper";
 import { getConfig, resetDataAndRefresh } from "../config/dynamicConfig";
 import { storageGet, storageSet } from "../plugin/storage";
 import { logDebug } from "../plugin/logger";
+import { readConsentState, isConsented } from "../splash/startprefs";
+import { getAngularService } from "../angular-react-helper";
 
 export const INTRO_DONE_KEY = 'intro_done';
 
@@ -61,15 +62,22 @@ export function getPendingOnboardingState(): Promise<OnboardingState> {
 };
 
 async function readConsented() {
-  const StartPrefs = getAngularService('StartPrefs');
-  return StartPrefs.readConsentState().then(StartPrefs.isConsented) as Promise<boolean>;
+  return readConsentState().then(isConsented) as Promise<boolean>;
 }
 
-async function readIntroDone() {
+export async function readIntroDone() {
   return storageGet(INTRO_DONE_KEY).then((read_val) => !!read_val) as Promise<boolean>;
 }
 
 export async function markIntroDone() {
   const currDateTime = DateTime.now().toISO();
-  return storageSet(INTRO_DONE_KEY, currDateTime);
+  return storageSet(INTRO_DONE_KEY, currDateTime)
+    .then(() => {
+      //handle "on intro" events
+      logDebug("intro done, calling registerPush and storeDeviceSettings");
+      const PushNotify = getAngularService("PushNotify");
+      const StoreSeviceSettings = getAngularService("StoreDeviceSettings");
+      PushNotify.registerPush();
+      StoreSeviceSettings.storeDeviceSettings();
+    });
 }
diff --git a/www/js/plugin/storage.ts b/www/js/plugin/storage.ts
index 59e535b6e..643e985e1 100644
--- a/www/js/plugin/storage.ts
+++ b/www/js/plugin/storage.ts
@@ -25,7 +25,12 @@ const unmungeValue = (key, retData) => {
 }
 
 const localStorageSet = (key: string, value: {[k: string]: any}) => {
-  localStorage.setItem(key, JSON.stringify(value));
+  //checking for a value to prevent storing undefined
+  //case where local was null and native was undefined stored "undefined"
+  //see discussion: https://github.com/e-mission/e-mission-phone/pull/1072#discussion_r1373753945
+  if (value) {
+    localStorage.setItem(key, JSON.stringify(value));
+  }
 }
 
 const localStorageGet = (key: string) => {
diff --git a/www/js/splash/localnotify.js b/www/js/splash/localnotify.js
index 6a4241f2c..c96ba827d 100644
--- a/www/js/splash/localnotify.js
+++ b/www/js/splash/localnotify.js
@@ -8,7 +8,6 @@
 import angular from 'angular';
 
 angular.module('emission.splash.localnotify', ['emission.plugin.logger',
-                                              'emission.splash.startprefs',
                                               'ionic-toast'])
 .factory('LocalNotify', function($window, $ionicPlatform, $ionicPopup,
     $state, $rootScope, ionicToast, Logger) {
diff --git a/www/js/splash/pushnotify.js b/www/js/splash/pushnotify.js
index 40d859f09..775ddc4bd 100644
--- a/www/js/splash/pushnotify.js
+++ b/www/js/splash/pushnotify.js
@@ -1,3 +1,7 @@
+//naming of this file can be a little confusing - "pushnotifysettings" for rewritten file
+//https://github.com/e-mission/e-mission-phone/pull/1072#discussion_r1375360832
+
+
 /*
  * This module deals with the interaction with the push plugin, the redirection
  * of silent push notifications and the re-parsing of iOS pushes. It then
@@ -15,12 +19,12 @@
 
 import angular from 'angular';
 import { updateUser } from '../commHelper';
+import { readConsentState, isConsented } from './startprefs';
 
 angular.module('emission.splash.pushnotify', ['emission.plugin.logger',
-                                              'emission.services',
-                                              'emission.splash.startprefs'])
+                                              'emission.services'])
 .factory('PushNotify', function($window, $state, $rootScope, $ionicPlatform,
-    $ionicPopup, Logger, StartPrefs) {
+    $ionicPopup, Logger) {
 
     var pushnotify = {};
     var push = null;
@@ -159,8 +163,8 @@ angular.module('emission.splash.pushnotify', ['emission.plugin.logger',
 
     $ionicPlatform.ready().then(function() {
       pushnotify.datacollect = $window.cordova.plugins.BEMDataCollection;
-      StartPrefs.readConsentState()
-        .then(StartPrefs.isConsented)
+      readConsentState()
+        .then(isConsented)
         .then(function(consentState) {
           if (consentState == true) {
               pushnotify.registerPush();
@@ -172,19 +176,5 @@ angular.module('emission.splash.pushnotify', ['emission.plugin.logger',
       Logger.log("pushnotify startup done");
     });
 
-    $rootScope.$on(StartPrefs.CONSENTED_EVENT, function(event, data) {
-      console.log("got consented event "+JSON.stringify(event.name)
-                      +" with data "+ JSON.stringify(data));
-      if (StartPrefs.isIntroDone()) {
-          console.log("intro is done -> reconsent situation, we already have a token -> register");
-          pushnotify.registerPush();
-      }
-    });
-
-    $rootScope.$on(StartPrefs.INTRO_DONE_EVENT, function(event, data) {
-          console.log("intro is done -> original consent situation, we should have a token by now -> register");
-       pushnotify.registerPush();
-    });
-
     return pushnotify;
 });
diff --git a/www/js/splash/remotenotify.js b/www/js/splash/remotenotify.js
index 3e43b6f9f..f67cb9d87 100644
--- a/www/js/splash/remotenotify.js
+++ b/www/js/splash/remotenotify.js
@@ -1,3 +1,6 @@
+//naming of this module can be confusing "remotenotifyhandler" for rewritten file
+//https://github.com/e-mission/e-mission-phone/pull/1072#discussion_r1375360832
+
 /*
  * This module deals with handling specific push messages that open web pages
  * or popups. It does not interface with the push plugin directly. Instead, it
@@ -15,8 +18,7 @@
 import angular from 'angular';
 import { addStatEvent, statKeys } from '../plugin/clientStats';
 
-angular.module('emission.splash.remotenotify', ['emission.plugin.logger',
-                    'emission.splash.startprefs'])
+angular.module('emission.splash.remotenotify', ['emission.plugin.logger'])
 
 .factory('RemoteNotify', function($http, $window, $ionicPopup, $rootScope, Logger) {
 
diff --git a/www/js/splash/startprefs.js b/www/js/splash/startprefs.js
deleted file mode 100644
index 92a07e624..000000000
--- a/www/js/splash/startprefs.js
+++ /dev/null
@@ -1,171 +0,0 @@
-import angular from 'angular';
-import { getConfig } from '../config/dynamicConfig';
-import { storageGet, storageSet } from '../plugin/storage';
-
-angular.module('emission.splash.startprefs', ['emission.plugin.logger',
-                                              'emission.splash.referral'])
-
-.factory('StartPrefs', function($window, $state, $interval, $rootScope, $ionicPlatform,
-      $ionicPopup, $http, Logger, ReferralHandler) {
-    var logger = Logger;
-    var startprefs = {};
-     // Boolean: represents that the "intro" - the one page summary
-     // and the login are done
-    var INTRO_DONE_KEY = 'intro_done';
-    // data collection consented protocol: string, represents the date on
-    // which the consented protocol was approved by the IRB
-    var DATA_COLLECTION_CONSENTED_PROTOCOL = 'data_collection_consented_protocol';
-
-    var CONSENTED_KEY = "config/consent";
-
-    startprefs.CONSENTED_EVENT = "data_collection_consented";
-    startprefs.INTRO_DONE_EVENT = "intro_done";
-
-    var writeConsentToNative = function() {
-      return $window.cordova.plugins.BEMDataCollection.markConsented($rootScope.req_consent);
-    };
-
-    startprefs.markConsented = function() {
-      logger.log("changing consent from "+
-        $rootScope.curr_consented+" -> "+JSON.stringify($rootScope.req_consent));
-      // mark in native storage
-      return startprefs.readConsentState().then(writeConsentToNative).then(function(response) {
-          // mark in local storage
-          storageSet(DATA_COLLECTION_CONSENTED_PROTOCOL,
-            $rootScope.req_consent);
-          // mark in local variable as well
-          $rootScope.curr_consented = angular.copy($rootScope.req_consent);
-          $rootScope.$emit(startprefs.CONSENTED_EVENT, $rootScope.req_consent);
-      });
-    };
-
-    startprefs.markIntroDone = function() {
-      var currTime = moment().format();
-      storageSet(INTRO_DONE_KEY, currTime);
-      $rootScope.$emit(startprefs.INTRO_DONE_EVENT, currTime);
-    }
-
-    // returns boolean
-    startprefs.readIntroDone = function() {
-      return storageGet(INTRO_DONE_KEY).then(function(read_val) {
-          logger.log("in readIntroDone, read_val = "+JSON.stringify(read_val));
-          $rootScope.intro_done = read_val;
-      });
-    }
-
-    startprefs.isIntroDone = function() {
-      if ($rootScope.intro_done == null || $rootScope.intro_done == "") {
-        logger.log("in isIntroDone, returning false");
-        $rootScope.is_intro_done = false;
-        return false;
-      } else {
-        logger.log("in isIntroDone, returning true");
-        $rootScope.is_intro_done = true;
-        return true;
-      }
-    }
-
-    startprefs.isConsented = function() {
-      if ($rootScope.curr_consented == null || $rootScope.curr_consented == "" ||
-            $rootScope.curr_consented.approval_date != $rootScope.req_consent.approval_date) {
-        console.log("Not consented in local storage, need to show consent");
-        $rootScope.is_consented = false;
-        return false;
-      } else {
-        console.log("Consented in local storage, no need to show consent");
-        $rootScope.is_consented = true;
-        return true;
-      }
-    }
-
-    startprefs.readConsentState = function() {
-      // read consent state from the file and populate it
-      return $http.get("json/startupConfig.json")
-          .then(function(startupConfigResult) {
-              $rootScope.req_consent = startupConfigResult.data.emSensorDataCollectionProtocol;
-              logger.log("required consent version = " + JSON.stringify($rootScope.req_consent));
-              return storageGet(DATA_COLLECTION_CONSENTED_PROTOCOL);
-          }).then(function(kv_store_consent) {
-              $rootScope.curr_consented = kv_store_consent;
-              console.assert(angular.isDefined($rootScope.req_consent), "in readConsentState $rootScope.req_consent", JSON.stringify($rootScope.req_consent));
-              // we can just launch this, we don't need to wait for it
-              startprefs.checkNativeConsent();
-          });
-    }
-
-    startprefs.readConfig = function() {
-        return getConfig().then((savedConfig) => $rootScope.app_ui_label = savedConfig);
-    }
-
-    startprefs.hasConfig = function() {
-      if ($rootScope.app_ui_label == undefined ||
-          $rootScope.app_ui_label == null ||
-          $rootScope.app_ui_label == "") {
-        logger.log("Config not downloaded, need to show join screen");
-        $rootScope.has_config = false;
-        return false;
-      } else {
-        $rootScope.has_config = true;
-        logger.log("Config downloaded, skipping join screen");
-        return true;
-      }
-    }
-
-    /*
-     * Read the intro_done and consent_done variables into the $rootScope so that
-     * we can use them without making multiple native calls
-     */
-    startprefs.readStartupState = function() {
-        console.log("STARTPREFS: about to read startup state");
-        var readIntroPromise = startprefs.readIntroDone()
-                                    .then(startprefs.isIntroDone);
-        var readConsentPromise = startprefs.readConsentState()
-                                    .then(startprefs.isConsented);
-        var readConfigPromise = startprefs.readConfig()
-                                    .then(startprefs.hasConfig);
-        return Promise.all([readIntroPromise, readConsentPromise, readConfigPromise]);
-    };
-
-    startprefs.getConsentDocument = function() {
-      return $window.cordova.plugins.BEMUserCache.getDocument("config/consent", false)
-            .then(function(resultDoc) {
-                if ($window.cordova.plugins.BEMUserCache.isEmptyDoc(resultDoc)) {
-                    return null;
-                } else {
-                    return resultDoc;
-                }
-            });
-    };
-
-    startprefs.checkNativeConsent = function() {
-        startprefs.getConsentDocument().then(function(resultDoc) {
-            if (resultDoc == null) {
-                if(startprefs.isConsented()) {
-                    logger.log("Local consent found, native consent missing, writing consent to native");
-                    $ionicPopup.alert({template: "Local consent found, native consent missing, writing consent to native"});
-                    return writeConsentToNative();
-                } else {
-                    logger.log("Both local and native consent not found, nothing to sync");
-                }
-            }
-        });
-    }
-
-    var changeState = function(destState) {
-        logger.log('changing state to '+destState);
-        console.log("loading "+destState);
-        // TODO: Fix this the right way when we fix the FSM
-        // https://github.com/e-mission/e-mission-phone/issues/146#issuecomment-251061736
-        var reload = false;
-        if (($state.$current == destState.state) && ($state.$current.name == 'root.main.goals')) {
-          reload = true;
-        }
-        $state.go(destState.state, destState.params).then(function() {
-            if (reload) {
-              $rootScope.$broadcast("RELOAD_GOAL_PAGE_FOR_REFERRAL")
-            }
-        });
-    };
-
-    return startprefs;
-});
diff --git a/www/js/splash/startprefs.ts b/www/js/splash/startprefs.ts
new file mode 100644
index 000000000..43f29c692
--- /dev/null
+++ b/www/js/splash/startprefs.ts
@@ -0,0 +1,125 @@
+import { getAngularService } from "../angular-react-helper";
+import { storageGet, storageSet } from '../plugin/storage';
+import { logInfo, logDebug, displayErrorMsg } from '../plugin/logger';
+import { readIntroDone } from "../onboarding/onboardingHelper";
+
+// data collection consented protocol: string, represents the date on
+// which the consented protocol was approved by the IRB
+const DATA_COLLECTION_CONSENTED_PROTOCOL = 'data_collection_consented_protocol';
+
+let _req_consent;
+let _curr_consented;
+
+/**
+ * @function writes the consent document to native storage
+ * @returns Promise to execute the write to storage
+*/
+function writeConsentToNative() {
+  //note that this calls to the notification API, 
+  //so should not be called until we have notification permissions
+  //see https://github.com/e-mission/e-mission-docs/issues/1006
+  return window['cordova'].plugins.BEMDataCollection.markConsented(_req_consent);
+};
+
+/**
+ * @function marks consent in native storage, local storage, and local var
+ * @returns Promise for marking the consent in native and local storage
+ */
+export function markConsented() {
+  logInfo("changing consent from " +
+    _curr_consented + " -> " + JSON.stringify(_req_consent));
+  // mark in native storage
+  return readConsentState()
+    .then(writeConsentToNative)
+    .then(function (response) {
+      // mark in local storage
+      storageSet(DATA_COLLECTION_CONSENTED_PROTOCOL,
+        _req_consent);
+      // mark in local variable as well
+      _curr_consented = { ..._req_consent };
+    })
+    //check for reconsent
+    .then(readIntroDone)
+    .then((isIntroDone) => {
+      if (isIntroDone) {
+        logDebug("reconsent scenario - marked consent after intro done - registering pushnoify and storing device settings")
+        const PushNotify = getAngularService("PushNotify");
+        const StoreSeviceSettings = getAngularService("StoreDeviceSettings");
+        PushNotify.registerPush();
+        StoreSeviceSettings.storeDeviceSettings();
+      }
+    })
+    .catch((error) => {
+      displayErrorMsg(error, "Error while while wrting consent to storage");
+    });
+};
+
+/**
+ * @function checking for consent locally
+ * @returns {boolean} if the consent is marked in the local var
+ */
+export function isConsented() {
+  logDebug("curr consented is" + JSON.stringify(_curr_consented));
+  if (_curr_consented == null || _curr_consented == "" ||
+    _curr_consented.approval_date != _req_consent.approval_date) {
+    logDebug("Not consented in local storage, need to show consent");
+    return false;
+  } else {
+    logDebug("Consented in local storage, no need to show consent");
+    return true;
+  }
+}
+
+/**
+ * @function reads the consent state from the file and populates it
+ * @returns nothing, just reads into local variables
+ */
+export function readConsentState() {
+  return fetch("json/startupConfig.json")
+    .then(response => response.json())
+    .then(function (startupConfigResult) {
+      console.log(startupConfigResult);
+      _req_consent = startupConfigResult.emSensorDataCollectionProtocol;
+      logDebug("required consent version = " + JSON.stringify(_req_consent));
+      return storageGet(DATA_COLLECTION_CONSENTED_PROTOCOL);
+    }).then(function (kv_store_consent) {
+      _curr_consented = kv_store_consent;
+      console.assert(((_req_consent != undefined) && (_req_consent != null)), "in readConsentState $rootScope.req_consent", JSON.stringify(_req_consent));
+      // we can just launch this, we don't need to wait for it
+      checkNativeConsent();
+    });
+}
+
+/**
+ * @function gets the consent document from storage
+ * @returns Promise for the consent document or null if the doc is empty
+ */
+//used in ProfileSettings
+export function getConsentDocument() {
+  return window['cordova'].plugins.BEMUserCache.getDocument("config/consent", false)
+    .then(function (resultDoc) {
+      if (window['cordova'].plugins.BEMUserCache.isEmptyDoc(resultDoc)) {
+        return null;
+      } else {
+        return resultDoc;
+      }
+    });
+};
+
+/**
+ * @function checks the consent doc in native storage
+ * @returns if doc not stored in native, a promise to write it there
+ */
+function checkNativeConsent() {
+  getConsentDocument().then(function (resultDoc) {
+    if (resultDoc == null) {
+      if (isConsented()) {
+        logDebug("Local consent found, native consent missing, writing consent to native");
+        displayErrorMsg("Local consent found, native consent missing, writing consent to native");
+        return writeConsentToNative();
+      } else {
+        logDebug("Both local and native consent not found, nothing to sync");
+      }
+    }
+  });
+}
diff --git a/www/js/splash/storedevicesettings.js b/www/js/splash/storedevicesettings.js
index d307feaa7..31543bc6c 100644
--- a/www/js/splash/storedevicesettings.js
+++ b/www/js/splash/storedevicesettings.js
@@ -1,11 +1,11 @@
 import angular from 'angular';
 import { updateUser } from '../commHelper';
+import { isConsented, readConsentState } from "./startprefs";
 
 angular.module('emission.splash.storedevicesettings', ['emission.plugin.logger',
-                                             'emission.services',
-                                             'emission.splash.startprefs'])
+                                             'emission.services'])
 .factory('StoreDeviceSettings', function($window, $state, $rootScope, $ionicPlatform,
-    $ionicPopup, Logger, StartPrefs) {
+    $ionicPopup, Logger ) {
 
     var storedevicesettings = {};
 
@@ -32,8 +32,8 @@ angular.module('emission.splash.storedevicesettings', ['emission.plugin.logger',
 
     $ionicPlatform.ready().then(function() {
       storedevicesettings.datacollect = $window.cordova.plugins.BEMDataCollection;
-      StartPrefs.readConsentState()
-        .then(StartPrefs.isConsented)
+      readConsentState()
+        .then(isConsented)
         .then(function(consentState) {
           if (consentState == true) {
               storedevicesettings.storeDeviceSettings();
@@ -44,19 +44,5 @@ angular.module('emission.splash.storedevicesettings', ['emission.plugin.logger',
       Logger.log("storedevicesettings startup done");
     });
 
-    $rootScope.$on(StartPrefs.CONSENTED_EVENT, function(event, data) {
-      console.log("got consented event "+JSON.stringify(event.name)
-                      +" with data "+ JSON.stringify(data));
-      if (StartPrefs.isIntroDone()) {
-          console.log("intro is done -> reconsent situation, we already have a token -> register");
-          storedevicesettings.storeDeviceSettings();
-      }
-    });
-
-    $rootScope.$on(StartPrefs.INTRO_DONE_EVENT, function(event, data) {
-          console.log("intro is done -> original consent situation, we should have a token by now -> register");
-       storedevicesettings.storeDeviceSettings();
-    });
-
     return storedevicesettings;
 });
diff --git a/www/json/label-options.json.sample b/www/json/label-options.json.sample
index 9870b744f..7947e2149 100644
--- a/www/json/label-options.json.sample
+++ b/www/json/label-options.json.sample
@@ -7,9 +7,10 @@
     {"value":"scootershare", "baseMode":"E_SCOOTER", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.00894},
     {"value":"drove_alone", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.22031},
     {"value":"shared_ride", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.11015},
+    {"value":"hybrid_drove_alone", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.127},
+    {"value":"hybrid_shared_ride", "baseMode":"CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.0635},
     {"value":"e_car_drove_alone", "baseMode":"E_CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.08216},
     {"value":"e_car_shared_ride", "baseMode":"E_CAR", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.04108},
-    {"value":"moped", "baseMode":"MOPED", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.05555},
     {"value":"taxi", "baseMode":"TAXI", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.30741},
     {"value":"bus", "baseMode":"BUS", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.20727},
     {"value":"train", "baseMode":"TRAIN", "met_equivalent":"IN_VEHICLE", "kgCo2PerKm": 0.12256},
@@ -51,4 +52,4 @@
     {"value":"free_shuttle"},
     {"value":"other"}
   ]
-}
\ No newline at end of file
+}
diff --git a/www/json/startupConfig.json b/www/json/startupConfig.json
index bf7665f10..a532c39b1 100644
--- a/www/json/startupConfig.json
+++ b/www/json/startupConfig.json
@@ -1,6 +1,5 @@
 {
     "emSensorDataCollectionProtocol": {
-        "protocol_id": "2014-04-6267",
         "approval_date": "2016-07-14"
     }
 }
diff --git a/www/json/startupConfig.json.sample b/www/json/startupConfig.json.sample
index eb386a386..f4d2f434c 100644
--- a/www/json/startupConfig.json.sample
+++ b/www/json/startupConfig.json.sample
@@ -1,6 +1,5 @@
 {
     "emSensorDataCollectionProtocol": {
-        "protocol_id": "YYYY-MM-PROTOCOL-NUMBER",
         "approval_date": "YYYY-MM-DD"
     }
 }