diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.h b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.h
index 73cb6324f..6ca31e069 100644
--- a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.h
+++ b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.h
@@ -31,8 +31,7 @@
 #import <UIKit/UIKit.h>
 #import <OneSignalFramework/OneSignalFramework.h>
 
-// TODO: Add subscription observer
-@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSInAppMessageLifecycleHandler>
+@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSInAppMessageLifecycleHandler, OSPushSubscriptionObserver>
 
 @property (strong, nonatomic) UIWindow *window;
 
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m
index 5289bbe8b..d1457a8f8 100644
--- a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m
+++ b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m
@@ -50,14 +50,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 //    [FIRApp configure];
     
     NSLog(@"Bundle URL: %@", [[NSBundle mainBundle] bundleURL]);
+    [OneSignal.Debug setLogLevel:ONE_S_LL_VERBOSE];
+    [OneSignal.Debug setVisualLevel:ONE_S_LL_NONE];
     
     [OneSignal initialize:[AppDelegate getOneSignalAppId] withLaunchOptions:launchOptions];
     
-    [OneSignal.Debug setLogLevel:ONE_S_LL_VERBOSE];
-    [OneSignal.Debug setVisualLevel:ONE_S_LL_NONE];
     _notificationDelegate = [OneSignalNotificationCenterDelegate new];
     
     id openNotificationHandler = ^(OSNotificationOpenedResult *result) {
+        // TODO: opened handler Not triggered
         NSLog(@"OSNotificationOpenedResult: %@", result.action);
         #pragma clang diagnostic push
         #pragma clang diagnostic ignored "-Wdeprecated"
@@ -94,6 +95,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [OneSignal.Notifications setNotificationWillShowInForegroundHandler:notificationReceiverBlock];
     [OneSignal.Notifications setNotificationOpenedHandler:openNotificationHandler];
 
+    OSPushSubscriptionState* state = [OneSignal.User.pushSubscription addObserver:self];
+    NSLog(@"OneSignal Demo App push subscription observer added, current state: %@", state);
+    
+    [OneSignal.Notifications addPermissionObserver:self];
+    
     NSLog(@"UNUserNotificationCenter.delegate: %@", UNUserNotificationCenter.currentNotificationCenter.delegate);
     
     return YES;
@@ -120,12 +126,11 @@ - (void) onOSPermissionChanged:(OSPermissionStateChanges*)stateChanges {
     NSLog(@"onOSPermissionChanged: %@", stateChanges);
 }
 
-// TODO: Add push sub observer
-//- (void) onOSSubscriptionChanged:(OSSubscriptionStateChanges*)stateChanges {
-//    NSLog(@"onOSSubscriptionChanged: %@", stateChanges);
-//    ViewController* mainController = (ViewController*) self.window.rootViewController;
-//    mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.isSubscribed;
-//}
+- (void)onOSPushSubscriptionChangedWithStateChanges:(OSPushSubscriptionStateChanges *)stateChanges {
+    NSLog(@"onOSPushSubscriptionChangedWithStateChanges: %@", stateChanges);
+    ViewController* mainController = (ViewController*) self.window.rootViewController;
+    mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.optedIn;
+}
 
 #pragma mark OSInAppMessageDelegate
 
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/Base.lproj/Main.storyboard b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/Base.lproj/Main.storyboard
index ee8598ef5..323d8ebd3 100644
--- a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/Base.lproj/Main.storyboard
+++ b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/Base.lproj/Main.storyboard
@@ -43,7 +43,7 @@
                                                     <constraint firstAttribute="width" constant="68" id="com-ja-CVD"/>
                                                 </constraints>
                                                 <color key="tintColor" red="1" green="0.1367101157" blue="0.01701983743" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <state key="normal" title="Get Tags"/>
+                                                <state key="normal" title="INFO"/>
                                                 <connections>
                                                     <action selector="getTagsButton:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Pp8-oA-Zrh"/>
                                                 </connections>
@@ -298,7 +298,7 @@
                                                 <rect key="frame" x="118" y="581" width="136" height="30"/>
                                                 <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="15"/>
                                                 <color key="tintColor" red="1" green="0.1367101157" blue="0.01701983743" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <state key="normal" title="Set External User Id"/>
+                                                <state key="normal" title="Login to External User Id"/>
                                                 <connections>
                                                     <action selector="setExternalUserId:" destination="BYZ-38-t0r" eventType="touchUpInside" id="DXf-1K-Lkc"/>
                                                 </connections>
@@ -374,11 +374,11 @@
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
-                                            <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OiG-L7-Ot2" userLabel="Remove External User Id">
+                                            <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OiG-L7-Ot2" userLabel="Logout">
                                                 <rect key="frame" x="103" y="619" width="168" height="30"/>
                                                 <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="15"/>
                                                 <color key="tintColor" red="1" green="0.1367101157" blue="0.01701983743" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <state key="normal" title="Remove External User Id"/>
+                                                <state key="normal" title="Logout"/>
                                                 <connections>
                                                     <action selector="removeExternalUserId:" destination="BYZ-38-t0r" eventType="touchUpInside" id="F3N-HQ-tSv"/>
                                                 </connections>
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/OneSignalDevApp.entitlements b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/OneSignalDevApp.entitlements
index 28007cfd9..5388fb2fe 100644
--- a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/OneSignalDevApp.entitlements
+++ b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/OneSignalDevApp.entitlements
@@ -11,7 +11,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.onesignal.example.onesignal</string>
+		<string>group.com.onesignal.example.staging.onesignal</string>
 	</array>
 </dict>
 </plist>
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/ViewController.m b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/ViewController.m
index aa72798a9..513adb4d1 100644
--- a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/ViewController.m
+++ b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/ViewController.m
@@ -164,11 +164,14 @@ - (void)handleMessageAction:(NSString *)actionId {
 }
 
 - (IBAction)setExternalUserId:(UIButton *)sender {
-    NSLog(@"setExternalUserId is no longer supported. Please use login or addAlias.");
+    NSString* externalUserId = self.externalUserIdTextField.text;
+    NSLog(@"Dev App: Logging in to external user ID %@", externalUserId);
+    [OneSignal login:externalUserId];
 }
 
 - (IBAction)removeExternalUserId:(UIButton *)sender {
-    NSLog(@"setExternalUserId is no longer supported. Please use logout or removeAlias.");
+    NSLog(@"Dev App: Logout called.");
+    [OneSignal logout];
 }
 
 #pragma mark UITextFieldDelegate Methods
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/OneSignalDevAppClip.entitlements b/iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/OneSignalDevAppClip.entitlements
index be2597206..89d4647e8 100644
--- a/iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/OneSignalDevAppClip.entitlements
+++ b/iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/OneSignalDevAppClip.entitlements
@@ -11,7 +11,7 @@
 	</array>
 	<key>com.apple.developer.parent-application-identifiers</key>
 	<array>
-		<string>$(AppIdentifierPrefix)com.onesignal.example</string>
+		<string>$(AppIdentifierPrefix)com.onesignal.example.staging</string>
 	</array>
 </dict>
 </plist>
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/project.pbxproj b/iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/project.pbxproj
index e533904f1..80cd41a55 100644
--- a/iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/project.pbxproj
+++ b/iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/project.pbxproj
@@ -745,7 +745,7 @@
 				);
 				MARKETING_VERSION = 1.4.4;
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example;
+				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging;
 				PRODUCT_NAME = OneSignalExample;
 				SUPPORTS_MACCATALYST = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "OneSignalDevApp/OneSignalExample-Bridging-Header.h";
@@ -776,7 +776,7 @@
 				);
 				MARKETING_VERSION = 1.4.4;
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example;
+				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging;
 				PRODUCT_NAME = OneSignalExample;
 				SUPPORTS_MACCATALYST = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "OneSignalDevApp/OneSignalExample-Bridging-Header.h";
@@ -804,7 +804,7 @@
 				);
 				MARKETING_VERSION = 1.4.4;
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA;
+				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging.OneSignalNotificationServiceExtensionA;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = YES;
@@ -832,7 +832,7 @@
 				);
 				MARKETING_VERSION = 1.4.4;
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA;
+				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging.OneSignalNotificationServiceExtensionA;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = YES;
@@ -877,7 +877,7 @@
 				MARKETING_VERSION = 1.4.4;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.Clip;
+				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging.Clip;
 				PRODUCT_NAME = OneSignalExampleClip;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -915,7 +915,7 @@
 				);
 				MARKETING_VERSION = 1.4.4;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.Clip;
+				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging.Clip;
 				PRODUCT_NAME = OneSignalExampleClip;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements b/iOS_SDK/OneSignalDevApp/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements
index c70461e82..fa1031a37 100644
--- a/iOS_SDK/OneSignalDevApp/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements
+++ b/iOS_SDK/OneSignalDevApp/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements
@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.onesignal.example.onesignal</string>
+		<string>group.com.onesignal.example.staging.onesignal</string>
 	</array>
 </dict>
 </plist>
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.h b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.h
index 30ab63835..bc3a2c3d3 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.h
+++ b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.h
@@ -33,10 +33,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface OSRequestGetTags : OneSignalRequest
-+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId;
-@end
-
 @interface OSRequestGetIosParams : OneSignalRequest
 + (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId;
 @end
@@ -45,72 +41,12 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)withAppId:(NSString *)appId withJson:(NSMutableDictionary *)json;
 @end
 
-@interface OSRequestUpdateNotificationTypes : OneSignalRequest
-+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId notificationTypes:(NSNumber *)notificationTypes;
-@end
-
-@interface OSRequestSendPurchases : OneSignalRequest
-+ (instancetype)withUserId:(NSString *)userId externalIdAuthToken:(NSString * _Nullable)externalIdAuthToken appId:(NSString *)appId withPurchases:(NSArray *)purchases;
-+ (instancetype)withUserId:(NSString *)userId emailAuthToken:(NSString *)emailAuthToken appId:(NSString *)appId withPurchases:(NSArray *)purchases;
-@end
-
 @interface OSRequestSubmitNotificationOpened : OneSignalRequest
 + (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId wasOpened:(BOOL)opened messageId:(NSString *)messageId withDeviceType:(NSNumber *)deviceType;
 @end
 
-@interface OSRequestSyncHashedEmail : OneSignalRequest
-+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId email:(NSString *)email networkType:(NSNumber *)netType;
-@end
-
 NS_ASSUME_NONNULL_END
 
-@interface OSRequestRegisterUser : OneSignalRequest
-+ (instancetype _Nonnull)withData:(NSDictionary * _Nonnull)registrationData userId:(NSString * _Nullable)userId;
-@end
-
-@interface OSRequestCreateDevice : OneSignalRequest
-+ (instancetype _Nonnull)withAppId:(NSString * _Nonnull)appId withDeviceType:(NSNumber * _Nonnull)deviceType withEmail:(NSString * _Nullable)email withPlayerId:(NSString * _Nullable)playerId withEmailAuthHash:(NSString * _Nullable)emailAuthHash withExternalUserId:(NSString * _Nullable)externalUserId withExternalIdAuthToken:(NSString * _Nullable)externalIdAuthToken;
-
-+ (instancetype _Nonnull)withAppId:(NSString * _Nonnull)appId withDeviceType:(NSNumber * _Nonnull)deviceType withSMSNumber:(NSString * _Nullable)smsNumber withPlayerId:(NSString * _Nullable)playerId withSMSAuthHash:(NSString * _Nullable)smsAuthHash withExternalUserId:(NSString * _Nullable)externalUserId withExternalIdAuthToken:(NSString * _Nullable)externalIdAuthToken;
-@end
-
-@interface OSRequestLogoutEmail : OneSignalRequest
-+ (instancetype _Nonnull)withAppId:(NSString * _Nonnull)appId emailPlayerId:(NSString * _Nonnull)emailPlayerId devicePlayerId:(NSString * _Nonnull)devicePlayerId emailAuthHash:(NSString * _Nullable)emailAuthHash;
-@end
-
-@interface OSRequestLogoutSMS : OneSignalRequest
-+ (instancetype _Nonnull)withAppId:(NSString * _Nonnull)appId smsPlayerId:(NSString * _Nonnull)smsPlayerId smsAuthHash:(NSString * _Nullable)smsAuthHash devicePlayerId:(NSString * _Nonnull)devicePlayerId;
-@end
-
-@interface OSRequestSendTagsToServer : OneSignalRequest
-+ (instancetype _Nonnull)withUserId:(NSString * _Nonnull)userId appId:(NSString * _Nonnull)appId tags:(NSDictionary * _Nonnull)tags networkType:(NSNumber * _Nonnull)netType withEmailAuthHashToken:(NSString * _Nullable)emailAuthToken withExternalIdAuthHashToken:(NSString * _Nullable)externalIdAuthToken;
-
-+ (instancetype _Nonnull)withUserId:(NSString * _Nonnull)userId appId:(NSString * _Nonnull)appId tags:(NSDictionary * _Nonnull)tags networkType:(NSNumber * _Nonnull)netType withSMSAuthHashToken:(NSString * _Nullable)smsAuthToken withExternalIdAuthHashToken:(NSString * _Nullable)externalIdAuthToken;
-@end
-
-@interface OSRequestUpdateLanguage : OneSignalRequest
-+ (instancetype _Nonnull)withUserId:(NSString * _Nonnull)userId
-                              appId:(NSString * _Nonnull)appId
-                           language:(NSString * _Nonnull)language
-                     emailAuthToken:(NSString * _Nullable)emailAuthHash
-                externalIdAuthToken:(NSString * _Nullable)externalIdAuthToken;
-
-+ (instancetype _Nonnull)withUserId:(NSString * _Nonnull)userId
-                              appId:(NSString * _Nonnull)appId
-                           language:(NSString * _Nonnull)language
-                       smsAuthToken:(NSString * _Nullable)smsAuthToken
-                externalIdAuthToken:(NSString * _Nullable)externalIdAuthToken;
-@end
-
-@interface OSRequestUpdateExternalUserId : OneSignalRequest
-+ (instancetype _Nonnull)withUserId:(NSString * _Nullable)externalId withUserIdHashToken:(NSString * _Nullable)hashToken withOneSignalUserId:(NSString * _Nonnull)userId appId:(NSString * _Nonnull)appId;
-
-+ (instancetype _Nonnull)withUserId:(NSString * _Nullable)externalId withUserIdHashToken:(NSString * _Nullable)hashToken withOneSignalUserId:(NSString * _Nonnull)userId  withEmailHashToken:(NSString * _Nullable)emailHashToken appId:(NSString * _Nonnull)appId;
-
-+ (instancetype _Nonnull)withUserId:(NSString * _Nullable)externalId withUserIdHashToken:(NSString * _Nullable)hashToken withOneSignalUserId:(NSString * _Nonnull)userId withSMSHashToken:(NSString * _Nullable)smsHashToken appId:(NSString * _Nonnull)appId;
-@end
-
-
 @interface OSRequestTrackV1 : OneSignalRequest
 + (instancetype _Nonnull)trackUsageData:(NSString * _Nonnull)osUsageData
                                      appId:(NSString * _Nonnull)appId;
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.m b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.m
index eba9a8b3a..d3e7e0e00 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.m
@@ -39,18 +39,6 @@
 #import <sys/sysctl.h>
 
 // SUBCLASSES - These subclasses each represent an individual request
-@implementation OSRequestGetTags
-+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId {
-    let request = [OSRequestGetTags new];
-    
-    request.parameters = @{@"app_id" : appId};
-    request.method = GET;
-    request.path = [NSString stringWithFormat:@"players/%@", userId];
-    request.disableLocalCaching = true;
-    
-    return request;
-}
-@end
 
 /*
      NOTE: The OSRequestGetIosParams request will not return a Cache-Control header
@@ -78,39 +66,6 @@ -(BOOL)missingAppId {
 }
 @end
 
-@implementation OSRequestSendTagsToServer
-+ (instancetype _Nonnull)withUserId:(NSString * _Nonnull)userId appId:(NSString * _Nonnull)appId tags:(NSDictionary * _Nonnull)tags networkType:(NSNumber * _Nonnull)netType withEmailAuthHashToken:(NSString * _Nullable)emailAuthToken withExternalIdAuthHashToken:(NSString * _Nullable)externalIdAuthToken {
-    return [self withUserId:userId appId:appId tags:tags networkType:netType withAuthHashToken:emailAuthToken withAuthTokenKey:@"email_auth_hash" withExternalIdAuthHashToken:externalIdAuthToken];
-}
-
-+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId tags:(NSDictionary *)tags networkType:(NSNumber *)netType withSMSAuthHashToken:(NSString *)smsAuthToken withExternalIdAuthHashToken:(NSString *)externalIdAuthToken {
-    return [self withUserId:userId appId:appId tags:tags networkType:netType withAuthHashToken:smsAuthToken withAuthTokenKey:@"sms_auth_hash" withExternalIdAuthHashToken:externalIdAuthToken];
-}
-
-+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId tags:(NSDictionary *)tags networkType:(NSNumber *)netType withAuthHashToken:(NSString *)authToken withAuthTokenKey:(NSString *)authTokenKey withExternalIdAuthHashToken:(NSString *)externalIdAuthToken {
-    let request = [OSRequestSendTagsToServer new];
-    
-    let params = [NSMutableDictionary new];
-    params[@"app_id"] = appId;
-    params[@"tags"] = tags;
-    params[@"net_type"] = netType;
-    
-    if (authToken && authToken.length > 0)
-        params[authTokenKey] = authToken;
-    
-    if (externalIdAuthToken && externalIdAuthToken.length > 0)
-        params[@"external_user_id_auth_hash"] = externalIdAuthToken;
-    
-    request.parameters = params;
-    request.method = PUT;
-    request.path = [NSString stringWithFormat:@"players/%@", userId];
-    
-    return request;
-}
-
-
-@end
-
 @implementation OSRequestPostNotification
 + (instancetype)withAppId:(NSString *)appId withJson:(NSMutableDictionary *)json {
     let request = [OSRequestPostNotification new];
@@ -126,113 +81,6 @@ + (instancetype)withAppId:(NSString *)appId withJson:(NSMutableDictionary *)json
 }
 @end
 
-@implementation OSRequestCreateDevice
-+ (instancetype _Nonnull)withAppId:(NSString * _Nonnull)appId withDeviceType:(NSNumber * _Nonnull)deviceType withEmail:(NSString * _Nullable)email withPlayerId:(NSString * _Nullable)playerId withEmailAuthHash:(NSString * _Nullable)emailAuthHash withExternalUserId: (NSString * _Nullable)externalUserId withExternalIdAuthToken:(NSString * _Nullable)externalIdAuthToken {
-    let request = [OSRequestCreateDevice new];
-    
-    let params = [[NSMutableDictionary alloc] initWithDictionary:@{
-        @"app_id" : appId,
-        @"device_type" : deviceType,
-        @"identifier" : email ?: [NSNull null],
-        @"email_auth_hash" : emailAuthHash ?: [NSNull null],
-        @"external_user_id_auth_hash" : externalIdAuthToken ?: [NSNull null],
-        @"device_player_id" : playerId ?: [NSNull null]
-     }];
-    
-    if (externalUserId) {
-        params[@"external_user_id"] = externalUserId;
-    }
-    request.parameters = params;
-    request.method = POST;
-    request.path = @"players";
-    
-    return request;
-}
-
-+ (instancetype)withAppId:(NSString *)appId withDeviceType:(NSNumber *)deviceType withSMSNumber:(NSString *)smsNumber withPlayerId:(NSString *)playerId withSMSAuthHash:(NSString *)smsAuthHash withExternalUserId: (NSString * _Nullable)externalUserId withExternalIdAuthToken:(NSString *)externalIdAuthToken {
-    let request = [OSRequestCreateDevice new];
-    
-    let params = [[NSMutableDictionary alloc] initWithDictionary:@{
-           @"app_id" : appId,
-           @"device_type" : deviceType,
-           @"identifier" : smsNumber ?: [NSNull null],
-           SMS_NUMBER_AUTH_HASH_KEY : smsAuthHash ?: [NSNull null],
-           @"external_user_id_auth_hash" : externalIdAuthToken ?: [NSNull null],
-           @"device_player_id" : playerId ?: [NSNull null]
-        }];
-    
-    if (externalUserId) {
-        params[@"external_user_id"] = externalUserId;
-    }
-    
-    request.parameters = params;
-    request.method = POST;
-    request.path = @"players";
-    
-    return request;
-}
-@end
-
-@implementation OSRequestLogoutEmail
-
-+ (instancetype _Nonnull)withAppId:(NSString * _Nonnull)appId emailPlayerId:(NSString * _Nonnull)emailPlayerId devicePlayerId:(NSString * _Nonnull)devicePlayerId emailAuthHash:(NSString * _Nullable)emailAuthHash {
-    let request = [OSRequestLogoutEmail new];
-    
-    request.parameters = @{
-       @"parent_player_id" : emailPlayerId ?: [NSNull null],
-       @"email_auth_hash" : emailAuthHash ?: [NSNull null],
-       @"app_id" : appId
-    };
-    
-    request.method = POST;
-    request.path = [NSString stringWithFormat:@"players/%@/email_logout", devicePlayerId];
-    
-    return request;
-}
-
-@end
-
-@implementation OSRequestUpdateNotificationTypes
-+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId notificationTypes:(NSNumber *)notificationTypes {
-    let request = [OSRequestUpdateNotificationTypes new];
-    
-    request.parameters = @{@"app_id" : appId, @"notification_types" : notificationTypes};
-    request.method = PUT;
-    request.path = [NSString stringWithFormat:@"players/%@", userId];
-    
-    return request;
-}
-@end
-
-@implementation OSRequestSendPurchases
-+ (instancetype)withUserId:(NSString *)userId externalIdAuthToken:(NSString * _Nullable)externalIdAuthToken appId:(NSString *)appId withPurchases:(NSArray *)purchases {
-    let request = [OSRequestSendPurchases new];
-    
-    request.parameters = @{@"app_id" : appId,
-                           @"purchases" : purchases,
-                           @"external_user_id_auth_hash" : externalIdAuthToken ?: [NSNull null]
-    };
-    request.method = POST;
-    request.path = [NSString stringWithFormat:@"players/%@/on_purchase", userId];
-    
-    return request;
-}
-
-+ (instancetype)withUserId:(NSString *)userId emailAuthToken:(NSString *)emailAuthToken appId:(NSString *)appId withPurchases:(NSArray *)purchases {
-    let request = [OSRequestSendPurchases new];
-    
-    request.parameters = @{
-        @"app_id" : appId,
-        @"purchases" : purchases,
-        @"email_auth_hash" : emailAuthToken ?: [NSNull null]
-    };
-    request.method = POST;
-    request.path = [NSString stringWithFormat:@"players/%@/on_purchase", userId];
-    
-    return request;
-}
-@end
-
 @implementation OSRequestSubmitNotificationOpened
 + (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId wasOpened:(BOOL)opened messageId:(NSString *)messageId withDeviceType:(nonnull NSNumber *)deviceType{
     let request = [OSRequestSubmitNotificationOpened new];
@@ -245,117 +93,6 @@ + (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId wasOpened:
 }
 @end
 
-@implementation OSRequestRegisterUser
-+ (instancetype _Nonnull)withData:(NSDictionary * _Nonnull)registrationData userId:(NSString * _Nullable)userId {
-    
-    let request = [OSRequestRegisterUser new];
-    
-    request.parameters = registrationData;
-    request.method = POST;
-    request.path = userId ? [NSString stringWithFormat:@"players/%@/on_session", userId] : @"players";
-    
-    return request;
-}
-@end
-
-@implementation OSRequestSyncHashedEmail
-+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId email:(NSString *)email networkType:(NSNumber *)netType {
-    let request = [OSRequestSyncHashedEmail new];
-    
-    let lowerCase = [email lowercaseString];
-    let md5Hash = [OneSignalCoreHelper hashUsingMD5:lowerCase];
-    let sha1Hash = [OneSignalCoreHelper hashUsingSha1:lowerCase];
-    
-    [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"%@ - MD5: %@, SHA1:%@", lowerCase, md5Hash, sha1Hash]];
-    
-    request.parameters = @{@"app_id" : appId, @"em_m" : md5Hash, @"em_s" : sha1Hash, @"net_type" : netType};
-    request.method = PUT;
-    request.path = [NSString stringWithFormat:@"players/%@", userId];
-    
-    return request;
-}
-@end
-
-@implementation OSRequestUpdateLanguage
-
-+ (instancetype _Nonnull)withUserId:(NSString * _Nonnull)userId
-                              appId:(NSString * _Nonnull)appId
-                           language:(NSString * _Nonnull)language
-                     emailAuthToken:(NSString * _Nullable)emailAuthHash
-                externalIdAuthToken:(NSString * _Nullable)externalIdAuthToken {
-    return [self withUserId:userId appId:appId language:language authToken:emailAuthHash authTokenKey:@"email_auth_hash" externalIdAuthToken:externalIdAuthToken];
-}
-
-+ (instancetype)withUserId:(NSString *)userId
-                     appId:(NSString *)appId
-                  language:(NSString *)language
-              smsAuthToken:(NSString *)smsAuthToken
-       externalIdAuthToken:(NSString *)externalIdAuthToken {
-    return [self withUserId:userId appId:appId language:language authToken:smsAuthToken authTokenKey:@"sms_auth_hash" externalIdAuthToken:externalIdAuthToken];
-}
-
-+ (instancetype)withUserId:(NSString *)userId
-                     appId:(NSString *)appId
-                language:(NSString *)language
-                 authToken:(NSString *)authToken
-              authTokenKey:(NSString *)authTokenKey
-       externalIdAuthToken:(NSString *)externalIdAuthToken {
-    let request = [OSRequestUpdateLanguage new];
-    
-    NSLog(@"Attempting Update to Language");
-    
-    let params = [NSMutableDictionary new];
-    params[@"app_id"] = appId;
-    params[@"language"] = language;
-    
-    if (authToken && authToken.length > 0 && authTokenKey)
-        params[authTokenKey] = authToken;
-    
-    if (externalIdAuthToken && externalIdAuthToken.length > 0)
-        params[@"external_user_id_auth_hash"] = externalIdAuthToken;
-    
-    request.parameters = params;
-    request.method = PUT;
-    request.path = [NSString stringWithFormat:@"players/%@", userId];
-    
-    return request;
-}
-
-@end
-
-@implementation OSRequestUpdateExternalUserId
-+ (instancetype _Nonnull)withUserId:(NSString * _Nullable)externalId withUserIdHashToken:(NSString * _Nullable)hashToken withOneSignalUserId:(NSString *)userId appId:(NSString *)appId {
-    return [self withUserId:externalId withUserIdHashToken:hashToken withOneSignalUserId:userId withChannelHashToken:nil withHashTokenKey:nil appId:appId];
-}
-
-+ (instancetype)withUserId:(NSString *)externalId withUserIdHashToken:(NSString *)hashToken withOneSignalUserId:(NSString *)userId withEmailHashToken:(NSString *)emailHashToken appId:(NSString *)appId {
-    return [self withUserId:externalId withUserIdHashToken:hashToken withOneSignalUserId:userId withChannelHashToken:emailHashToken withHashTokenKey:@"email_auth_hash" appId:appId];
-}
-
-+ (instancetype)withUserId:(NSString *)externalId withUserIdHashToken:(NSString *)hashToken withOneSignalUserId:(NSString *)userId withSMSHashToken:(NSString *)smsHashToken appId:(NSString *)appId {
-    return [self withUserId:externalId withUserIdHashToken:hashToken withOneSignalUserId:userId withChannelHashToken:smsHashToken withHashTokenKey:@"sms_auth_hash" appId:appId];
-}
-
-+ (instancetype)withUserId:(NSString *)externalId withUserIdHashToken:(NSString *)hashToken withOneSignalUserId:(NSString *)userId  withChannelHashToken:(NSString *)channelHashToken withHashTokenKey:(NSString *)hashTokenKey appId:(NSString *)appId {
-    NSString *msg = [NSString stringWithFormat:@"App ID: %@, external ID: %@", appId, externalId];
-    [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:msg];
-
-    let request = [OSRequestUpdateExternalUserId new];
-    NSMutableDictionary *parametres = [NSMutableDictionary new];
-    [parametres setObject:appId forKey:@"app_id"];
-    [parametres setObject:externalId ?: @"" forKey:@"external_user_id"];
-    if (hashToken && [hashToken length] > 0)
-        [parametres setObject:hashToken forKey:@"external_user_id_auth_hash"];
-    if (channelHashToken && hashTokenKey)
-        [parametres setObject:channelHashToken forKey:hashTokenKey];
-    request.parameters = parametres;
-    request.method = PUT;
-    request.path = [NSString stringWithFormat:@"players/%@", userId];
-
-    return request;
-}
-@end
-
 @implementation OSRequestTrackV1
 NSString * const OS_USAGE_DATA = @"OS-Usage-Data";
 + (instancetype)trackUsageData:(NSString *)osUsageData appId:(NSString *)appId {
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OneSignalClient.m b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OneSignalClient.m
index ae3580447..16b127cd9 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OneSignalClient.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OneSignalClient.m
@@ -101,13 +101,14 @@ - (void)executeSimultaneousRequests:(NSDictionary<NSString *, OneSignalRequest *
                 results[identifier] = result;
                 // Add a success as 1 (success) to the response
                 response[identifier] = @{ @"success" : @(true) };
-                NSLog(@"Request %@ success result %@", request, result);
+                [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"Request %@ success result %@", request, result]];
                 dispatch_group_leave(group);
             } onFailure:^(NSError *error) {
                 errors[identifier] = error;
                 // Add a success as 0 (failed) to the response
                 response[identifier] = @{ @"success" : @(false) };
-                NSLog(@"Request %@ fail result error %@", request, error);
+                [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"Request %@ fail result error %@", request, error]];
+
                 dispatch_group_leave(group);
             }];
         }
@@ -153,11 +154,11 @@ - (void)executeSimultaneousRequests:(NSDictionary<NSString *, OneSignalRequest *
             dispatch_group_enter(group);
             [self executeRequest:request onSuccess:^(NSDictionary *result) {
                 results[identifier] = result;
-                NSLog(@"Request %@ success result %@", request, result);
+                [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"Request %@ success result %@", request, result]];
                 dispatch_group_leave(group);
             } onFailure:^(NSError *error) {
                 errors[identifier] = error;
-                NSLog(@"Request %@ fail result error %@", request, error);
+                [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"Request %@ fail result error %@", request, error]];
                 dispatch_group_leave(group);
             }];
         }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h
index bcf269bf2..c97b0fc30 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h
+++ b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h
@@ -33,8 +33,8 @@
 // Networking
 #define OS_API_VERSION @"1"
 #define OS_API_ACCEPT_HEADER @"application/vnd.onesignal.v" OS_API_VERSION @"+json"
-#define OS_API_SERVER_URL @"https://api.staging.onesignal.com/"
-#define OS_IAM_WEBVIEW_BASE_URL @"https://staging.onesignal.com/"
+#define OS_API_SERVER_URL @"https://api.onesignal.com/"
+#define OS_IAM_WEBVIEW_BASE_URL @"https://onesignal.com/"
 
 // OneSignalUserDefault keys
 // String values start with "OSUD_" to maintain a level of uniqueness from other libs and app code
@@ -65,27 +65,9 @@
 #define OSUD_PERMISSION_EPHEMERAL_FROM                                      @"OSUD_PERMISSION_EPHEMERAL_FROM"                                   // * OSUD_PERMISSION_EPHEMERAL_FROM
 #define OSUD_LANGUAGE                                                       @"OSUD_LANGUAGE"                                                    // * OSUD_LANGUAGE
 #define DEFAULT_LANGUAGE                                                    @"en"                                                               // * OSUD_LANGUAGE
-// Player
-#define OSUD_EXTERNAL_USER_ID                                               @"OS_EXTERNAL_USER_ID"                                              // * OSUD_EXTERNAL_USER_ID
-#define OSUD_PLAYER_ID_TO                                                   @"GT_PLAYER_ID"                                                     // * OSUD_PLAYER_ID_TO
-#define OSUD_PLAYER_ID_FROM                                                 @"GT_PLAYER_ID_LAST"                                                // * OSUD_PLAYER_ID_FROM
-#define OSUD_PUSH_TOKEN_TO                                                  @"GT_DEVICE_TOKEN"                                                  // * OSUD_PUSH_TOKEN_TO
-#define OSUD_PUSH_TOKEN_FROM                                                @"GT_DEVICE_TOKEN_LAST"                                             // * OSUD_PUSH_TOKEN_FROM
-#define OSUD_USER_SUBSCRIPTION_TO                                           @"ONESIGNAL_SUBSCRIPTION"                                           // * OSUD_USER_SUBSCRIPTION_TO
-#define OSUD_USER_SUBSCRIPTION_FROM                                         @"ONESIGNAL_SUBSCRIPTION_SETTING"                                   // * OSUD_USER_SUBSCRIPTION_FROM
-#define OSUD_EXTERNAL_ID_AUTH_CODE                                          @"OSUD_EXTERNAL_ID_AUTH_CODE"                                       
-// Email
-#define OSUD_EMAIL_ADDRESS                                                  @"EMAIL_ADDRESS"                                                    // * OSUD_EMAIL_ADDRESS
-#define OSUD_EMAIL_PLAYER_ID                                                @"GT_EMAIL_PLAYER_ID"                                               // * OSUD_EMAIL_PLAYER_ID
-#define OSUD_EMAIL_EXTERNAL_USER_ID                                         @"OSUD_EMAIL_EXTERNAL_USER_ID"                                      // OSUD_EMAIL_EXTERNAL_USER_ID
-#define OSUD_REQUIRE_EMAIL_AUTH                                             @"GT_REQUIRE_EMAIL_AUTH"                                            // * OSUD_REQUIRE_EMAIL_AUTH
-#define OSUD_EMAIL_AUTH_CODE                                                @"GT_EMAIL_AUTH_CODE"                                               // * OSUD_EMAIL_AUTH_CODE
-// SMS
-#define OSUD_SMS_NUMBER                                                     @"OSUD_SMS_NUMBER"
-#define OSUD_SMS_PLAYER_ID                                                  @"OSUD_SMS_PLAYER_ID"
-#define OSUD_SMS_EXTERNAL_USER_ID                                           @"OSUD_SMS_EXTERNAL_USER_ID"
-#define OSUD_REQUIRE_SMS_AUTH                                               @"OSUD_REQUIRE_SMS_AUTH"
-#define OSUD_SMS_AUTH_CODE                                                  @"OSUD_SMS_AUTH_CODE"
+// Push Subscription
+#define OSUD_PUSH_SUBSCRIPTION_ID                                           @"GT_PLAYER_ID"                                                     // * OSUD_PUSH_SUBSCRIPTION_ID
+#define OSUD_PUSH_TOKEN                                                     @"GT_DEVICE_TOKEN"                                                  // * OSUD_PUSH_TOKEN
 // Notification
 #define OSUD_LAST_MESSAGE_OPENED                                            @"GT_LAST_MESSAGE_OPENED_"                                          // * OSUD_MOST_RECENT_NOTIFICATION_OPENED
 #define OSUD_NOTIFICATION_OPEN_LAUNCH_URL                                   @"ONESIGNAL_INAPP_LAUNCH_URL"                                       // * OSUD_NOTIFICATION_OPEN_LAUNCH_URL
@@ -118,8 +100,6 @@
 #define OSUD_APP_LAST_CLOSED_TIME                                           @"GT_LAST_CLOSED_TIME"                                              // * OSUD_APP_LAST_CLOSED_TIME
 #define OSUD_UNSENT_ACTIVE_TIME                                             @"GT_UNSENT_ACTIVE_TIME"                                            // * OSUD_UNSENT_ACTIVE_TIME
 #define OSUD_UNSENT_ACTIVE_TIME_ATTRIBUTED                                  @"GT_UNSENT_ACTIVE_TIME_ATTRIBUTED"                                 // * OSUD_UNSENT_ACTIVE_TIME_ATTRIBUTED
-#define OSUD_PLAYER_TAGS                                                    @"OSUD_PLAYER_TAGS"
-    // * OSUD_PLAYER_TAGS
 
 // Deprecated Selectors
 #define DEPRECATED_SELECTORS @[ @"application:didReceiveLocalNotification:", \
@@ -305,14 +285,18 @@ typedef enum {GET, POST, HEAD, PUT, DELETE, OPTIONS, CONNECT, TRACE, PATCH} HTTP
 #define OS_EXTERNAL_ID                                                      @"external_id"
 
 #define OS_RETAIN_PREVIOUS_USER                                             @"retain_previous_user"
+#define OS_ON_USER_WILL_CHANGE                                              @"OS_ON_USER_WILL_CHANGE"
 
+// Models and Model Stores
 #define OS_IDENTITY_MODEL_KEY                                               @"OS_IDENTITY_MODEL_KEY"
 #define OS_IDENTITY_MODEL_STORE_KEY                                         @"OS_IDENTITY_MODEL_STORE_KEY"
 #define OS_PROPERTIES_MODEL_KEY                                             @"OS_PROPERTIES_MODEL_KEY"
 #define OS_PROPERTIES_MODEL_STORE_KEY                                       @"OS_PROPERTIES_MODEL_STORE_KEY"
 #define OS_PUSH_SUBSCRIPTION_MODEL_KEY                                      @"OS_PUSH_SUBSCRIPTION_MODEL_KEY"
+#define OS_PUSH_SUBSCRIPTION_MODEL_STORE_KEY                                @"OS_PUSH_SUBSCRIPTION_MODEL_STORE_KEY"
 #define OS_SUBSCRIPTION_MODEL_STORE_KEY                                     @"OS_SUBSCRIPTION_MODEL_STORE_KEY"
 
+// Deltas
 #define OS_ADD_ALIAS_DELTA                                                  @"OS_ADD_ALIAS_DELTA"
 #define OS_REMOVE_ALIAS_DELTA                                               @"OS_REMOVE_ALIAS_DELTA"
 
@@ -322,16 +306,25 @@ typedef enum {GET, POST, HEAD, PUT, DELETE, OPTIONS, CONNECT, TRACE, PATCH} HTTP
 #define OS_REMOVE_SUBSCRIPTION_DELTA                                        @"OS_REMOVE_SUBSCRIPTION_DELTA"
 #define OS_UPDATE_SUBSCRIPTION_DELTA                                        @"OS_UPDATE_SUBSCRIPTION_DELTA"
 
+// Operation Repo
 #define OS_OPERATION_REPO_DELTA_QUEUE_KEY                                   @"OS_OPERATION_REPO_DELTA_QUEUE_KEY"
 
+// User Executor
 #define OS_USER_EXECUTOR_REQUEST_QUEUE_KEY                                  @"OS_USER_EXECUTOR_REQUEST_QUEUE_KEY"
+
+// Identity Executor
 #define OS_IDENTITY_EXECUTOR_DELTA_QUEUE_KEY                                @"OS_IDENTITY_EXECUTOR_DELTA_QUEUE_KEY"
-#define OS_IDENTITY_EXECUTOR_REQUEST_QUEUE_KEY                              @"OS_IDENTITY_EXECUTOR_REQUEST_QUEUE_KEY"
+#define OS_IDENTITY_EXECUTOR_ADD_REQUEST_QUEUE_KEY                          @"OS_IDENTITY_EXECUTOR_ADD_REQUEST_QUEUE_KEY"
+#define OS_IDENTITY_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY                       @"OS_IDENTITY_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY"
+
+// Property Executor
 #define OS_PROPERTIES_EXECUTOR_DELTA_QUEUE_KEY                              @"OS_PROPERTIES_EXECUTOR_DELTA_QUEUE_KEY"
-#define OS_PROPERTIES_EXECUTOR_REQUEST_QUEUE_KEY                            @"OS_PROPERTIES_EXECUTOR_REQUEST_QUEUE_KEY"
-#define OS_SUBSCRIPTION_EXECUTOR_DELTA_QUEUE_KEY                            @"OS_SUBSCRIPTION_EXECUTOR_DELTA_QUEUE_KEY"
-#define OS_SUBSCRIPTION_EXECUTOR_REQUEST_QUEUE_KEY                          @"OS_SUBSCRIPTION_EXECUTOR_REQUEST_QUEUE_KEY"
+#define OS_PROPERTIES_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY                     @"OS_PROPERTIES_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY"
 
-#define OS_ON_USER_WILL_CHANGE                                              @"OS_ON_USER_WILL_CHANGE"
+// Subscription Executor
+#define OS_SUBSCRIPTION_EXECUTOR_DELTA_QUEUE_KEY                            @"OS_SUBSCRIPTION_EXECUTOR_DELTA_QUEUE_KEY"
+#define OS_SUBSCRIPTION_EXECUTOR_ADD_REQUEST_QUEUE_KEY                      @"OS_SUBSCRIPTION_EXECUTOR_ADD_REQUEST_QUEUE_KEY"
+#define OS_SUBSCRIPTION_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY                   @"OS_SUBSCRIPTION_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY"
+#define OS_SUBSCRIPTION_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY                   @"OS_SUBSCRIPTION_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY"
 
 #endif /* OneSignalCommonDefines_h */
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalUserDefaults.m b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalUserDefaults.m
index 78ba082b1..fb48bacf5 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalUserDefaults.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalUserDefaults.m
@@ -31,12 +31,14 @@
 
 @implementation OneSignalUserDefaults : NSObject
 
+// TODO: Revisit if we should use a singletone, not init so much
 + (OneSignalUserDefaults * _Nonnull)initStandard {
     OneSignalUserDefaults *instance = [OneSignalUserDefaults new];
     instance.userDefaults = [instance getStandardUserDefault];
     return instance;
 }
 
+// TODO: Revisit if we should use a singletone, not init so much
 + (OneSignalUserDefaults * _Nonnull)initShared {
     OneSignalUserDefaults *instance = [OneSignalUserDefaults new];
     instance.userDefaults = [instance getSharedUserDefault];
diff --git a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m
index 957eff28c..70415ab18 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m
@@ -139,7 +139,7 @@ + (void)onNotificationReceived:(NSString *)receivedNotificationId withBlockingTa
         
         // Track confirmed delivery
         let sharedUserDefaults = OneSignalUserDefaults.initShared;
-        let playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PLAYER_ID_TO defaultValue:nil];
+        let playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil];
         let appId = [sharedUserDefaults getSavedStringForKey:OSUD_APP_ID defaultValue:nil];
         // Randomize send of confirmed deliveries to lessen traffic for high recipient notifications
         int randomDelay = semaphore != nil ? arc4random_uniform(MAX_CONF_DELIVERY_DELAY) : 0;
diff --git a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m
index b0bc90158..f3ab87765 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m
@@ -38,7 +38,7 @@ - (BOOL)isReceiveReceiptsEnabled {
 
 - (void)sendReceiveReceiptWithNotificationId:(NSString *)notificationId {
     let sharedUserDefaults = OneSignalUserDefaults.initShared;
-    let playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PLAYER_ID_TO defaultValue:nil];
+    let playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil];
     let appId = [sharedUserDefaults getSavedStringForKey:OSUD_APP_ID defaultValue:nil];
 
     [self sendReceiveReceiptWithPlayerId:playerId
diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.h b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.h
index e18285d17..4922e38bb 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.h
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.h
@@ -39,15 +39,15 @@ typedef void (^OSNotificationOpenedBlock)(OSNotificationOpenedResult * _Nonnull
  Public API.
  */
 @protocol OSNotifications <NSObject>
-+ (BOOL)permission;
-+ (BOOL)canRequestPermission;
++ (BOOL)permission NS_REFINED_FOR_SWIFT;
++ (BOOL)canRequestPermission NS_REFINED_FOR_SWIFT;
 + (void)setNotificationWillShowInForegroundHandler:(OSNotificationWillShowInForegroundBlock _Nullable)block;
 + (void)setNotificationOpenedHandler:(OSNotificationOpenedBlock _Nullable)block;
 + (void)requestPermission:(OSUserResponseBlock _Nullable )block;
 + (void)requestPermission:(OSUserResponseBlock _Nullable )block fallbackToSettings:(BOOL)fallback;
-+ (void)registerForProvisionalAuthorization:(OSUserResponseBlock _Nullable )block;
-+ (void)addPermissionObserver:(NSObject<OSPermissionObserver>*_Nonnull)observer;
-+ (void)removePermissionObserver:(NSObject<OSPermissionObserver>*_Nonnull)observer;
++ (void)registerForProvisionalAuthorization:(OSUserResponseBlock _Nullable )block NS_REFINED_FOR_SWIFT;
++ (void)addPermissionObserver:(NSObject<OSPermissionObserver>*_Nonnull)observer NS_REFINED_FOR_SWIFT;
++ (void)removePermissionObserver:(NSObject<OSPermissionObserver>*_Nonnull)observer NS_REFINED_FOR_SWIFT;
 + (void)clearAll;
 @end
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
index 8798afd18..58b2f74e2 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
@@ -182,7 +182,7 @@ + (OSPermissionStateInternal*)lastPermissionState {
 static NSString *_pushToken;
 + (NSString*)pushToken {
     if (!_pushToken) {
-        _pushToken = [OneSignalUserDefaults.initShared getSavedStringForKey:OSUD_PUSH_TOKEN_TO defaultValue:nil];
+        _pushToken = [OneSignalUserDefaults.initShared getSavedStringForKey:OSUD_PUSH_TOKEN defaultValue:nil];
     }
     return _pushToken;
 }
@@ -190,7 +190,7 @@ + (NSString*)pushToken {
 static NSString *_pushSubscriptionId;
 + (NSString*)pushSubscriptionId {
     if (!_pushSubscriptionId) {
-        _pushSubscriptionId = [OneSignalUserDefaults.initShared getSavedStringForKey:OSUD_PLAYER_ID_TO defaultValue:nil];
+        _pushSubscriptionId = [OneSignalUserDefaults.initShared getSavedStringForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil];
     }
     return _pushSubscriptionId;
 }
@@ -393,7 +393,7 @@ + (void)didRegisterForRemoteNotifications:(UIApplication *)app
     _pushToken = parsedDeviceToken;
     
     // Cache push token
-    [OneSignalUserDefaults.initShared saveStringForKey:OSUD_PUSH_TOKEN_TO withValue:_pushToken];
+    [OneSignalUserDefaults.initShared saveStringForKey:OSUD_PUSH_TOKEN withValue:_pushToken];
 
     [self sendPushTokenToDelegate];
 }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSDelta.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSDelta.swift
index 0afe75cbb..5eb03c73c 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSDelta.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSDelta.swift
@@ -34,7 +34,7 @@ open class OSDelta: NSObject, NSCoding {
     public let name: String
     public let deltaId: String
     public let timestamp: Date
-    public let model: OSModel
+    public var model: OSModel
     public let property: String
     public let value: Any
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSEventProducer.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSEventProducer.swift
index 470609437..c14aabb70 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSEventProducer.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSEventProducer.swift
@@ -26,25 +26,25 @@
  */
 
 import Foundation
+import OneSignalCore
 
 public class OSEventProducer<THandler>: NSObject {
     // Not an array as there is at most 1 subsriber per OSEventProducer anyway
     var subscriber: THandler?
 
     public func subscribe(_ handler: THandler) {
-        print("🔥 OSEventProducer.subscribe() called with handler: \(handler)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSEventProducer.subscribe() called with handler: \(handler)")
         // TODO: UM do we want to synchronize on subscribers
         subscriber = handler // TODO: UM style, implicit or explicit self?
     }
 
     public func unsubscribe(_ handler: THandler) {
-        print("🔥 OSEventProducer.unsubscribe() called with handler: \(handler)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSEventProducer.unsubscribe() called with handler: \(handler)")
         // TODO: UM do we want to synchronize on subscribers
         subscriber = nil
     }
 
     public func fire(callback: (THandler) -> Void) {
-        print("🔥 OSEventProducer.fire() called with the following subscribers:")
         // dump(subscribers) -> uncomment for more verbose log during testing
         if let subscriber = subscriber {
             callback(subscriber)
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModel.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModel.swift
index 7a4e4a2e1..96f2249f2 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModel.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModel.swift
@@ -71,8 +71,6 @@ open class OSModel: NSObject, NSCoding {
     }
 
     open func hydrateModel(_ response: [String: Any]) {
-        // Log as an error.
-        print("Error: Function must be overridden.")
         fatalError("hydrateModel(response:) has not been implemented")
     }
 }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelChangedHandler.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelChangedHandler.swift
index 7afb508ce..77d479c00 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelChangedHandler.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelChangedHandler.swift
@@ -46,7 +46,7 @@ public class OSModelChangedArgs: NSObject {
     override public var description: String {
         return "OSModelChangedArgs for model: \(model) with property: \(property) value: \(newValue)"
     }
-    
+
     init(model: OSModel, property: String, newValue: Any) {
         self.model = model
         self.property = property
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStore.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStore.swift
index 2768fd65a..f2930e27d 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStore.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStore.swift
@@ -60,21 +60,34 @@ open class OSModelStore<TModel: OSModel>: NSObject {
     }
 
     /**
-     Uses the ID that is used a key to store models in the store's models dictionary.
+     Uses the ID that is used as the key to store models in the store's models dictionary.
      Examples:  "person@example.com" for a subscription model or `OS_IDENTITY_MODEL_KEY` for an identity model.
      */
     public func getModel(key: String) -> TModel? {
         return self.models[key]
     }
 
+    /**
+     Uses the `modelId` to get the corresponding model in the store's models dictionary.
+     */
+    public func getModel(modelId: String) -> TModel? {
+        for model in models.values {
+            if model.modelId == modelId {
+                return model
+            }
+        }
+        return nil
+    }
+
     public func getModels() -> [String: TModel] {
         return self.models
     }
 
-    public func add(id: String, model: TModel) {
-        print("🔥 OSModelStore add with model \(model)")
+    public func add(id: String, model: TModel, hydrating: Bool) {
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStore add() called with model \(model)")
         // TODO: Check if we are adding the same model? Do we replace?
             // For example, calling addEmail multiple times with the same email
+            // Check API endpoint for behavior
         models[id] = model
 
         // persist the models (including new model) to storage
@@ -83,6 +96,10 @@ open class OSModelStore<TModel: OSModel>: NSObject {
         // listen for changes to this model
         model.changeNotifier.subscribe(self)
 
+        guard !hydrating else {
+            return
+        }
+
         self.changeSubscription.fire { modelStoreListener in
             modelStoreListener.onAdded(model)
         }
@@ -93,7 +110,7 @@ open class OSModelStore<TModel: OSModel>: NSObject {
      This can happen if remove email or SMS is called and it doesn't exist in the store.
      */
     public func remove(_ id: String) -> Bool {
-        print("🔥 OSModelStore remove with model \(id)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStore remove() called with model \(id)")
         // TODO: Nothing will happen if model doesn't exist in the store
         if let model = models[id] {
             models.removeValue(forKey: id)
@@ -126,24 +143,14 @@ open class OSModelStore<TModel: OSModel>: NSObject {
      When the User changes, the Subscription Model Store must remove all models.
      In contrast, it is not necessary for the Identity or Properties Model Stores to do so.
      */
-    public func clearModelsFromStore(modelToKeepId: String?) {
-        // TODO: For now, uglily have param for model to keep as workaround for clearing all models except push sub
-        // When we have a new user, the subscription store should be cleared except for push sub
-        // That's currently the only model store we call this from.
-        if let modelToKeepId,
-           let modelToKeep = self.models[modelToKeepId]
-        {
-            self.models = [modelToKeepId: modelToKeep]
-            OneSignalUserDefaults.initShared().saveCodeableData(forKey: self.storeKey, withValue: self.models)
-        } else {
-            self.models = [:]
-        }
+    public func clearModelsFromStore() {
+        self.models = [:]
     }
 }
 
 extension OSModelStore: OSModelChangedHandler {
     public func onModelUpdated(args: OSModelChangedArgs, hydrating: Bool) {
-        print("🔥 OSModelStore.onChanged() with args \(args)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStore.onChanged() called with OSModelChangedArgs: \(args)")
 
         // persist the changed models to storage
         OneSignalUserDefaults.initShared().saveCodeableData(forKey: self.storeKey, withValue: self.models)
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStoreListener.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStoreListener.swift
index 13cd20b40..b4c217306 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStoreListener.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStoreListener.swift
@@ -26,6 +26,7 @@
  */
 
 import Foundation
+import OneSignalCore
 
 public protocol OSModelStoreListener: OSModelStoreChangedHandler {
     associatedtype TModel: OSModel
@@ -51,7 +52,7 @@ extension OSModelStoreListener {
     }
 
     public func onAdded(_ model: OSModel) {
-        print("🔥 OSModelStoreListener.onAdded() with model \(model)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStoreListener.onAdded() with model \(model)")
         guard let addedModel = model as? Self.TModel else {
             // log error
             return
@@ -62,14 +63,14 @@ extension OSModelStoreListener {
     }
 
     public func onUpdated(_ args: OSModelChangedArgs) {
-        print("🔥 OSModelStoreListener.onUpdated() with args \(args)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStoreListener.onUpdated() with args \(args)")
         if let delta = getUpdateModelDelta(args) {
             OSOperationRepo.sharedInstance.enqueueDelta(delta)
         }
     }
 
     public func onRemoved(_ model: OSModel) {
-        print("🔥 OSModelStoreListener.onRemoved() with model \(model)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStoreListener.onRemoved() called with model \(model)")
         guard let removedModel = model as? Self.TModel else {
             // log error
             return
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationExecutor.swift
index ededaf432..d6d39c4dd 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationExecutor.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationExecutor.swift
@@ -27,15 +27,15 @@
 
 import OneSignalCore
 
+// TODO: Concrete executors drop OSDeltas and Requests when initializing from the cache, when they cannot be connected to their respective models anymore. Revisit this behavior of dropping.
+
 public protocol OSOperationExecutor {
     var supportedDeltas: [String] { get }
     var deltaQueue: [OSDelta] { get }
-    var requestQueue: [OneSignalRequest] { get }
 
     func enqueueDelta(_ delta: OSDelta)
     func cacheDeltaQueue()
     func processDeltaQueue()
 
-    func enqueueRequest(_ request: OneSignalRequest)
     func processRequestQueue()
 }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift
index ccabe6b4e..e3f952002 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift
@@ -58,7 +58,7 @@ public class OSOperationRepo: NSObject {
         }
         hasCalledStart = true
 
-        print("🔥 OSOperationRepo start()")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSOperationRepo calling start()")
         // register as user observer
         NotificationCenter.default.addObserver(self,
                                                selector: #selector(self.flushDeltaQueue),
@@ -76,7 +76,6 @@ public class OSOperationRepo: NSObject {
 
     private func pollFlushQueue() {
         DispatchQueue.global().asyncAfter(deadline: .now() + .seconds(pollIntervalSeconds)) { [weak self] in
-            print("🔥 OSOperationRepo pollFlushQueue: begin flush")
             self?.flushDeltaQueue()
             self?.pollFlushQueue()
         }
@@ -101,7 +100,7 @@ public class OSOperationRepo: NSObject {
             return
         }
         start()
-        print("🔥 OSOperationRepo enqueueDelta: \(delta)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSOperationRepo enqueueDelta: \(delta)")
         deltaQueue.append(delta)
 
         // Persist the deltas (including new delta) to storage
@@ -113,7 +112,9 @@ public class OSOperationRepo: NSObject {
             return
         }
         start()
-        print("🔥 OSOperationRepo flushDeltaQueue with queue: \(deltaQueue)")
+        if !deltaQueue.isEmpty {
+            OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSOperationRepo flushDeltaQueue with queue: \(deltaQueue)")
+        }
 
         var index = 0
         for delta in deltaQueue {
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OneSignalOutcomes.h b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OneSignalOutcomes.h
index 4d6dffad6..e3dcb57d1 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OneSignalOutcomes.h
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OneSignalOutcomes.h
@@ -48,7 +48,8 @@
 @protocol OSSession <NSObject>
 + (void)addOutcome:(NSString * _Nonnull)name;
 + (void)addUniqueOutcome:(NSString * _Nonnull)name;
-+ (void)addOutcomeWithValue:(NSString * _Nonnull)name value:(NSNumber * _Nonnull)value;
++ (void)addOutcomeWithValue:(NSString * _Nonnull)name value:(NSNumber * _Nonnull)value NS_REFINED_FOR_SWIFT;
+
 @end
 
 @interface OSOutcomes : NSObject <OSSession>
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModel.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModel.swift
index 226c404b1..1cb34fbb1 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModel.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModel.swift
@@ -39,7 +39,7 @@ class OSIdentityModel: OSModel {
     }
 
     var aliases: [String: String] = [:]
-    
+
     // TODO: We need to make this token secure
     public var jwtBearerToken: String?
 
@@ -68,7 +68,6 @@ class OSIdentityModel: OSModel {
     // MARK: - Alias Methods
 
     func addAliases(_ aliases: [String: String]) {
-        print("🔥 OSIdentityModel.addAliases \(aliases).")
         for (label, id) in aliases {
             self.aliases[label] = id
         }
@@ -76,7 +75,6 @@ class OSIdentityModel: OSModel {
     }
 
     func removeAliases(_ labels: [String]) {
-        print("🔥 OSIdentityModel.removeAliases \(labels).")
         var aliasesToSend: [String: String] = [:]
         for label in labels {
             self.aliases.removeValue(forKey: label)
@@ -86,7 +84,7 @@ class OSIdentityModel: OSModel {
     }
 
     public override func hydrateModel(_ response: [String: Any]) {
-        print("🔥 OSIdentityModel hydrateModel()")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityModel hydrateModel()")
         for property in response {
             switch property.key {
             case "external_id":
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityOperationExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityOperationExecutor.swift
index af99cbd9a..51dd8e2e0 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityOperationExecutor.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityOperationExecutor.swift
@@ -31,26 +31,65 @@ import OneSignalCore
 class OSIdentityOperationExecutor: OSOperationExecutor {
     var supportedDeltas: [String] = [OS_ADD_ALIAS_DELTA, OS_REMOVE_ALIAS_DELTA]
     var deltaQueue: [OSDelta] = []
-    var requestQueue: [OneSignalRequest] = []
+    // To simplify uncaching, we maintain separate request queues for each type
+    var addRequestQueue: [OSRequestAddAliases] = []
+    var removeRequestQueue: [OSRequestRemoveAlias] = []
 
     init() {
-        // Read unfinished deltas and requests from cache, if any...
-
-        if let deltaQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_IDENTITY_EXECUTOR_DELTA_QUEUE_KEY, defaultValue: []) as? [OSDelta] {
+        // Read unfinished deltas from cache, if any...
+        if var deltaQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_IDENTITY_EXECUTOR_DELTA_QUEUE_KEY, defaultValue: []) as? [OSDelta] {
+            // Hook each uncached Delta to the model in the store
+            for (index, delta) in deltaQueue.enumerated().reversed() {
+                if let modelInStore = OneSignalUserManagerImpl.sharedInstance.identityModelStore.getModel(modelId: delta.model.modelId) {
+                    // The model exists in the store, set it to be the Delta's model
+                    delta.model = modelInStore
+                } else {
+                    // The model does not exist, drop this Delta
+                    deltaQueue.remove(at: index)
+                }
+            }
             self.deltaQueue = deltaQueue
         } else {
-            // log error
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OSIdentityOperationExecutor error encountered reading from cache for \(OS_IDENTITY_EXECUTOR_DELTA_QUEUE_KEY)")
         }
 
-        if let requestQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_IDENTITY_EXECUTOR_REQUEST_QUEUE_KEY, defaultValue: []) as? [OneSignalRequest] {
-            self.requestQueue = requestQueue
+        // Read unfinished requests from cache, if any...
+
+        if var addRequestQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_IDENTITY_EXECUTOR_ADD_REQUEST_QUEUE_KEY, defaultValue: []) as? [OSRequestAddAliases] {
+            // Hook each uncached Request to the model in the store
+            for (index, request) in addRequestQueue.enumerated().reversed() {
+                if let identityModel = OneSignalUserManagerImpl.sharedInstance.identityModelStore.getModel(modelId: request.identityModel.modelId) {
+                    // The model exists in the store, set it to be the Request's models
+                    request.identityModel = identityModel
+                } else if !request.prepareForExecution() {
+                    // The models do not exist AND this request cannot be sent, drop this Request
+                    addRequestQueue.remove(at: index)
+                }
+            }
+            self.addRequestQueue = addRequestQueue
+        } else {
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OSIdentityOperationExecutor error encountered reading from cache for \(OS_IDENTITY_EXECUTOR_ADD_REQUEST_QUEUE_KEY)")
+        }
+
+        if var removeRequestQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_IDENTITY_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY, defaultValue: []) as? [OSRequestRemoveAlias] {
+            // Hook each uncached Request to the model in the store
+            for (index, request) in removeRequestQueue.enumerated().reversed() {
+                if let identityModel = OneSignalUserManagerImpl.sharedInstance.identityModelStore.getModel(modelId: request.identityModel.modelId) {
+                    // The model exists in the store, set it to be the Request's model
+                    request.identityModel = identityModel
+                } else if !request.prepareForExecution() {
+                    // The model does not exist AND this request cannot be sent, drop this Request
+                    removeRequestQueue.remove(at: index)
+                }
+            }
+            self.removeRequestQueue = removeRequestQueue
         } else {
-            // log error
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OSIdentityOperationExecutor error encountered reading from cache for \(OS_IDENTITY_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY)")
         }
     }
 
     func enqueueDelta(_ delta: OSDelta) {
-        print("🔥 OSIdentityOperationExecutor enqueueDelta: \(delta)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor enqueueDelta: \(delta)")
         deltaQueue.append(delta)
     }
 
@@ -59,6 +98,9 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
     }
 
     func processDeltaQueue() {
+        if !deltaQueue.isEmpty {
+            OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor processDeltaQueue with queue: \(deltaQueue)")
+        }
         for delta in deltaQueue {
             guard let model = delta.model as? OSIdentityModel,
                   let aliases = delta.value as? [String: String]
@@ -70,89 +112,92 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
             switch delta.name {
             case OS_ADD_ALIAS_DELTA:
                 let request = OSRequestAddAliases(aliases: aliases, identityModel: model)
-                enqueueRequest(request)
+                addRequestQueue.append(request)
 
             case OS_REMOVE_ALIAS_DELTA:
                 if let label = aliases.first?.key {
                     let request = OSRequestRemoveAlias(labelToRemove: label, identityModel: model)
-                    enqueueRequest(request)
+                    removeRequestQueue.append(request)
                 }
-                // Log error
 
             default:
-                // Log error
-                print("🔥 OSIdentityOperationExecutor met incompatible OSDelta type.")
+                OneSignalLog.onesignalLog(.LL_DEBUG, message: "OSIdentityOperationExecutor met incompatible OSDelta type: \(delta)")
             }
         }
 
         self.deltaQueue = [] // TODO: Check that we can simply clear all the deltas in the deltaQueue
 
         // persist executor's requests (including new request) to storage
-        OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_IDENTITY_EXECUTOR_REQUEST_QUEUE_KEY, withValue: self.requestQueue)
+        OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_IDENTITY_EXECUTOR_ADD_REQUEST_QUEUE_KEY, withValue: self.addRequestQueue)
+        OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_IDENTITY_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY, withValue: self.removeRequestQueue)
 
         OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_IDENTITY_EXECUTOR_DELTA_QUEUE_KEY, withValue: self.deltaQueue) // This should be empty, can remove instead?
 
         processRequestQueue()
     }
 
-    func enqueueRequest(_ request: OneSignalRequest) {
-        print("🔥 OSIdentityOperationExecutor enqueueRequest: \(request)")
-        requestQueue.append(request)
-    }
-
     func processRequestQueue() {
+        let requestQueue: [OneSignalRequest] = addRequestQueue + removeRequestQueue
+
         if requestQueue.isEmpty {
             return
         }
 
-        for request in requestQueue {
+        // Sort the requestQueue by timestamp
+        for request in requestQueue.sorted(by: { first, second in
+            return first.timestamp < second.timestamp
+        }) {
             if request.isKind(of: OSRequestAddAliases.self), let addAliasesRequest = request as? OSRequestAddAliases {
                 executeAddAliasesRequest(addAliasesRequest)
             } else if request.isKind(of: OSRequestRemoveAlias.self), let removeAliasRequest = request as? OSRequestRemoveAlias {
                 executeRemoveAliasRequest(removeAliasRequest)
             } else {
-                // Log Error
+                OneSignalLog.onesignalLog(.LL_DEBUG, message: "OSIdentityOperationExecutor.processRequestQueue met incompatible OneSignalRequest type: \(request).")
             }
         }
     }
 
     func executeAddAliasesRequest(_ request: OSRequestAddAliases) {
-        print("🔥 OSIdentityOperationExecutor: executeAddAliasesRequest making request: \(request)")
-        OneSignalClient.shared().execute(request) { result in
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor: executeAddAliasesRequest making request: \(request)")
+
+        OneSignalClient.shared().execute(request) { _ in
             // Mock a response
+            // TODO: Is there even a response to hydrate?
             let response = ["onesignalId": UUID().uuidString, "label01": "id01"]
 
             // On success, remove request from cache, and hydrate model
             // For example, if app restarts and we read in operations between sending this off and getting the response
-            self.requestQueue.removeAll(where: { $0 == request})
-            OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_IDENTITY_EXECUTOR_REQUEST_QUEUE_KEY, withValue: self.requestQueue)
+            self.addRequestQueue.removeAll(where: { $0 == request})
+            OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_IDENTITY_EXECUTOR_ADD_REQUEST_QUEUE_KEY, withValue: self.addRequestQueue)
 
             // instead: modelstore.hydratewithresponse with modelid passed in.. request.modeltoupdate.modelId
                 // store can determine if modelid is same, then hydrate or do nothign
             request.identityModel.hydrate(response)
 
         } onFailure: { error in
-            self.requestQueue.removeAll(where: { $0 == request})
+            self.addRequestQueue.removeAll(where: { $0 == request})
             OneSignalLog.onesignalLog(.LL_ERROR, message: error.debugDescription)
         }
     }
 
     func executeRemoveAliasRequest(_ request: OSRequestRemoveAlias) {
-        print("🔥 OSIdentityOperationExecutor: executeRemoveAliasRequest making request: \(request)")
-        OneSignalClient.shared().execute(request) { result in
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor: executeRemoveAliasRequest making request: \(request)")
+
+        OneSignalClient.shared().execute(request) { _ in
 
             // Mock a response
+            // TODO: Is there even a response to hydrate?
             let response = ["onesignalId": UUID().uuidString, "label01": "id01"]
 
             // On success, remove request from cache, and hydrate model
             // For example, if app restarts and we read in operations between sending this off and getting the response
-            self.requestQueue.removeAll(where: { $0 == request})
-            OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_IDENTITY_EXECUTOR_REQUEST_QUEUE_KEY, withValue: self.requestQueue)
+            self.removeRequestQueue.removeAll(where: { $0 == request})
+            OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_IDENTITY_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY, withValue: self.removeRequestQueue)
 
             request.identityModel.hydrate(response)
 
         } onFailure: { error in
-            self.requestQueue.removeAll(where: { $0 == request})
+            self.removeRequestQueue.removeAll(where: { $0 == request})
             OneSignalLog.onesignalLog(.LL_ERROR, message: error.debugDescription)
         }
     }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModel.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModel.swift
index c1ade3d33..c25bfe3f9 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModel.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModel.swift
@@ -33,10 +33,10 @@ struct OSPropertiesDeltas {
     let sessionTime: NSNumber?
     let sessionCount: NSNumber?
     let amountSpent: NSNumber?
-    let purchases: [[String:AnyObject]]?
-    
-    func toDictionary() -> [String:Any] {
-        var deltas = [String:Any]()
+    let purchases: [[String: AnyObject]]?
+
+    func toDictionary() -> [String: Any] {
+        var deltas = [String: Any]()
         deltas["session_count"] = sessionCount
         deltas["session_time"] = sessionTime?.intValue // server expects an int
         deltas["amountSpent"] = amountSpent
@@ -51,13 +51,13 @@ class OSPropertiesModel: OSModel {
             self.set(property: "language", newValue: language)
         }
     }
-    
+
     var lat: Float? {
         didSet {
             self.set(property: "lat", newValue: lat)
         }
     }
-    
+
     var long: Float? {
         didSet {
             self.set(property: "long", newValue: long)
@@ -116,7 +116,7 @@ class OSPropertiesModel: OSModel {
             case "language":
                 self.language = property.value as? String
             case "tags":
-                self.tags = property.value as? [String : String] ?? [:]
+                self.tags = property.value as? [String: String] ?? [:]
             default:
                 OneSignalLog.onesignalLog(.LL_DEBUG, message: "Not hydrating properties model for property: \(property)")
             }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertyOperationExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertyOperationExecutor.swift
index 2e1b471e3..c182dbd7c 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertyOperationExecutor.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertyOperationExecutor.swift
@@ -31,26 +31,48 @@ import OneSignalCore
 class OSPropertyOperationExecutor: OSOperationExecutor {
     var supportedDeltas: [String] = [OS_UPDATE_PROPERTIES_DELTA]
     var deltaQueue: [OSDelta] = []
-    var requestQueue: [OneSignalRequest] = []
+    var updateRequestQueue: [OSRequestUpdateProperties] = []
 
     init() {
-        // Read unfinished deltas and requests from cache, if any...
-
-        if let deltaQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_PROPERTIES_EXECUTOR_DELTA_QUEUE_KEY, defaultValue: []) as? [OSDelta] {
+        // Read unfinished deltas from cache, if any...
+        if var deltaQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_PROPERTIES_EXECUTOR_DELTA_QUEUE_KEY, defaultValue: []) as? [OSDelta] {
+            // Hook each uncached Delta to the model in the store
+            for (index, delta) in deltaQueue.enumerated().reversed() {
+                if let modelInStore = OneSignalUserManagerImpl.sharedInstance.propertiesModelStore.getModel(modelId: delta.model.modelId) {
+                    // The model exists in the properties model store, set it to be the Delta's model
+                    delta.model = modelInStore
+                } else {
+                    // The model does not exist, drop this Delta
+                    deltaQueue.remove(at: index)
+                }
+            }
             self.deltaQueue = deltaQueue
         } else {
-            // log error
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OSPropertyOperationExecutor error encountered reading from cache for \(OS_PROPERTIES_EXECUTOR_DELTA_QUEUE_KEY)")
         }
 
-        if let requestQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_PROPERTIES_EXECUTOR_REQUEST_QUEUE_KEY, defaultValue: []) as? [OneSignalRequest] {
-            self.requestQueue = requestQueue
+        // Read unfinished requests from cache, if any...
+        if var updateRequestQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_PROPERTIES_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY, defaultValue: []) as? [OSRequestUpdateProperties] {
+            // Hook each uncached Request to the model in the store
+            for (index, request) in updateRequestQueue.enumerated().reversed() {
+                if let propertiesModel = OneSignalUserManagerImpl.sharedInstance.propertiesModelStore.getModel(modelId: request.modelToUpdate.modelId),
+                   let identityModel = OneSignalUserManagerImpl.sharedInstance.identityModelStore.getModel(modelId: request.identityModel.modelId) {
+                    // The models exist in the stores, set it to be the Request's models
+                    request.modelToUpdate = propertiesModel
+                    request.identityModel = identityModel
+                } else if !request.prepareForExecution() {
+                    // The models do not exist AND this request cannot be sent, drop this Request
+                    updateRequestQueue.remove(at: index)
+                }
+            }
+            self.updateRequestQueue = updateRequestQueue
         } else {
-            // log error
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OSPropertyOperationExecutor error encountered reading from cache for \(OS_PROPERTIES_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY)")
         }
     }
 
     func enqueueDelta(_ delta: OSDelta) {
-        print("🔥 OSPropertyOperationExecutor enqueue delta\(delta)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSPropertyOperationExecutor enqueue delta\(delta)")
         deltaQueue.append(delta)
     }
 
@@ -59,6 +81,9 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
     }
 
     func processDeltaQueue() {
+        if !deltaQueue.isEmpty {
+            OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSPropertyOperationExecutor processDeltaQueue with queue: \(deltaQueue)")
+        }
         for delta in deltaQueue {
             guard let model = delta.model as? OSPropertiesModel else {
                 // Log error
@@ -72,31 +97,24 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
                 modelToUpdate: model,
                 identityModel: OneSignalUserManagerImpl.sharedInstance.user.identityModel // TODO: Make sure this is ok
             )
-            enqueueRequest(request)
+            updateRequestQueue.append(request)
         }
         self.deltaQueue = [] // TODO: Check that we can simply clear all the deltas in the deltaQueue
 
         // persist executor's requests (including new request) to storage
-        OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_PROPERTIES_EXECUTOR_REQUEST_QUEUE_KEY, withValue: self.requestQueue)
+        OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_PROPERTIES_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY, withValue: self.updateRequestQueue)
 
         OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_PROPERTIES_EXECUTOR_DELTA_QUEUE_KEY, withValue: self.deltaQueue) // This should be empty, can remove instead?
         processRequestQueue()
     }
 
-    func enqueueRequest(_ request: OneSignalRequest) {
-        print("🔥 OSPropertyOperationExecutor enqueueRequest: \(request)")
-        requestQueue.append(request)
-    }
-
     func processRequestQueue() {
-        if requestQueue.isEmpty {
+        if updateRequestQueue.isEmpty {
             return
         }
 
-        for request in requestQueue {
-            if let updatePropertiesRequest = request as? OSRequestUpdateProperties {
-                executeUpdatePropertiesRequest(updatePropertiesRequest)
-            }
+        for request in updateRequestQueue {
+            executeUpdatePropertiesRequest(request)
         }
     }
 
@@ -104,16 +122,17 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
         guard request.prepareForExecution() else {
             return
         }
-        print("🔥 OSPropertyOperationExecutor: executeUpdatePropertiesRequest making request: \(request)")
-        OneSignalClient.shared().execute(request) { result in
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSPropertyOperationExecutor: executeUpdatePropertiesRequest making request: \(request)")
+        OneSignalClient.shared().execute(request) { _ in
 
             // On success, remove request from cache, and hydrate model
+            // TODO: Do we actually hydrate model though?
             // For example, if app restarts and we read in operations between sending this off and getting the response
-            self.requestQueue.removeAll(where: { $0 == request})
-            OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_PROPERTIES_EXECUTOR_REQUEST_QUEUE_KEY, withValue: self.requestQueue)
+            self.updateRequestQueue.removeAll(where: { $0 == request})
+            OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_PROPERTIES_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY, withValue: self.updateRequestQueue)
 
         } onFailure: { error in
-            self.requestQueue.removeAll(where: { $0 == request})
+            self.updateRequestQueue.removeAll(where: { $0 == request})
             OneSignalLog.onesignalLog(.LL_ERROR, message: error.debugDescription)
         }
     }
@@ -130,7 +149,7 @@ extension OSPropertyOperationExecutor {
             modelToUpdate: propertiesModel,
             identityModel: identityModel)
 
-        enqueueRequest(request)
-        OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_PROPERTIES_EXECUTOR_REQUEST_QUEUE_KEY, withValue: self.requestQueue)
+        updateRequestQueue.append(request)
+        OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_PROPERTIES_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY, withValue: self.updateRequestQueue)
     }
 }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift
index af5d478c8..5299a9bf9 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift
@@ -118,7 +118,7 @@ class OSSubscriptionModel: OSModel {
             }
 
             // Cache the subscriptionId as it persists across users on the device??
-            OneSignalUserDefaults.initShared().saveString(forKey: OSUD_PLAYER_ID_TO, withValue: subscriptionId)
+            OneSignalUserDefaults.initShared().saveString(forKey: OSUD_PUSH_SUBSCRIPTION_ID, withValue: subscriptionId)
 
             firePushSubscriptionChanged(.subscriptionId(oldValue))
         }
@@ -130,14 +130,14 @@ class OSSubscriptionModel: OSModel {
             return calculateIsEnabled(address: address, accepted: _accepted, isDisabled: _isDisabled)
         }
     }
-    
+
     var optedIn: Bool {
         // optedIn = permission + userPreference
         get {
             return calculateIsOptedIn(accepted: _accepted, isDisabled: _isDisabled)
         }
     }
-    
+
     // Push Subscription Only
     // Initialize to be -1, so not to deal with unwrapping every time, and simplifies caching
     var notificationTypes = -1 {
@@ -221,7 +221,7 @@ class OSSubscriptionModel: OSModel {
     }
 
     public override func hydrateModel(_ response: [String: Any]) {
-        print("🔥 OSSubscriptionModel hydrateModel()")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSSubscriptionModel hydrateModel()")
         for property in response {
             switch property.key {
             case "id":
@@ -259,7 +259,7 @@ extension OSSubscriptionModel {
                                        optedIn: self.optedIn
         )
     }
-    
+
     // Calculates if the device is opted in to push notification.
     // Must have permission and not be opted out.
     func calculateIsOptedIn(accepted: Bool, isDisabled: Bool) -> Bool {
@@ -323,8 +323,7 @@ extension OSSubscriptionModel {
         let stateChanges = OSPushSubscriptionStateChanges(to: newSubscriptionState, from: prevSubscriptionState)
 
         // TODO: Don't fire observer until server is udated
-        print("🔥 firePushSubscriptionChanged from \(prevSubscriptionState.toDictionary()) to \(newSubscriptionState.toDictionary())")
-        
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "firePushSubscriptionChanged from \(prevSubscriptionState.toDictionary()) to \(newSubscriptionState.toDictionary())")
         OneSignalUserManagerImpl.sharedInstance.pushSubscriptionStateChangesObserver.notifyChange(stateChanges)
     }
 }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionOperationExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionOperationExecutor.swift
index a24a31e38..bc9d43c20 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionOperationExecutor.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionOperationExecutor.swift
@@ -31,26 +31,97 @@ import OneSignalCore
 class OSSubscriptionOperationExecutor: OSOperationExecutor {
     var supportedDeltas: [String] = [OS_ADD_SUBSCRIPTION_DELTA, OS_REMOVE_SUBSCRIPTION_DELTA, OS_UPDATE_SUBSCRIPTION_DELTA]
     var deltaQueue: [OSDelta] = []
-    var requestQueue: [OneSignalRequest] = []
+    // To simplify uncaching, we maintain separate request queues for each type
+    var addRequestQueue: [OSRequestCreateSubscription] = []
+    var removeRequestQueue: [OSRequestDeleteSubscription] = []
+    var updateRequestQueue: [OSRequestUpdateSubscription] = []
 
     init() {
-        // Read unfinished deltas and requests from cache, if any...
-
-        if let deltaQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_DELTA_QUEUE_KEY, defaultValue: []) as? [OSDelta] {
+        // Read unfinished deltas from cache, if any...
+        if var deltaQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_DELTA_QUEUE_KEY, defaultValue: []) as? [OSDelta] {
+            // Hook each uncached Delta to the model in the store
+            for (index, delta) in deltaQueue.enumerated().reversed() {
+                if let modelInStore = getSubscriptionModelFromStores(modelId: delta.model.modelId) {
+                    // The model exists in the subscription store, set it to be the Delta's model
+                    delta.model = modelInStore
+                } else {
+                    // The model does not exist, drop this Delta
+                    deltaQueue.remove(at: index)
+                }
+            }
             self.deltaQueue = deltaQueue
         } else {
-            // log error
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OSSubscriptionOperationExecutor error encountered reading from cache for \(OS_SUBSCRIPTION_EXECUTOR_DELTA_QUEUE_KEY)")
         }
 
-        if let requestQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_REQUEST_QUEUE_KEY, defaultValue: []) as? [OneSignalRequest] {
-            self.requestQueue = requestQueue
+        // Read unfinished requests from cache, if any...
+
+        if var addRequestQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_ADD_REQUEST_QUEUE_KEY, defaultValue: []) as? [OSRequestCreateSubscription] {
+            // Hook each uncached Request to the model in the store
+            for (index, request) in addRequestQueue.enumerated().reversed() {
+                if let subscriptionModel = getSubscriptionModelFromStores(modelId: request.subscriptionModel.modelId),
+                   let identityModel = OneSignalUserManagerImpl.sharedInstance.identityModelStore.getModel(modelId: request.identityModel.modelId) {
+                    // The models exist in the stores, set it to be the Request's models
+                    request.subscriptionModel = subscriptionModel
+                    request.identityModel = identityModel
+                } else if !request.prepareForExecution() {
+                    // The models do not exist AND this request cannot be sent, drop this Request
+                    addRequestQueue.remove(at: index)
+                }
+            }
+            self.addRequestQueue = addRequestQueue
+        } else {
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OSSubscriptionOperationExecutor error encountered reading from cache for \(OS_SUBSCRIPTION_EXECUTOR_ADD_REQUEST_QUEUE_KEY)")
+        }
+
+        if var removeRequestQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY, defaultValue: []) as? [OSRequestDeleteSubscription] {
+            // Hook each uncached Request to the model in the store
+            for (index, request) in removeRequestQueue.enumerated().reversed() {
+                if let subscriptionModel = getSubscriptionModelFromStores(modelId: request.subscriptionModel.modelId) {
+                    // The model exists in the store, set it to be the Request's model
+                    request.subscriptionModel = subscriptionModel
+                } else if !request.prepareForExecution() {
+                    // The model does not exist AND this request cannot be sent, drop this Request
+                    removeRequestQueue.remove(at: index)
+                }
+            }
+            self.removeRequestQueue = removeRequestQueue
         } else {
-            // log error
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OSSubscriptionOperationExecutor error encountered reading from cache for \(OS_SUBSCRIPTION_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY)")
+        }
+
+        if var updateRequestQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY, defaultValue: []) as? [OSRequestUpdateSubscription] {
+            // Hook each uncached Request to the model in the store
+            for (index, request) in updateRequestQueue.enumerated().reversed() {
+                if let subscriptionModel = getSubscriptionModelFromStores(modelId: request.subscriptionModel.modelId) {
+                    // The model exists in the store, set it to be the Request's model
+                    request.subscriptionModel = subscriptionModel
+                } else if !request.prepareForExecution() {
+                    // The models do not exist AND this request cannot be sent, drop this Request
+                    updateRequestQueue.remove(at: index)
+                }
+            }
+            self.updateRequestQueue = updateRequestQueue
+        } else {
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OSSubscriptionOperationExecutor error encountered reading from cache for \(OS_SUBSCRIPTION_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY)")
         }
     }
 
+    /**
+     Since there are 2 subscription stores, we need to check both stores for the model with a particular `modelId`.
+     */
+    func getSubscriptionModelFromStores(modelId: String) -> OSSubscriptionModel? {
+        if let modelInStore = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionModelStore.getModel(modelId: modelId) {
+            return modelInStore
+        }
+        if let modelInStore = OneSignalUserManagerImpl.sharedInstance.subscriptionModelStore.getModel(modelId: modelId) {
+            return modelInStore
+        }
+        return nil
+    }
+
     func enqueueDelta(_ delta: OSDelta) {
-        print("🔥 OSSubscriptionOperationExecutor enqueueDelta: \(delta)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSSubscriptionOperationExecutor enqueueDelta: \(delta)")
         deltaQueue.append(delta)
     }
 
@@ -59,6 +130,9 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
     }
 
     func processDeltaQueue() {
+        if !deltaQueue.isEmpty {
+            OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSSubscriptionOperationExecutor processDeltaQueue with queue: \(deltaQueue)")
+        }
         for delta in deltaQueue {
             guard let model = delta.model as? OSSubscriptionModel else {
                 // Log error
@@ -71,48 +145,50 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
                     subscriptionModel: model,
                     identityModel: OneSignalUserManagerImpl.sharedInstance.user.identityModel // TODO: Make sure this is ok
                 )
-                enqueueRequest(request)
+                addRequestQueue.append(request)
 
             case OS_REMOVE_SUBSCRIPTION_DELTA:
                 let request = OSRequestDeleteSubscription(
                     subscriptionModel: model
                 )
-                enqueueRequest(request)
+                removeRequestQueue.append(request)
 
             case OS_UPDATE_SUBSCRIPTION_DELTA:
                 let request = OSRequestUpdateSubscription(
                     subscriptionObject: [delta.property: delta.value],
                     subscriptionModel: model
                 )
-                enqueueRequest(request)
+                updateRequestQueue.append(request)
 
             default:
                 // Log error
-                print("🔥 OSSubscriptionOperationExecutor met incompatible OSDelta type.")
+                OneSignalLog.onesignalLog(.LL_DEBUG, message: "OSSubscriptionOperationExecutor met incompatible OSDelta type: \(delta).")
             }
         }
 
         self.deltaQueue = [] // TODO: Check that we can simply clear all the deltas in the deltaQueue
 
         // persist executor's requests (including new request) to storage
-        OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_REQUEST_QUEUE_KEY, withValue: self.requestQueue)
+        OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_ADD_REQUEST_QUEUE_KEY, withValue: self.addRequestQueue)
+        OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY, withValue: self.removeRequestQueue)
+        OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY, withValue: self.updateRequestQueue)
 
         OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_DELTA_QUEUE_KEY, withValue: self.deltaQueue) // This should be empty, can remove instead?
 
         processRequestQueue()
     }
 
-    func enqueueRequest(_ request: OneSignalRequest) {
-        print("🔥 OSSubscriptionOperationExecutor enqueueRequest: \(request)")
-        requestQueue.append(request)
-    }
-
     func processRequestQueue() {
+        let requestQueue: [OneSignalRequest] = addRequestQueue + removeRequestQueue + updateRequestQueue
+
         if requestQueue.isEmpty {
             return
         }
 
-        for request in requestQueue {
+        // Sort the requestQueue by timestamp
+        for request in requestQueue.sorted(by: { first, second in
+            return first.timestamp < second.timestamp
+        }) {
             if request.isKind(of: OSRequestCreateSubscription.self), let createSubscriptionRequest = request as? OSRequestCreateSubscription {
                 executeCreateSubscriptionRequest(createSubscriptionRequest)
             } else if request.isKind(of: OSRequestDeleteSubscription.self), let deleteSubscriptionRequest = request as? OSRequestDeleteSubscription {
@@ -120,7 +196,7 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
             } else if request.isKind(of: OSRequestUpdateSubscription.self), let updateSubscriptionRequest = request as? OSRequestUpdateSubscription {
                 executeUpdateSubscriptionRequest(updateSubscriptionRequest)
             } else {
-                // Log Error
+                OneSignalLog.onesignalLog(.LL_DEBUG, message: "OSSubscriptionOperationExecutor.processRequestQueue met incompatible OneSignalRequest type: \(request).")
             }
         }
     }
@@ -129,20 +205,21 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
         guard request.prepareForExecution() else {
             return
         }
-        print("🔥 OSSubscriptionOperationExecutor: executeCreateSubscriptionRequest making request: \(request)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSSubscriptionOperationExecutor: executeCreateSubscriptionRequest making request: \(request)")
         OneSignalClient.shared().execute(request) { result in
-            guard let response = result?["subscription"] as? [String : Any] else {
+            // On success, remove request from cache (even if not hydrating model), and hydrate model
+            // For example, if app restarts and we read in operations between sending this off and getting the response
+            self.addRequestQueue.removeAll(where: { $0 == request})
+            OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_ADD_REQUEST_QUEUE_KEY, withValue: self.addRequestQueue)
+
+            guard let response = result?["subscription"] as? [String: Any] else {
                 OneSignalLog.onesignalLog(.LL_ERROR, message: "Unabled to parse response to create subscription request")
                 return
             }
-            // On success, remove request from cache, and hydrate model
-            // For example, if app restarts and we read in operations between sending this off and getting the response
-            self.requestQueue.removeAll(where: { $0 == request})
-            OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_REQUEST_QUEUE_KEY, withValue: self.requestQueue)
             request.subscriptionModel.hydrate(response)
 
         } onFailure: { error in
-            self.requestQueue.removeAll(where: { $0 == request})
+            self.addRequestQueue.removeAll(where: { $0 == request})
             OneSignalLog.onesignalLog(.LL_ERROR, message: error.debugDescription)
         }
     }
@@ -153,35 +230,35 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
         }
 
         // This request can be executed as-is.
-        print("🔥 OSSubscriptionOperationExecutor: executeDeleteSubscriptionRequest making request: \(request)")
-        OneSignalClient.shared().execute(request) { result in
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSSubscriptionOperationExecutor: executeDeleteSubscriptionRequest making request: \(request)")
+        OneSignalClient.shared().execute(request) { _ in
 
             // On success, remove request from cache. No model hydration occurs.
             // For example, if app restarts and we read in operations between sending this off and getting the response
-            self.requestQueue.removeAll(where: { $0 == request})
-            OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_REQUEST_QUEUE_KEY, withValue: self.requestQueue)
+            self.removeRequestQueue.removeAll(where: { $0 == request})
+            OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY, withValue: self.removeRequestQueue)
 
         } onFailure: { error in
-            self.requestQueue.removeAll(where: { $0 == request})
+            self.removeRequestQueue.removeAll(where: { $0 == request})
             OneSignalLog.onesignalLog(.LL_ERROR, message: error.debugDescription)
         }
     }
 
     func executeUpdateSubscriptionRequest(_ request: OSRequestUpdateSubscription) {
-        print("🔥 OSSubscriptionOperationExecutor: executeUpdateSubscriptionRequest making request: \(request)")
-        
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSSubscriptionOperationExecutor: executeUpdateSubscriptionRequest making request: \(request)")
+
         guard request.prepareForExecution() else {
             return
         }
-        OneSignalClient.shared().execute(request) { result in
+        OneSignalClient.shared().execute(request) { _ in
 
             // On success, remove request from cache. No model hydration occurs.
             // For example, if app restarts and we read in operations between sending this off and getting the response
-            self.requestQueue.removeAll(where: { $0 == request})
-            OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_REQUEST_QUEUE_KEY, withValue: self.requestQueue)
+            self.updateRequestQueue.removeAll(where: { $0 == request})
+            OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY, withValue: self.updateRequestQueue)
 
         } onFailure: { error in
-            self.requestQueue.removeAll(where: { $0 == request})
+            self.updateRequestQueue.removeAll(where: { $0 == request})
             OneSignalLog.onesignalLog(.LL_ERROR, message: error.debugDescription)
         }
     }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserInternalImpl.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserInternalImpl.swift
index a41427923..890411dd9 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserInternalImpl.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserInternalImpl.swift
@@ -31,6 +31,7 @@ import OneSignalOSCore
 /**
  This is the user interface exposed to the public.
  */
+// TODO: Wrong description above? Not exposed to public.
 protocol OSUserInternal {
     var isAnonymous: Bool { get }
     var pushSubscriptionModel: OSSubscriptionModel { get }
@@ -43,7 +44,7 @@ protocol OSUserInternal {
     func addTags(_ tags: [String: String])
     func removeTags(_ tags: [String])
     // Location
-    func setLocation(lat:Float, long:Float)
+    func setLocation(lat: Float, long: Float)
     // Language
     func setLanguage(_ language: String?)
 }
@@ -52,7 +53,7 @@ protocol OSUserInternal {
  Internal user object that implements the OSUserInternal protocol.
  */
 class OSUserInternalImpl: NSObject, OSUserInternal {
-    
+
     // TODO: Determine if having any alias should return true
     // Is an anon user who has added aliases, still an anon user?
     var isAnonymous: Bool {
@@ -79,13 +80,13 @@ class OSUserInternalImpl: NSObject, OSUserInternal {
      */
     func addAliases(_ aliases: [String: String]) {
         // Decide if the non-offending aliases should still be added.
-        print("🔥 OSUserInternalImpl addAliases() called")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignal.User addAliases called with: \(aliases)")
         guard aliases[OS_ONESIGNAL_ID] == nil,
               aliases[OS_EXTERNAL_ID] == nil,
               !aliases.values.contains("")
         else {
             // log error
-            print("🔥 OSUserInternal addAliases: Cannot use \(OS_ONESIGNAL_ID) or \(OS_EXTERNAL_ID) as a alias label. Or, cannot use empty string as an alias ID.")
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OneSignal.User addAliases error: Cannot use \(OS_ONESIGNAL_ID) or \(OS_EXTERNAL_ID) as a alias label. Or, cannot use empty string as an alias ID.")
             return
         }
         identityModel.addAliases(aliases)
@@ -95,12 +96,12 @@ class OSUserInternalImpl: NSObject, OSUserInternal {
      Prohibit the removal of `onesignal_id` and `external_id`.
      */
     func removeAliases(_ labels: [String]) {
-        print("🔥 OSUserInternalImpl removeAliases() called")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignal.User removeAliases called with: \(labels)")
         guard !labels.contains(OS_ONESIGNAL_ID),
               !labels.contains(OS_EXTERNAL_ID)
         else {
             // log error
-            print("🔥 OSUserInternal removeAliases: Cannot use \(OS_ONESIGNAL_ID) or \(OS_EXTERNAL_ID) as a alias label.")
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OneSignal.User removeAliases error: Cannot use \(OS_ONESIGNAL_ID) or \(OS_EXTERNAL_ID) as a alias label.")
             return
         }
         identityModel.removeAliases(labels)
@@ -109,25 +110,27 @@ class OSUserInternalImpl: NSObject, OSUserInternal {
     // MARK: - Tags
 
     func addTags(_ tags: [String: String]) {
-        print("🔥 OSUserInternalImpl addTags() called")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignal.User addTags called with: \(tags)")
         propertiesModel.addTags(tags)
     }
 
     func removeTags(_ tags: [String]) {
-        print("🔥 OSUserInternalImpl removeTags() called")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignal.User removeTags called with: \(tags)")
+
         propertiesModel.removeTags(tags)
     }
-    
+
     // MARK: - Location
-    
+
     func setLocation(lat: Float, long: Float) {
-        print("🔥 OSUserInternalImpl setLocation() called")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignal.User setLocation called with lat: \(lat) long: \(long)")
+
         propertiesModel.lat = lat
         propertiesModel.long = long
     }
-    
+
     // MARK: - Language
-    
+
     func setLanguage(_ language: String?) {
         propertiesModel.language = language
     }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserRequests.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserRequests.swift
index 1aa732150..0f2f91b94 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserRequests.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserRequests.swift
@@ -63,30 +63,33 @@ class OSUserExecutor {
     }
 
     /**
-     Used to parse Create User and Fetch User responses.
+     Used to parse Create User and Fetch User responses. The `originalPushToken` is the push token when the request was created, which may be different from the push token currently in the SDK. For example, when the request was created, there may be no push token yet, but soon after, the SDK receives a push token. This is used to determine whether or not to hydrate the push subscription.
      */
-    static func parseFetchUserResponse(response: [AnyHashable:Any], identityModel: OSIdentityModel) {
+    static func parseFetchUserResponse(response: [AnyHashable: Any], identityModel: OSIdentityModel, originalPushToken: String?) {
         // On success, check if the current user is the same as the one in the request
         // If user has changed, don't hydrate, except for push subscription
         let modelInStore = OneSignalUserManagerImpl.sharedInstance.identityModelStore.getModel(key: OS_IDENTITY_MODEL_KEY)
-        
-        // TODO: Determine if we should be hydrating the push sub if sub_id exists in the SDK. I think not, revisit.
-        // Only hydrate the push subscription ID if it does not exist in the SDK
-        if (OneSignalUserManagerImpl.sharedInstance.user.pushSubscriptionModel.subscriptionId == nil) {
-            if let subscriptionObject = parseSubscriptionObjectResponse(response) {
-                for subModel in subscriptionObject {
-                    if let subType = subModel["type"] as? String {
-                        if subType == "iOSPush" {
-                            OneSignalUserManagerImpl.sharedInstance.user.pushSubscriptionModel.hydrate(subModel)
-                            if let subId = subModel["id"] as? String {
-                                OSNotificationsManager.setPushSubscriptionId(subId)
-                            }
-                        }
+
+        // TODO: Determine how to hydrate the push subscription, which is still faulty.
+        // Hydrate by token if sub_id exists?
+        // Problem: a user can have multiple iOS push subscription, and perhaps missing token
+        // Ideally we only get push subscription for this device in the response, not others
+
+        // Hydrate the push subscription if we don't already have a subscription ID AND token matches the original request
+        if (OneSignalUserManagerImpl.sharedInstance.user.pushSubscriptionModel.subscriptionId == nil),
+           let subscriptionObject = parseSubscriptionObjectResponse(response) {
+            for subModel in subscriptionObject {
+                if subModel["type"] as? String == "iOSPush",
+                   areTokensEqual(tokenA: originalPushToken, tokenB: subModel["token"] as? String) { // response may have "" token or no token
+                    OneSignalUserManagerImpl.sharedInstance.user.pushSubscriptionModel.hydrate(subModel)
+                    if let subId = subModel["id"] as? String {
+                        OSNotificationsManager.setPushSubscriptionId(subId)
                     }
+                    break
                 }
             }
         }
-   
+
         guard modelInStore?.modelId == identityModel.modelId else {
             return
         }
@@ -94,54 +97,69 @@ class OSUserExecutor {
         if let identityObject = parseIdentityObjectResponse(response) {
             OneSignalUserManagerImpl.sharedInstance.user.identityModel.hydrate(identityObject)
         }
-        
+
         if let propertiesObject = parsePropertiesObjectResponse(response) {
             OneSignalUserManagerImpl.sharedInstance.user.propertiesModel.hydrate(propertiesObject)
         }
-        
+
         // Now parse email and sms subscriptions
         if let subscriptionObject = parseSubscriptionObjectResponse(response) {
             let models = OneSignalUserManagerImpl.sharedInstance.subscriptionModelStore.getModels()
             for subModel in subscriptionObject {
                 if let address = subModel["token"] as? String,
-                   let type = OSSubscriptionType(rawValue: subModel["type"] as? String ?? ""),
-                   subModel["type"] as? String != "iOSPush"
-                {
+                   let rawType = subModel["type"] as? String,
+                   rawType != "iOSPush",
+                   let type = OSSubscriptionType(rawValue: rawType) {
                     if let model = models[address] {
                         // This subscription exists in the store, hydrate
                         model.hydrate(subModel)
-                        
+
                     } else {
                         // This subscription does not exist in the store, add
-                        // TODO: This creates a Delta and sends a request when it should be hydrating
                         OneSignalUserManagerImpl.sharedInstance.subscriptionModelStore.add(id: address, model: OSSubscriptionModel(
                             type: type,
-                            address: subModel["token"] as? String,
+                            address: address,
                             subscriptionId: subModel["id"] as? String,
                             accepted: true,
                             isDisabled: false,
-                            changeNotifier: OSEventProducer())
+                            changeNotifier: OSEventProducer()), hydrating: true
                         )
                     }
                 }
             }
         }
     }
-    
-    static func parseSubscriptionObjectResponse(_ response: [AnyHashable:Any]?) -> [[String:Any]]? {
-        return response?["subscriptions"] as? [[String:Any]]
+
+    /**
+     Returns if 2 tokens are equal. This is needed as a nil token is equal to the empty string "".
+     */
+    static func areTokensEqual(tokenA: String?, tokenB: String?) -> Bool {
+        // They are both strings or both nil
+        if tokenA == tokenB {
+            return true
+        }
+        // One is nil and the other is ""
+        if (tokenA == nil && tokenB == "") || (tokenA == "" && tokenB == nil) {
+            return true
+        }
+        return false
     }
-    
-    static func parsePropertiesObjectResponse(_ response: [AnyHashable:Any]?) -> [String:Any]? {
-        return response?["properties"] as? [String:Any]
+
+    static func parseSubscriptionObjectResponse(_ response: [AnyHashable: Any]?) -> [[String: Any]]? {
+        return response?["subscriptions"] as? [[String: Any]]
     }
-    
-    static func parseIdentityObjectResponse(_ response: [AnyHashable:Any]?) -> [String:Any]? {
-        return response?["identity"] as? [String:Any]
+
+    static func parsePropertiesObjectResponse(_ response: [AnyHashable: Any]?) -> [String: Any]? {
+        return response?["properties"] as? [String: Any]
+    }
+
+    static func parseIdentityObjectResponse(_ response: [AnyHashable: Any]?) -> [String: Any]? {
+        return response?["identity"] as? [String: Any]
     }
 
     // We will pass minimal properties to this request
     static func createUser(_ user: OSUserInternal) {
+        let originalPushToken = user.pushSubscriptionModel.address
         let request = OSRequestCreateUser(identityModel: user.identityModel, pushSubscriptionModel: user.pushSubscriptionModel)
 
         // Currently there are no requirements needed before sending this request
@@ -149,8 +167,17 @@ class OSUserExecutor {
             return
         }
         OneSignalClient.shared().execute(request) { response in
+            // TODO: Differentiate if we need to fetch based on response code 200, 201, 202
+            // Create User's response won't send us the user's complete info if this user already existed.
+            // We can parse the response OR fetch user (and then parse response then)
+            // For now, do both, as we should parse to get the subscription_id from this request
             if let response = response {
-                parseFetchUserResponse(response: response, identityModel: request.identityModel)
+                parseFetchUserResponse(response: response, identityModel: request.identityModel, originalPushToken: originalPushToken)
+                // If we logged into an external_id, fetch the user data
+                if let identity = request.parameters?["identity"] as? [String: String],
+                   let externalId = identity[OS_EXTERNAL_ID] {
+                    fetchUser(aliasLabel: OS_EXTERNAL_ID, aliasId: externalId, identityModel: request.identityModel)
+                }
             }
             executePendingRequests()
         } onFailure: { error in
@@ -187,6 +214,7 @@ class OSUserExecutor {
             executePendingRequests() // TODO: Here or after fetch or after transfer?
 
         } onFailure: { _ in
+            // TODO: Actually account for error code when processing this failure response
             // Returns 409 if any provided (label, id) pair exists on another User, so the SDK will switch to this user.
             // If 409:
             fetchUser(aliasLabel: OS_EXTERNAL_ID, aliasId: request.aliasId, identityModel: request.identityModelToUpdate)
@@ -220,11 +248,11 @@ class OSUserExecutor {
 
     static func executeTransferPushSubscriptionRequest(_ request: OSRequestTransferSubscription) {
         OneSignalClient.shared().execute(request) { _ in
-            // ... hydrate with returned identity object?
+            // TODO: ... hydrate with returned identity object?
             executePendingRequests()
 
         } onFailure: { _ in
-            // What happened? Client responsible for retrying.
+            // TODO: What happened? Client responsible for retrying.
         }
     }
 
@@ -238,10 +266,10 @@ class OSUserExecutor {
 
         OneSignalClient.shared().execute(request) { response in
             if let response = response {
-                parseFetchUserResponse(response: response, identityModel: request.identityModel)
+                parseFetchUserResponse(response: response, identityModel: request.identityModel, originalPushToken: OneSignalUserManagerImpl.sharedInstance.token)
             }
         } onFailure: { _ in
-            // What?
+            // TODO: What?
         }
     }
 }
@@ -274,7 +302,7 @@ class OSRequestCreateUser: OneSignalRequest, OSUserRequest {
             OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot generate the create user request due to null app ID.")
             return false
         }
-        self.addJWTHeader(identityModel:identityModel)
+        self.addJWTHeader(identityModel: identityModel)
         self.path = "apps/\(appId)/users"
         // The pushSub doesn't need to have a token.
         return true
@@ -292,12 +320,12 @@ class OSRequestCreateUser: OneSignalRequest, OSUserRequest {
         pushSubscriptionObject["type"] = pushSubscriptionModel.type.rawValue
         pushSubscriptionObject["token"] = pushSubscriptionModel.address
         pushSubscriptionObject["enabled"] = pushSubscriptionModel.enabled
-        
+
         // notificationTypes defaults to -1 instead of nil, don't send if it's -1
-        if (pushSubscriptionModel.notificationTypes != -1) {
+        if pushSubscriptionModel.notificationTypes != -1 {
             pushSubscriptionObject["notification_types"] = pushSubscriptionModel.notificationTypes
         }
-        
+
         var params: [String: Any] = [:]
         params["identity"] = [:]
         if let externalId = identityModel.externalId {
@@ -507,7 +535,7 @@ class OSRequestAddAliases: OneSignalRequest, OSUserRequest {
         return stringDescription
     }
 
-    let identityModel: OSIdentityModel
+    var identityModel: OSIdentityModel
 
     // requires a `onesignal_id` to send this request
     func prepareForExecution() -> Bool {
@@ -565,7 +593,7 @@ class OSRequestRemoveAlias: OneSignalRequest, OSUserRequest {
     }
 
     let labelToRemove: String
-    let identityModel: OSIdentityModel
+    var identityModel: OSIdentityModel
 
     func prepareForExecution() -> Bool {
         if let onesignalId = identityModel.onesignalId, let appId = OneSignalConfigManager.getAppId() {
@@ -621,8 +649,9 @@ class OSRequestUpdateProperties: OneSignalRequest, OSUserRequest {
         return stringDescription
     }
 
-    let modelToUpdate: OSPropertiesModel
-    let identityModel: OSIdentityModel
+    // TODO: does updating properties even have a response in which we need to hydrate from? Then we can get rid of modelToUpdate
+    var modelToUpdate: OSPropertiesModel
+    var identityModel: OSIdentityModel
 
     func prepareForExecution() -> Bool {
         if let onesignalId = identityModel.onesignalId,
@@ -637,14 +666,14 @@ class OSRequestUpdateProperties: OneSignalRequest, OSUserRequest {
             return false
         }
     }
-    
+
     func addPushSubscriptionIdToAdditionalHeadersIfNeeded() -> Bool {
         guard let parameters = self.parameters else {
             return true
         }
         if parameters["deltas"] != nil {
             if let pushSubscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId {
-                var additionalHeaders = self.additionalHeaders ?? [String:String]()
+                var additionalHeaders = self.additionalHeaders ?? [String: String]()
                 additionalHeaders["OneSignal-Subscription-Id"] = pushSubscriptionId
                 self.additionalHeaders = additionalHeaders
                 return true
@@ -658,7 +687,7 @@ class OSRequestUpdateProperties: OneSignalRequest, OSUserRequest {
     init(properties: [String: Any], deltas: [String: Any]?, refreshDeviceMetadata: Bool?, modelToUpdate: OSPropertiesModel, identityModel: OSIdentityModel) {
         self.modelToUpdate = modelToUpdate
         self.identityModel = identityModel
-        self.stringDescription = "OSRequestUpdateProperties with properties: \(properties) deltas: \(String(describing:deltas)) refreshDeviceMetadata: \(String(describing:refreshDeviceMetadata))"
+        self.stringDescription = "OSRequestUpdateProperties with properties: \(properties) deltas: \(String(describing: deltas)) refreshDeviceMetadata: \(String(describing: refreshDeviceMetadata))"
         super.init()
 
         var params: [String: Any] = [:]
@@ -712,8 +741,8 @@ class OSRequestCreateSubscription: OneSignalRequest, OSUserRequest {
         return stringDescription
     }
 
-    let subscriptionModel: OSSubscriptionModel
-    let identityModel: OSIdentityModel
+    var subscriptionModel: OSSubscriptionModel
+    var identityModel: OSIdentityModel
 
     // Need the onesignal_id of the user
     func prepareForExecution() -> Bool {
@@ -736,9 +765,9 @@ class OSRequestCreateSubscription: OneSignalRequest, OSUserRequest {
         var subscriptionParams: [String: Any] = [:]
         subscriptionParams["type"] = subscriptionModel.type.rawValue
         subscriptionParams["token"] = subscriptionModel.address
-        subscriptionParams["enabled"] = subscriptionModel.enabled
-
-        // TODO: Add more to `subscriptionParams`?
+        // 1/5/2023: For email and SMS, either send `enabled` AND `notification_types` or don't send either
+        // TODO: ^ Backend changes may require us to come back and change this request's payload.
+        // TODO: Since this is not used for push, don't send either of those. Revisit if we ever create push subscriptions with this request.
 
         self.parameters = ["subscription": subscriptionParams]
         self.method = POST
@@ -879,7 +908,7 @@ class OSRequestUpdateSubscription: OneSignalRequest, OSUserRequest {
         return stringDescription
     }
 
-    let subscriptionModel: OSSubscriptionModel
+    var subscriptionModel: OSSubscriptionModel
 
     // Need the subscription_id
     func prepareForExecution() -> Bool {
@@ -904,12 +933,12 @@ class OSRequestUpdateSubscription: OneSignalRequest, OSUserRequest {
         subscriptionParams.removeValue(forKey: "address")
         subscriptionParams.removeValue(forKey: "notificationTypes")
         subscriptionParams["token"] = subscriptionModel.address
-        
+
         // notificationTypes defaults to -1 instead of nil, don't send if it's -1
-        if (subscriptionModel.notificationTypes != -1) {
+        if subscriptionModel.notificationTypes != -1 {
             subscriptionParams["notification_types"] = subscriptionModel.notificationTypes
         }
-        
+
         subscriptionParams["enabled"] = subscriptionModel.enabled
         // TODO: The above is not quite right. If we hydrate, we will over-write any pending updates
         // May use subscriptionObject, but enabled and notification_types should be sent together...
@@ -957,7 +986,7 @@ class OSRequestDeleteSubscription: OneSignalRequest, OSUserRequest {
         return stringDescription
     }
 
-    let subscriptionModel: OSSubscriptionModel
+    var subscriptionModel: OSSubscriptionModel
 
     // Need the subscription_id
     func prepareForExecution() -> Bool {
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift
index 3443ace61..10fd21537 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift
@@ -40,7 +40,7 @@ import OneSignalNotifications
     // Location
     func setLocation(latitude: Float, longitude: Float)
     // Purchase Tracking
-    func sendPurchases(_ purchases:[[String:AnyObject]])
+    func sendPurchases(_ purchases: [[String: AnyObject]])
 }
 
 /**
@@ -65,7 +65,7 @@ import OneSignalNotifications
     func addSmsNumber(_ number: String)
     func removeSmsNumber(_ number: String) -> Bool
     // Language
-    func setLanguage(_ language: String?)
+    func setLanguage(_ language: String?) // TODO: why optional? As a remove?
     // JWT Token Expire
     typealias OSJwtCompletionBlock = (_ newJwtToken: String) -> Void
     typealias OSJwtExpiredHandler =  (_ externalId: String, _ completion: OSJwtCompletionBlock) -> Void
@@ -93,13 +93,13 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
     @objc public var onesignalId: String? {
         return _user?.identityModel.onesignalId
     }
-    
+
     @objc public var pushSubscriptionId: String? {
         return _user?.pushSubscriptionModel.subscriptionId
     }
 
     private var hasCalledStart = false
-    
+
     private var jwtExpiredHandler: OSJwtExpiredHandler?
 
     var user: OSUserInternal {
@@ -140,25 +140,30 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         return pushSubscriptionStateChangesObserver
     }
 
-    // has Identity, Properties, and Subscription Model Stores
+    // has Identity, Properties, Subscription, and Push Subscription Model Stores
     let identityModelStore = OSModelStore<OSIdentityModel>(changeSubscription: OSEventProducer(), storeKey: OS_IDENTITY_MODEL_STORE_KEY)
     let propertiesModelStore = OSModelStore<OSPropertiesModel>(changeSubscription: OSEventProducer(), storeKey: OS_PROPERTIES_MODEL_STORE_KEY)
+    // Holds email and sms subscription models
     let subscriptionModelStore = OSModelStore<OSSubscriptionModel>(changeSubscription: OSEventProducer(), storeKey: OS_SUBSCRIPTION_MODEL_STORE_KEY)
+    // Holds a single push subscription model
+    let pushSubscriptionModelStore = OSModelStore<OSSubscriptionModel>(changeSubscription: OSEventProducer(), storeKey: OS_PUSH_SUBSCRIPTION_MODEL_STORE_KEY)
 
     // These must be initialized in init()
     let identityModelStoreListener: OSIdentityModelStoreListener
     let propertiesModelStoreListener: OSPropertiesModelStoreListener
     let subscriptionModelStoreListener: OSSubscriptionModelStoreListener
+    let pushSubscriptionModelStoreListener: OSSubscriptionModelStoreListener
 
-    // has Property and Identity operation executors
-    let propertyExecutor = OSPropertyOperationExecutor()
-    let identityExecutor = OSIdentityOperationExecutor()
-    let subscriptionExecutor = OSSubscriptionOperationExecutor()
+    // Executors must be initialize after sharedInstance is initialized
+    var propertyExecutor: OSPropertyOperationExecutor?
+    var identityExecutor: OSIdentityOperationExecutor?
+    var subscriptionExecutor: OSSubscriptionOperationExecutor?
 
     private override init() {
         self.identityModelStoreListener = OSIdentityModelStoreListener(store: identityModelStore)
         self.propertiesModelStoreListener = OSPropertiesModelStoreListener(store: propertiesModelStore)
         self.subscriptionModelStoreListener = OSSubscriptionModelStoreListener(store: subscriptionModelStore)
+        self.pushSubscriptionModelStoreListener = OSSubscriptionModelStoreListener(store: pushSubscriptionModelStore)
     }
 
     // TODO: This method is called A LOT, check if all calls are needed.
@@ -172,7 +177,7 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         }
 
         hasCalledStart = true
-        print("🔥 OneSignalUserManagerImpl start()")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignalUserManager calling start")
 
         OSNotificationsManager.delegate = self
 
@@ -180,8 +185,9 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         // Corrupted state if any of these models exist without the others
         if let identityModel = identityModelStore.getModels()[OS_IDENTITY_MODEL_KEY],
            let propertiesModel = propertiesModelStore.getModels()[OS_PROPERTIES_MODEL_KEY],
-           let pushSubscription = subscriptionModelStore.getModels()[OS_PUSH_SUBSCRIPTION_MODEL_KEY] {
+           let pushSubscription = pushSubscriptionModelStore.getModels()[OS_PUSH_SUBSCRIPTION_MODEL_KEY] {
             _user = OSUserInternalImpl(identityModel: identityModel, propertiesModel: propertiesModel, pushSubscriptionModel: pushSubscription)
+            OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignalUserManager.start called, loaded the user from cache.")
         }
 
         // Creates an anonymous user if there isn't one in the cache
@@ -191,10 +197,19 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         identityModelStoreListener.start()
         propertiesModelStoreListener.start()
         subscriptionModelStoreListener.start()
+        pushSubscriptionModelStoreListener.start()
 
         // Setup the executors
         OSUserExecutor.start()
         OSOperationRepo.sharedInstance.start()
+
+        // Cannot initialize these executors in `init` as they reference the sharedInstance
+        let propertyExecutor = OSPropertyOperationExecutor()
+        let identityExecutor = OSIdentityOperationExecutor()
+        let subscriptionExecutor = OSSubscriptionOperationExecutor()
+        self.propertyExecutor = propertyExecutor
+        self.identityExecutor = identityExecutor
+        self.subscriptionExecutor = subscriptionExecutor
         OSOperationRepo.sharedInstance.addExecutor(identityExecutor)
         OSOperationRepo.sharedInstance.addExecutor(propertyExecutor)
         OSOperationRepo.sharedInstance.addExecutor(subscriptionExecutor)
@@ -210,7 +225,7 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
             // Log error
             return
         }
-        print("🔥 OneSignalUserManagerImpl login(\(externalId)) called")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignal.User login called with externalId: \(externalId)")
         _ = _login(externalId: externalId, token: token)
     }
 
@@ -222,12 +237,17 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         // Check if the existing user is the same one being logged in. If so, return.
         if let user = _user {
             guard user.identityModel.externalId != externalId || externalId == nil else {
+                OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignalUserManager.createNewUser: not creating new user due to logging into the same user.)")
                 return user
             }
         }
 
-        let pushSubscriptionModel = subscriptionModelStore.getModel(key: OS_PUSH_SUBSCRIPTION_MODEL_KEY)
-        prepareForNewUser()
+        let pushSubscriptionModel = pushSubscriptionModelStore.getModel(key: OS_PUSH_SUBSCRIPTION_MODEL_KEY)
+
+        // prepareForNewUser may be already called by logout, so we don't want to call it again. Also, there should be no need to call this method if there is no user.
+        if _user != nil {
+            prepareForNewUser()
+        }
 
         let newUser = setNewInternalUser(externalId: externalId, pushSubscriptionModel: pushSubscriptionModel)
         newUser.identityModel.jwtBearerToken = token
@@ -251,7 +271,7 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         let identityModelToIdentify = currentUser.identityModel
 
         // Immediately drop the old user and set a new user in the SDK
-        let pushSubscriptionModel = subscriptionModelStore.getModel(key: OS_PUSH_SUBSCRIPTION_MODEL_KEY)
+        let pushSubscriptionModel = pushSubscriptionModelStore.getModel(key: OS_PUSH_SUBSCRIPTION_MODEL_KEY)
         prepareForNewUser()
         let newUser = setNewInternalUser(externalId: externalId, pushSubscriptionModel: pushSubscriptionModel)
 
@@ -267,8 +287,7 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: nil) else {
             return _mockUser
         }
-
-        print("🔥 OneSignalUserManagerImpl private _login(\(externalId ?? "nil")) called")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignalUserManager internal _login called with externalId: \(externalId ?? "nil")")
 
         // If have token, validate token. Account for this being a requirement.
         // Logging into an identified user from an anonymous user
@@ -289,10 +308,11 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
      */
     @objc
     public func logout() {
+        prepareForNewUser()
         _user = nil
         createUserIfNil()
     }
-    
+
     @objc
     public func clearAllModelsFromStores() {
         prepareForNewUser()
@@ -314,7 +334,7 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         NotificationCenter.default.post(name: Notification.Name(OS_ON_USER_WILL_CHANGE), object: nil)
 
         // This store MUST be cleared, Identity and Properties do not.
-        subscriptionModelStore.clearModelsFromStore(modelToKeepId: OS_PUSH_SUBSCRIPTION_MODEL_KEY)
+        subscriptionModelStore.clearModelsFromStore()
     }
 
     /**
@@ -329,18 +349,18 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         }
 
         let identityModel = OSIdentityModel(aliases: aliases, changeNotifier: OSEventProducer())
-        self.identityModelStore.add(id: OS_IDENTITY_MODEL_KEY, model: identityModel)
+        self.identityModelStore.add(id: OS_IDENTITY_MODEL_KEY, model: identityModel, hydrating: false)
 
         let propertiesModel = OSPropertiesModel(changeNotifier: OSEventProducer())
-        self.propertiesModelStore.add(id: OS_PROPERTIES_MODEL_KEY, model: propertiesModel)
+        self.propertiesModelStore.add(id: OS_PROPERTIES_MODEL_KEY, model: propertiesModel, hydrating: false)
 
         // TODO: We will have to save subscription_id and push_token to user defaults when we get them
 
         let pushSubscription = pushSubscriptionModel ?? createDefaultPushSubscription()
-        
+
         // Add pushSubscription to store if not present
-        if (!subscriptionModelStore.getModels().keys.contains(OS_PUSH_SUBSCRIPTION_MODEL_KEY)) {
-            subscriptionModelStore.add(id: OS_PUSH_SUBSCRIPTION_MODEL_KEY, model: pushSubscription)
+        if !pushSubscriptionModelStore.getModels().keys.contains(OS_PUSH_SUBSCRIPTION_MODEL_KEY) {
+            pushSubscriptionModelStore.add(id: OS_PUSH_SUBSCRIPTION_MODEL_KEY, model: pushSubscription, hydrating: false)
         }
 
         _user = OSUserInternalImpl(identityModel: identityModel, propertiesModel: propertiesModel, pushSubscriptionModel: pushSubscription)
@@ -350,8 +370,8 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
     func createDefaultPushSubscription() -> OSSubscriptionModel {
         let sharedUserDefaults = OneSignalUserDefaults.initShared()
         let accepted = OSNotificationsManager.currentPermissionState.accepted
-        let token = sharedUserDefaults.getSavedString(forKey: OSUD_PUSH_TOKEN_TO, defaultValue: nil)
-        let subscriptionId = sharedUserDefaults.getSavedString(forKey: OSUD_PLAYER_ID_TO, defaultValue: nil)
+        let token = sharedUserDefaults.getSavedString(forKey: OSUD_PUSH_TOKEN, defaultValue: nil)
+        let subscriptionId = sharedUserDefaults.getSavedString(forKey: OSUD_PUSH_SUBSCRIPTION_ID, defaultValue: nil)
 
         return OSSubscriptionModel(type: .push,
                                    address: token,
@@ -360,15 +380,15 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
                                    isDisabled: false,
                                    changeNotifier: OSEventProducer())
     }
-    
+
     @objc
-    public func getTags() -> [String:String]? {
+    public func getTags() -> [String: String]? {
         guard let user = _user else {
             return nil
         }
         return user.propertiesModel.tags
     }
-    
+
     @objc
     public func setLocation(latitude: Float, longitude: Float) {
         guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: "setLocation") else {
@@ -380,9 +400,9 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         }
         user.setLocation(lat: latitude, long: longitude)
     }
-    
+
     @objc
-    public func sendPurchases(_ purchases: [[String : AnyObject]]) {
+    public func sendPurchases(_ purchases: [[String: AnyObject]]) {
         guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: "sendPurchases") else {
             return
         }
@@ -394,15 +414,20 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         let identityModel = user.identityModel
         let propertiesModel = user.propertiesModel
         let propertiesDeltas = OSPropertiesDeltas(sessionTime: nil, sessionCount: nil, amountSpent: nil, purchases: purchases)
-        propertyExecutor.updateProperties(
-            propertiesDeltas: propertiesDeltas,
-            refreshDeviceMetadata: false,
-            propertiesModel: propertiesModel,
-            identityModel: identityModel
-        )
+
+        // propertyExecutor should exist as this should be called after `start()` has been called
+        if let propertyExecutor = self.propertyExecutor {
+            propertyExecutor.updateProperties(
+                propertiesDeltas: propertiesDeltas,
+                refreshDeviceMetadata: false,
+                propertiesModel: propertiesModel,
+                identityModel: identityModel
+            )
+        } else {
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OneSignalUserManagerImpl.sendPurchases with purchases: \(purchases) cannot be executed due to missing property executor.")
+        }
     }
-    
-    
+
     private func fireJwtExpired() {
         guard let externalId = user.identityModel.externalId, let jwtExpiredHandler = self.jwtExpiredHandler else {
             return
@@ -425,15 +450,16 @@ extension OneSignalUserManagerImpl {
             return
         }
         start()
-        
+
         updateSession(sessionCount: 1, sessionTime: nil, refreshDeviceMetadata: true)
 
         // Fetch the user's data if there is a onesignal_id
+        // TODO: What if onesignal_id is missing, because we may init a user from cache but it may be missing onesignal_id. Is this ok.
         if let onesignalId = onesignalId {
             OSUserExecutor.fetchUser(aliasLabel: OS_ONESIGNAL_ID, aliasId: onesignalId, identityModel: user.identityModel)
         }
     }
-    
+
     @objc
     public func updateSession(sessionCount: NSNumber?, sessionTime: NSNumber?, refreshDeviceMetadata: Bool) {
         guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: nil) else {
@@ -444,12 +470,18 @@ extension OneSignalUserManagerImpl {
         let identityModel = user.identityModel
         let propertiesModel = user.propertiesModel
         let propertiesDeltas = OSPropertiesDeltas(sessionTime: sessionTime, sessionCount: sessionCount, amountSpent: nil, purchases: nil)
-        propertyExecutor.updateProperties(
-            propertiesDeltas: propertiesDeltas,
-            refreshDeviceMetadata: refreshDeviceMetadata,
-            propertiesModel: propertiesModel,
-            identityModel: identityModel
-        )
+
+        // propertyExecutor should exist as this should be called after `start()` has been called
+        if let propertyExecutor = self.propertyExecutor {
+            propertyExecutor.updateProperties(
+                propertiesDeltas: propertiesDeltas,
+                refreshDeviceMetadata: refreshDeviceMetadata,
+                propertiesModel: propertiesModel,
+                identityModel: identityModel
+            )
+        } else {
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OneSignalUserManagerImpl.updateSession with sessionCount: \(String(describing: sessionCount)) sessionTime: \(String(describing: sessionTime)) cannot be executed due to missing property executor.")
+        }
     }
 
     /**
@@ -471,7 +503,7 @@ extension OneSignalUserManagerImpl: OSUser {
     public func onJwtExpired(expiredHandler: @escaping OSJwtExpiredHandler) {
         jwtExpiredHandler = expiredHandler
     }
-    
+
     public var User: OSUser {
         start()
         return self
@@ -553,7 +585,7 @@ extension OneSignalUserManagerImpl: OSUser {
             isDisabled: false,
             changeNotifier: OSEventProducer()
         )
-        self.subscriptionModelStore.add(id: email, model: model)
+        self.subscriptionModelStore.add(id: email, model: model, hydrating: false)
     }
 
     /**
@@ -585,7 +617,7 @@ extension OneSignalUserManagerImpl: OSUser {
             isDisabled: false,
             changeNotifier: OSEventProducer()
         )
-        self.subscriptionModelStore.add(id: number, model: model)
+        self.subscriptionModelStore.add(id: number, model: model, hydrating: false)
     }
 
     /**
@@ -601,7 +633,7 @@ extension OneSignalUserManagerImpl: OSUser {
         createUserIfNil()
         return self.subscriptionModelStore.remove(number)
     }
-    
+
     public func setLanguage(_ language: String?) {
         guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: "setLanguage") else {
             return
@@ -637,7 +669,7 @@ extension OneSignalUserManagerImpl: OSPushSubscription {
         }
         return user.pushSubscriptionModel.address
     }
-    
+
     public var optedIn: Bool {
         guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: "pushSubscription.optedIn") else {
             return false
@@ -655,7 +687,7 @@ extension OneSignalUserManagerImpl: OSPushSubscription {
         user.pushSubscriptionModel._isDisabled = false
         OSNotificationsManager.requestPermission(nil, fallbackToSettings: true)
     }
-    
+
     public func optOut() {
         guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: "pushSubscription.optOut") else {
             return
diff --git a/iOS_SDK/OneSignalSDK/Source/OSMessagingController.m b/iOS_SDK/OneSignalSDK/Source/OSMessagingController.m
index e246f376a..dd8626782 100644
--- a/iOS_SDK/OneSignalSDK/Source/OSMessagingController.m
+++ b/iOS_SDK/OneSignalSDK/Source/OSMessagingController.m
@@ -525,10 +525,11 @@ - (void)setDataForRedisplay:(OSInAppMessageInternal *)message {
     BOOL messageDismissed = [_seenInAppMessages containsObject:message.messageId];
     let redisplayMessageSavedData = [_redisplayedInAppMessages objectForKey:message.messageId];
 
-    NSLog(@"Redisplay dismissed: %@ and data: %@", messageDismissed ? @"YES" : @"NO", redisplayMessageSavedData.jsonRepresentation.description);
+    [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"Redisplay dismissed: %@ and data: %@", messageDismissed ? @"YES" : @"NO", redisplayMessageSavedData.jsonRepresentation.description]];
 
     if (messageDismissed && redisplayMessageSavedData) {
-        NSLog(@"Redisplay IAM: %@", message.jsonRepresentation.description);
+        [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"Redisplay IAM: %@", message.jsonRepresentation.description]];
+        
         message.displayStats.displayQuantity = redisplayMessageSavedData.displayStats.displayQuantity;
         message.displayStats.lastDisplayTime = redisplayMessageSavedData.displayStats.lastDisplayTime;
 
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignal.m b/iOS_SDK/OneSignalSDK/Source/OneSignal.m
index d94bd3b03..341ab7b66 100755
--- a/iOS_SDK/OneSignalSDK/Source/OneSignal.m
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignal.m
@@ -578,8 +578,8 @@ + (void)handleAppIdChange:(NSString*)appId {
         [standardUserDefaults saveStringForKey:OSUD_APP_ID withValue:appId];
         
         // Remove player_id from both standard and shared NSUserDefaults
-        [standardUserDefaults removeValueForKey:OSUD_PLAYER_ID_TO];
-        [sharedUserDefaults removeValueForKey:OSUD_PLAYER_ID_TO];
+        [standardUserDefaults removeValueForKey:OSUD_PUSH_SUBSCRIPTION_ID];
+        [sharedUserDefaults removeValueForKey:OSUD_PUSH_SUBSCRIPTION_ID];
         
         // Clear all cached data, does not start User Module nor call logout.
         [OneSignalUserManagerImpl.sharedInstance clearAllModelsFromStores];
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h b/iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h
index aa77f9748..0a3c8fe0b 100755
--- a/iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h
@@ -90,16 +90,14 @@ NS_SWIFT_NAME(login(externalId:token:));
 + (Class<OSDebug>)Debug NS_REFINED_FOR_SWIFT;
 
 #pragma mark Privacy Consent
-+ (void)setPrivacyConsent:(BOOL)granted;
-+ (BOOL)getPrivacyConsent;
++ (void)setPrivacyConsent:(BOOL)granted NS_REFINED_FOR_SWIFT;
++ (BOOL)getPrivacyConsent NS_REFINED_FOR_SWIFT;
 /**
  * Tells your application if privacy consent is still needed from the current device.
  * Consent should be provided prior to the invocation of `initialize` to ensure compliance.
  */
-+ (BOOL)requiresPrivacyConsent;
-+ (void)setRequiresPrivacyConsent:(BOOL)required;
-
-#pragma mark Permission, Subscription, and Email Observers
++ (BOOL)requiresPrivacyConsent NS_REFINED_FOR_SWIFT;
++ (void)setRequiresPrivacyConsent:(BOOL)required NS_REFINED_FOR_SWIFT;
 
 #pragma mark In-App Messaging
 + (Class<OSInAppMessages>)InAppMessages NS_REFINED_FOR_SWIFT;
@@ -107,7 +105,7 @@ NS_SWIFT_NAME(login(externalId:token:));
 #pragma mark Location
 + (Class<OSLocation>)Location NS_REFINED_FOR_SWIFT;
 
-#pragma mark Outcomes
+#pragma mark Session
 + (Class<OSSession>)Session NS_REFINED_FOR_SWIFT;
 
 #pragma mark Extension
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalLocation.h b/iOS_SDK/OneSignalSDK/Source/OneSignalLocation.h
index 1ac7a0f1a..54d7bdebe 100644
--- a/iOS_SDK/OneSignalSDK/Source/OneSignalLocation.h
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignalLocation.h
@@ -45,8 +45,8 @@ typedef struct os_last_location {
 @protocol OSLocation <NSObject>
 // - Request and track user's location
 + (void)requestPermission;
-+ (void)setShared:(BOOL)enable;
-+ (BOOL)isShared;
++ (void)setShared:(BOOL)enable NS_REFINED_FOR_SWIFT;
++ (BOOL)isShared NS_REFINED_FOR_SWIFT;
 @end
 
 @interface OneSignalLocation : NSObject<OSLocation>
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalSwiftInterface.swift b/iOS_SDK/OneSignalSDK/Source/OneSignalSwiftInterface.swift
index aef62bc31..5ab4b6318 100644
--- a/iOS_SDK/OneSignalSDK/Source/OneSignalSwiftInterface.swift
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignalSwiftInterface.swift
@@ -55,4 +55,72 @@ public extension OneSignal {
     static var Location: OSLocation.Type {
         return __location()
     }
+
+    static var requiresPrivacyConsent: Bool {
+        get {
+            return __requiresPrivacyConsent()
+        }
+        set {
+            __setRequiresPrivacyConsent(newValue)
+        }
+    }
+
+    static var privacyConsent: Bool {
+        get {
+            return __getPrivacyConsent()
+        }
+        set {
+            __setPrivacyConsent(newValue)
+        }
+    }
+}
+
+public extension OSInAppMessages {
+    static var Paused: Bool {
+        get {
+            return __paused()
+        }
+        set {
+            __paused(newValue)
+        }
+    }
+}
+
+public extension OSSession {
+    static func addOutcome(_ name: String, _ value: NSNumber) {
+        __addOutcome(withValue: name, value: value)
+    }
+}
+
+public extension OSNotifications {
+    static var permission: Bool {
+        return __permission()
+    }
+
+    static var canRequestPermission: Bool {
+        return __canRequestPermission()
+    }
+
+    static func registerForProvisionalAuthorization(_ block: OSUserResponseBlock?) {
+        return __register(forProvisionalAuthorization: block)
+    }
+
+    static func addPermissionObserver(_ observer: OSPermissionObserver) {
+        return __add(observer)
+    }
+
+    static func removePermissionObserver(_ observer: OSPermissionObserver) {
+        return __remove(observer)
+    }
+}
+
+public extension OSLocation {
+    static var isShared: Bool {
+        get {
+            return __isShared()
+        }
+        set {
+            __setShared(newValue)
+        }
+    }
 }
diff --git a/iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m b/iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m
index ab00a7e56..45f6e4d7b 100644
--- a/iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m
+++ b/iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m
@@ -1852,7 +1852,7 @@ - (void)testAddingSharedKeysIfMissing {
     
     // 2. Remove shared keys to simulate the state of coming from a pre-2.12.1 version
     [OneSignalUserDefaults.initShared removeValueForKey:OSUD_APP_ID];
-    [OneSignalUserDefaults.initShared removeValueForKey:OSUD_PLAYER_ID_TO];
+    [OneSignalUserDefaults.initShared removeValueForKey:OSUD_PUSH_SUBSCRIPTION_ID];
 
     // 3. Restart app
     [UnitTestCommonMethods backgroundApp];
@@ -1861,7 +1861,7 @@ - (void)testAddingSharedKeysIfMissing {
     
     // 4. Ensure values are present again
     XCTAssertNotNil([OneSignalUserDefaults.initShared getSavedSetForKey:OSUD_APP_ID defaultValue:nil]);
-    XCTAssertNotNil([OneSignalUserDefaults.initShared getSavedSetForKey:OSUD_PLAYER_ID_TO defaultValue:nil]);
+    XCTAssertNotNil([OneSignalUserDefaults.initShared getSavedSetForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil]);
 }
 
 // iOS 10 - Notification Service Extension test - local file
diff --git a/iOS_SDK/OneSignalSDK/UnitTests/UserModelSwiftTests.swift b/iOS_SDK/OneSignalSDK/UnitTests/UserModelSwiftTests.swift
index 59051ad75..e1927aabb 100644
--- a/iOS_SDK/OneSignalSDK/UnitTests/UserModelSwiftTests.swift
+++ b/iOS_SDK/OneSignalSDK/UnitTests/UserModelSwiftTests.swift
@@ -28,17 +28,6 @@
 import XCTest
 import OneSignalFramework
 
-extension OSInAppMessages {
-    static var Paused: Bool {
-        get {
-            return __paused()
-        }
-        set {
-            __paused(newValue)
-        }
-    }
-}
-
 // Non-class type 'OSPushSubscriptionTestObserver' cannot conform to class protocol 'OSPushSubscriptionObserver'
 // ^ Cannot use a struct for an OSPushSubscriptionObserver
 
@@ -200,7 +189,7 @@ class UserModelSwiftTests: XCTestCase {
         OneSignal.InAppMessages.Paused = true
         let paused = OneSignal.InAppMessages.Paused
     }
-    
+
     func testJWTTokenExpired() {
         OneSignal.User.onJwtExpired { externalId, completion in
             let newToken = externalId + "newtokenbasedonexternalid"