diff --git a/backup-server/src/server.js b/backup-server/src/server.js
index 35307e8c..dfdb2ff5 100644
--- a/backup-server/src/server.js
+++ b/backup-server/src/server.js
@@ -16,7 +16,7 @@ const challenges = new Map(); // pubkey -> {challenge, expires}
 
 const signedMessagePrefix = 'react-native-ldk backup server auth:';
 
-let labels = [
+const ldkLabels = [
     'ping',
     'channel_manager',
     'channel_monitor',
@@ -29,6 +29,15 @@ let labels = [
     'payments_sent',
     'bolt11_invoices',
 ];
+const bitkitLabels = [
+    'bitkit_settings',
+    'bitkit_widgets',
+    'bitkit_metadata',
+    'bitkit_blocktank_orders',
+    'bitkit_slashtags_contacts',
+];
+const labels = [...ldkLabels, ...bitkitLabels];
+
 let networks = ['bitcoin', 'testnet', 'regtest', 'signet'];
 
 const version = 'v1';
@@ -264,6 +273,7 @@ fastify.route({
             type: 'object',
             properties: {
                 network: { type: 'string', enum: networks },
+                fileGroup: { type: 'string', enum: ['all', 'bitkit', 'ldk'] },
             },
             required: ['network'],
         },
@@ -272,12 +282,22 @@ fastify.route({
     handler: async (request, reply) => {
         const {query, headers} = request;
 
-        const {network} = query;
+        const {network, fileGroup} = query;
         const bearerToken = headers.authorization;
         const {pubkey} = users.get(bearerToken);
 
-        const list = await storage.list({pubkey, network});
-        const channelMonitorList = await storage.list({pubkey, network, subdir: 'channel_monitors'});
+        let list = await storage.list({pubkey, network});
+        let channelMonitorList = await storage.list({pubkey, network, subdir: 'channel_monitors'});
+
+        //If not set then assume older version of the app
+        if (!fileGroup || fileGroup === 'ldk') {
+            list = list.filter(file => ldkLabels.includes(file.replace('.bin', '')));
+        } else if (fileGroup === 'bitkit') {
+            list = list.filter(file => bitkitLabels.includes(file.replace('.bin', '')));
+            channelMonitorList = [];
+        } else if (fileGroup === 'all') {
+            //Do nothing
+        }
 
         const allFiles = {
             list,
diff --git a/example/Dev.tsx b/example/Dev.tsx
index bbe08573..e189f77d 100644
--- a/example/Dev.tsx
+++ b/example/Dev.tsx
@@ -645,6 +645,46 @@ const Dev = (): ReactElement => {
 							setMessage(res.value);
 						}}
 					/>
+
+					<Button
+						title={'List backed up files'}
+						onPress={async (): Promise<void> => {
+							setMessage('Backing up...');
+							const res = await ldk.backupListFiles();
+							if (res.isErr()) {
+								setMessage(res.error.message);
+								return;
+							}
+
+							setMessage(JSON.stringify(res.value));
+						}}
+					/>
+
+					<Button
+						title={'Test file backup'}
+						onPress={async (): Promise<void> => {
+							setMessage('Backing up...');
+							const content = `look at me I'm a file ${Date().toString()}`;
+							const res = await ldk.backupFile('ping', content);
+							if (res.isErr()) {
+								setMessage(res.error.message);
+								return;
+							}
+
+							const res2 = await ldk.fetchBackupFile('ping');
+							if (res2.isErr()) {
+								setMessage(res2.error.message);
+								return;
+							}
+
+							if (res2.value !== content) {
+								setMessage('File backup failed');
+								return;
+							}
+
+							setMessage(`Retrieved remote content: "${res2.value}"`);
+						}}
+					/>
 				</View>
 			</ScrollView>
 
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 524f4c6d..3ce70f19 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -375,7 +375,7 @@ PODS:
   - React-jsinspector (0.72.4)
   - React-logger (0.72.4):
     - glog
-  - react-native-ldk (0.0.125):
+  - react-native-ldk (0.0.127):
     - React
   - react-native-randombytes (3.6.1):
     - React-Core
@@ -723,7 +723,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: c7f826e40fa9cab5d37cab6130b1af237332b594
   React-jsinspector: aaed4cf551c4a1c98092436518c2d267b13a673f
   React-logger: da1ebe05ae06eb6db4b162202faeafac4b435e77
-  react-native-ldk: c78b18c8c8fe218481721f7083e3e0f825aa957e
+  react-native-ldk: 4ab3d26d5e1356313c572814289cc516dc18dd88
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
   react-native-tcp-socket: c1b7297619616b4c9caae6889bcb0aba78086989
   React-NativeModulesApple: edb5ace14f73f4969df6e7b1f3e41bef0012740f
diff --git a/example/ldk/index.ts b/example/ldk/index.ts
index f8172152..f31f73dd 100644
--- a/example/ldk/index.ts
+++ b/example/ldk/index.ts
@@ -109,6 +109,15 @@ export const setupLdk = async (
 			return err(storageRes.error);
 		}
 
+		const res = await ldk.backupSetup({
+			network: ldkNetwork(selectedNetwork),
+			seed: account.seed,
+			details: backupServerDetails!,
+		});
+		if (res.isErr()) {
+			return err(res.error);
+		}
+
 		const lmStart = await lm.start({
 			getBestBlock,
 			account,
@@ -140,7 +149,7 @@ export const setupLdk = async (
 				manually_accept_inbound_channels: true,
 			},
 			trustedZeroConfPeers: [peers.lnd.pubKey],
-			backupServerDetails,
+			skipRemoteBackups: !backupServerDetails,
 		});
 
 		if (lmStart.isErr()) {
diff --git a/example/tests/lnd.ts b/example/tests/lnd.ts
index 9557eba6..d0d3ede1 100644
--- a/example/tests/lnd.ts
+++ b/example/tests/lnd.ts
@@ -101,6 +101,19 @@ describe('LND', function () {
 			// seed: account.seed,
 		});
 		await profile.init();
+
+		// const res = await ldk.backupSetup({
+		// 	network: 'regtest',
+		// 	seed: profile.seed,
+		// 	details: {
+		// 		host: 'http://127.0.0.1:3003',
+		// 		serverPubKey:
+		// 			'0319c4ff23820afec0c79ce3a42031d7fef1dff78b7bdd69b5560684f3e1827675',
+		// 	},
+		// });
+		// if (res.isErr()) {
+		// 	throw res.error;
+		// }
 	});
 
 	afterEach(async function () {
diff --git a/example/tests/utils/test-profile.ts b/example/tests/utils/test-profile.ts
index 248be743..ebe1baa0 100644
--- a/example/tests/utils/test-profile.ts
+++ b/example/tests/utils/test-profile.ts
@@ -86,17 +86,8 @@ export default class TestProfile {
 			network: ldkNetwork(this.network),
 			// forceCloseOnStartup: { forceClose: true, broadcastLatestTx: false },
 			forceCloseOnStartup: undefined,
+			skipRemoteBackups: true,
 			// trustedZeroConfPeers: [],
-			backupServerDetails: {
-				host: 'https://blocktank.synonym.to/staging-backups-ldk',
-				serverPubKey:
-					'02c03b8b8c1b5500b622646867d99bf91676fac0f38e2182c91a9ff0d053a21d6d',
-			},
-			// backupServerDetails: {
-			// 	host: 'http://127.0.0.1:3003',
-			// 	serverPubKey:
-			// 		'0319c4ff23820afec0c79ce3a42031d7fef1dff78b7bdd69b5560684f3e1827675',
-			// },
 		};
 	};
 
diff --git a/lib/android/src/main/java/com/reactnativeldk/LdkModule.kt b/lib/android/src/main/java/com/reactnativeldk/LdkModule.kt
index e3ed29c7..38a663ee 100644
--- a/lib/android/src/main/java/com/reactnativeldk/LdkModule.kt
+++ b/lib/android/src/main/java/com/reactnativeldk/LdkModule.kt
@@ -33,7 +33,6 @@ enum class EventTypes {
     register_tx,
     register_output,
     broadcast_transaction,
-    backup,
     channel_manager_funding_generation_ready,
     channel_manager_payment_claimable,
     channel_manager_payment_sent,
@@ -94,6 +93,7 @@ enum class LdkErrors {
     backup_setup_failed,
     backup_restore_failed,
     backup_restore_failed_existing_files,
+    backup_file_failed,
     scorer_download_fail
 }
 
@@ -122,6 +122,7 @@ enum class LdkCallbackResponses {
     backup_client_setup_success,
     backup_restore_success,
     backup_client_check_success,
+    backup_file_success,
     scorer_download_success,
     scorer_download_skip
 }
@@ -1291,6 +1292,35 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
             handleReject(promise, LdkErrors.backup_check_failed, Error(e))
         }
     }
+
+    @ReactMethod
+    fun backupFile(fileName: String, content: String, promise: Promise) {
+        if (BackupClient.requiresSetup) {
+            return handleReject(promise, LdkErrors.backup_setup_required)
+        }
+
+        BackupClient.addToPersistQueue(BackupClient.Label.MISC(fileName), content.toByteArray(Charsets.UTF_8)) { error ->
+            if (error != null) {
+                handleReject(promise, LdkErrors.backup_file_failed, Error(error))
+            } else {
+                handleResolve(promise, LdkCallbackResponses.backup_file_success)
+            }
+        }
+    }
+
+    @ReactMethod
+    fun fetchBackupFile(fileName: String, promise: Promise) {
+        if (BackupClient.requiresSetup) {
+            return handleReject(promise, LdkErrors.backup_setup_required)
+        }
+
+        try {
+            val bytes = BackupClient.retrieve(BackupClient.Label.MISC(fileName))
+            promise.resolve(bytes.toString(Charsets.UTF_8))
+        } catch (e: Exception) {
+            handleReject(promise, LdkErrors.backup_file_failed, Error(e))
+        }
+    }
 }
 
 object LdkEventEmitter {
diff --git a/lib/android/src/main/java/com/reactnativeldk/classes/BackupClient.kt b/lib/android/src/main/java/com/reactnativeldk/classes/BackupClient.kt
index da9fb6e5..98cd7028 100644
--- a/lib/android/src/main/java/com/reactnativeldk/classes/BackupClient.kt
+++ b/lib/android/src/main/java/com/reactnativeldk/classes/BackupClient.kt
@@ -40,7 +40,7 @@ class CompleteBackup(
     val channelFiles: Map<String, ByteArray>
 )
 
-typealias BackupCompleteCallback = () -> Unit
+typealias BackupCompleteCallback = (Exception?) -> Unit
 
 class BackupQueueEntry(
     val uuid: UUID,
@@ -141,6 +141,10 @@ class BackupClient {
                 urlString += "&channelId=${label.channelId}"
             }
 
+            if (method == Method.LIST) {
+                urlString += "&fileGroup=ldk"
+            }
+
             return URL(urlString)
         }
 
@@ -508,9 +512,9 @@ class BackupClient {
         }
 
         //Backup queue management
-        fun addToPersistQueue(label: BackupClient.Label, bytes: ByteArray, callback: (() -> Unit)? = null) {
+        fun addToPersistQueue(label: Label, bytes: ByteArray, callback: BackupCompleteCallback? = null) {
             if (BackupClient.skipRemoteBackup) {
-                callback?.invoke()
+                callback?.invoke(null)
                 LdkEventEmitter.send(
                     EventTypes.native_log,
                     "Skipping remote backup queue append for ${label.string}"
@@ -548,12 +552,13 @@ class BackupClient {
             Thread {
                 try {
                     persist(backupEntry!!.label, backupEntry.bytes, 10)
-                    backupEntry.callback?.invoke()
+                    backupEntry.callback?.invoke(null)
                 } catch (e: Exception) {
                     LdkEventEmitter.send(
                         EventTypes.native_log,
                         "Remote persist failed for ${label.string} with error ${e.message}"
                     )
+                    backupEntry?.callback?.invoke(e)
                 } finally {
                     backupQueueLock.lock()
                     try {
diff --git a/lib/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt b/lib/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt
index 9dcf1a6b..5a4e8121 100644
--- a/lib/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt
+++ b/lib/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt
@@ -185,14 +185,16 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
 
     override fun persist_manager(channel_manager_bytes: ByteArray?) {
         if (channel_manager_bytes != null && LdkModule.accountStoragePath != "") {
-            BackupClient.addToPersistQueue(BackupClient.Label.CHANNEL_MANAGER(), channel_manager_bytes) {
-                LdkEventEmitter.send(EventTypes.native_log, "Remote persisted channel manager to disk")
+            BackupClient.addToPersistQueue(BackupClient.Label.CHANNEL_MANAGER(), channel_manager_bytes) { error ->
+                if (error != null) {
+                    LdkEventEmitter.send(EventTypes.native_log, "Failed to remotely persist channel manager to disk")
+                } else {
+                    LdkEventEmitter.send(EventTypes.native_log, "Remote persisted channel manager to disk")
+                }
             }
 
             File(LdkModule.accountStoragePath + "/" + LdkFileNames.channel_manager.fileName).writeBytes(channel_manager_bytes)
-
             LdkEventEmitter.send(EventTypes.native_log, "Locally persisted channel manager to disk")
-            LdkEventEmitter.send(EventTypes.backup, "")
         }
     }
 
@@ -324,8 +326,6 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
         } catch (e: Exception) {
             LdkEventEmitter.send(EventTypes.native_log, "Error could not read existing ChannelOpenedWithNewCustomKeysManager")
         }
-
-        println("**** existingIds: $existingIds")
     }
 
     private fun channelWasOpenedWithNewCustomKeysManager(channelId: ByteArray): Boolean {
diff --git a/lib/android/src/main/java/com/reactnativeldk/classes/LdkPersister.kt b/lib/android/src/main/java/com/reactnativeldk/classes/LdkPersister.kt
index 3be7bf54..b0fa23a5 100644
--- a/lib/android/src/main/java/com/reactnativeldk/classes/LdkPersister.kt
+++ b/lib/android/src/main/java/com/reactnativeldk/classes/LdkPersister.kt
@@ -24,7 +24,20 @@ class LdkPersister {
 
             val isNew = !file.exists()
 
-            BackupClient.addToPersistQueue(BackupClient.Label.CHANNEL_MONITOR(channelId=channelId), data.write()) {
+            if (BackupClient.skipRemoteBackup) {
+                file.writeBytes(data.write())
+                if (isNew) {
+                    LdkEventEmitter.send(EventTypes.new_channel, body)
+                }
+                return ChannelMonitorUpdateStatus.LDKChannelMonitorUpdateStatus_Completed
+            }
+
+            BackupClient.addToPersistQueue(BackupClient.Label.CHANNEL_MONITOR(channelId=channelId), data.write()) { error ->
+                if (error != null) {
+                    LdkEventEmitter.send(EventTypes.native_log, "Failed to persist channel (${id.to_channel_id().hexEncodedString()}) to remote backup: $error")
+                    return@addToPersistQueue
+                }
+
                 try {
                     file.writeBytes(data.write())
                 } catch (e: Exception) {
@@ -33,20 +46,18 @@ class LdkPersister {
                     return@addToPersistQueue
                 }
 
-                //Update chainmonitor with successful persist
+                //Update chain monitor with successful persist
                 val res = LdkModule.chainMonitor?.channel_monitor_updated(id, update_id)
                 if (res == null || !res.is_ok) {
                     LdkEventEmitter.send(EventTypes.native_log, "Failed to update chain monitor with persisted channel (${id.to_channel_id().hexEncodedString()})")
                 } else {
                     LdkEventEmitter.send(EventTypes.native_log, "Persisted channel (${id.to_channel_id().hexEncodedString()}) to disk")
-                    LdkEventEmitter.send(EventTypes.backup, "")
+                    if (isNew) {
+                        LdkEventEmitter.send(EventTypes.new_channel, body)
+                    }
                 }
             }
 
-            if (isNew) {
-                LdkEventEmitter.send(EventTypes.new_channel, body)
-            }
-
             return ChannelMonitorUpdateStatus.LDKChannelMonitorUpdateStatus_InProgress
         } catch (e: Exception) {
             return ChannelMonitorUpdateStatus.LDKChannelMonitorUpdateStatus_UnrecoverableError
diff --git a/lib/ios/Classes/BackupClient.swift b/lib/ios/Classes/BackupClient.swift
index c7cb0e98..3cc210df 100644
--- a/lib/ios/Classes/BackupClient.swift
+++ b/lib/ios/Classes/BackupClient.swift
@@ -145,6 +145,12 @@ class BackupClient {
             urlString = "\(urlString)&channelId=\(id)"
         }
         
+        //Only include files related to this library
+        if method == .list {
+            //TODO add this to android
+            urlString = "\(urlString)&fileGroup=ldk"
+        }
+        
         return URL(string: urlString)!
     }
     
@@ -393,7 +399,7 @@ class BackupClient {
     
     static func retrieveCompleteBackup() throws -> CompleteBackup {
         let backedUpFilenames = try listFiles()
-        
+                
         var allFiles: [String: Data] = [:]
         var channelFiles: [String: Data] = [:]
 
@@ -586,9 +592,9 @@ class BackupClient {
 
 //Backup queue management
 extension BackupClient {
-    static func addToPersistQueue(_ label: Label, _ bytes: [UInt8], callback: (() -> Void)? = nil) {
+    static func addToPersistQueue(_ label: Label, _ bytes: [UInt8], callback: ((Error?) -> Void)? = nil) {
         guard !skipRemoteBackup else {
-            callback?()
+            callback?(nil)
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Skipping remote backup queue append for \(label.string)")
             return
         }
@@ -618,9 +624,10 @@ extension BackupClient {
         backupQueue.async {
             do {
                 try persist(label, bytes, retry: 10)
-                callback?()
+                callback?(nil)
             } catch {
-                LdkEventEmitter.shared.send(withEvent: .native_log, body: "Failed to persist channel manager backup. \(error.localizedDescription)")
+                LdkEventEmitter.shared.send(withEvent: .native_log, body: "Failed to persist remote backup \(label.string). \(error.localizedDescription)")
+                callback?(error)
             }
         }
     }
diff --git a/lib/ios/Classes/LdkChannelManagerPersister.swift b/lib/ios/Classes/LdkChannelManagerPersister.swift
index 7f0e232a..8ba39e9c 100644
--- a/lib/ios/Classes/LdkChannelManagerPersister.swift
+++ b/lib/ios/Classes/LdkChannelManagerPersister.swift
@@ -312,17 +312,19 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
         guard let managerStorage = Ldk.accountStoragePath?.appendingPathComponent(LdkFileNames.channel_manager.rawValue) else {
             return Result_NoneIOErrorZ.initWithErr(e: .Other)
         }
-        
+                
         do {
-            BackupClient.addToPersistQueue(.channelManager, channelManager.write()) {
-                LdkEventEmitter.shared.send(withEvent: .native_log, body: "Remote persisted channel manager")
+            BackupClient.addToPersistQueue(.channelManager, channelManager.write()) { error in
+                if let error {
+                    LdkEventEmitter.shared.send(withEvent: .native_log, body: "Failed to remote persist channel manager Error: \(error.localizedDescription)")
+                } else {
+                    LdkEventEmitter.shared.send(withEvent: .native_log, body: "Remote persisted channel manager")
+                }
             }
             
             try Data(channelManager.write()).write(to: managerStorage)
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Persisted channel manager to disk")
-            
-            LdkEventEmitter.shared.send(withEvent: .backup, body: "")
-            
+                        
             return Result_NoneIOErrorZ.initWithOk()
         } catch {
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Error. Failed to persist channel manager to disk Error \(error.localizedDescription).")
diff --git a/lib/ios/Classes/LdkPersist.swift b/lib/ios/Classes/LdkPersist.swift
index cd7e3d2d..949c4f36 100644
--- a/lib/ios/Classes/LdkPersist.swift
+++ b/lib/ios/Classes/LdkPersist.swift
@@ -22,8 +22,22 @@ class LdkPersister: Persist {
             }
             
             let isNew = !FileManager().fileExists(atPath: channelStoragePath.path)
-                        
-            BackupClient.addToPersistQueue(.channelMonitor(id: channelIdHex), data.write()) {
+            
+            //If we're not remotely backing up no need to update status later
+            if BackupClient.skipRemoteBackup {
+                try Data(data.write()).write(to: channelStoragePath)
+                if isNew {
+                    LdkEventEmitter.shared.send(withEvent: .new_channel, body: body)
+                }
+                return ChannelMonitorUpdateStatus.Completed
+            }
+                         
+            BackupClient.addToPersistQueue(.channelMonitor(id: channelIdHex), data.write()) { error in
+                if let error {
+                    LdkEventEmitter.shared.send(withEvent: .native_log, body: "Error. Failed persist channel on remote server (\(channelIdHex)). \(error.localizedDescription)")
+                    return
+                }
+                
                 //Callback for when the persist queue queue entry is processed
                 do {
                     try Data(data.write()).write(to: channelStoragePath)
@@ -32,24 +46,19 @@ class LdkPersister: Persist {
                     LdkEventEmitter.shared.send(withEvent: .native_log, body: "Error. Failed to locally persist channel (\(channelIdHex)). \(error.localizedDescription)")
                     return
                 }
-                
+                                
                 //Update chainmonitor with successful persist
                 let res = Ldk.chainMonitor?.channelMonitorUpdated(fundingTxo: channelId, completedUpdateId: updateId)
                 if let error = res?.getError() {
                     LdkEventEmitter.shared.send(withEvent: .native_log, body: "Error. Failed to update chain monitor for channel (\(channelIdHex)) Error \(error.getValueType()).")
                 } else {
                     LdkEventEmitter.shared.send(withEvent: .native_log, body: "Persisted channel \(channelIdHex). Update ID: \(updateId.hash())")
-                    LdkEventEmitter.shared.send(withEvent: .backup, body: "") //TODO remove after old backup is deprecated
+                    if isNew {
+                        LdkEventEmitter.shared.send(withEvent: .new_channel, body: body)
+                    }
                 }
             }
             
-            if isNew {
-                LdkEventEmitter.shared.send(
-                    withEvent: .new_channel,
-                    body: body
-                )
-            }
-            
             return ChannelMonitorUpdateStatus.InProgress
         } catch {
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Error. Failed to persist channel (\(channelIdHex)) to disk Error \(error.localizedDescription).")
diff --git a/lib/ios/Ldk.m b/lib/ios/Ldk.m
index e77c9317..0b3b2711 100644
--- a/lib/ios/Ldk.m
+++ b/lib/ios/Ldk.m
@@ -187,7 +187,13 @@ @interface RCT_EXTERN_MODULE(Ldk, NSObject)
                   reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(backupListFiles:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
-
+RCT_EXTERN_METHOD(backupFile:(NSString *)fileName
+                  content:(NSString *)content
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(fetchBackupFile:(NSString *)fileName
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 @end
 
 //MARK: Events
diff --git a/lib/ios/Ldk.swift b/lib/ios/Ldk.swift
index f66369d2..f9b30a5b 100644
--- a/lib/ios/Ldk.swift
+++ b/lib/ios/Ldk.swift
@@ -8,7 +8,6 @@ enum EventTypes: String, CaseIterable {
     case register_tx = "register_tx"
     case register_output = "register_output"
     case broadcast_transaction = "broadcast_transaction"
-    case backup = "backup"
     case channel_manager_funding_generation_ready = "channel_manager_funding_generation_ready"
     case channel_manager_payment_claimable = "channel_manager_payment_claimable"
     case channel_manager_payment_sent = "channel_manager_payment_sent"
@@ -73,6 +72,8 @@ enum LdkErrors: String {
     case backup_restore_failed = "backup_restore_failed"
     case backup_restore_failed_existing_files = "backup_restore_failed_existing_files"
     case backup_list_files_failed = "backup_list_files_failed"
+    case backup_fetch_file_failed = "backup_fetch_file_failed"
+    case backup_file_failed = "backup_file_failed"
     case scorer_download_fail = "scorer_download_fail"
 }
 
@@ -102,6 +103,7 @@ enum LdkCallbackResponses: String {
     case backup_client_setup_success = "backup_client_setup_success"
     case backup_restore_success = "backup_restore_success"
     case backup_client_check_success = "backup_client_check_success"
+    case backup_file_success = "backup_file_success"
     case scorer_download_success = "scorer_download_success"
     case scorer_download_skip = "scorer_download_skip"
 }
@@ -1386,6 +1388,41 @@ class Ldk: NSObject {
             handleReject(reject, .backup_list_files_failed, error, error.localizedDescription)
         }
     }
+    
+    @objc
+    func backupFile(_ fileName: NSString, content: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        guard !BackupClient.requiresSetup else {
+            return handleReject(reject, .backup_setup_required)
+        }
+        
+        guard let data = String(content).data(using: .utf8) else {
+            return
+        }
+        
+        let bytes = [UInt8](data)
+            
+        BackupClient.addToPersistQueue(.misc(fileName: String(fileName)), bytes) { error in
+            if let error {
+                handleReject(reject, .backup_file_failed, error, error.localizedDescription)
+                return
+            }
+            handleResolve(resolve, .backup_file_success)
+        }
+    }
+    
+    @objc
+    func fetchBackupFile(_ fileName: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        guard !BackupClient.requiresSetup else {
+            return handleReject(reject, .backup_setup_required)
+        }
+            
+        do {
+            let data = try BackupClient.retrieve(.misc(fileName: String(fileName)))
+            resolve(String.init(data: data, encoding: .utf8))
+        } catch {
+            handleReject(reject, .backup_fetch_file_failed, error, error.localizedDescription)
+        }
+    }
 }
 
 //MARK: Singleton react native event emitter
diff --git a/lib/package.json b/lib/package.json
index 560f6a56..a9419d9c 100644
--- a/lib/package.json
+++ b/lib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@synonymdev/react-native-ldk",
   "title": "React Native LDK",
-  "version": "0.0.126",
+  "version": "0.0.127",
   "description": "React Native wrapper for LDK",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
diff --git a/lib/src/ldk.ts b/lib/src/ldk.ts
index 137d6250..d9de28de 100644
--- a/lib/src/ldk.ts
+++ b/lib/src/ldk.ts
@@ -1294,7 +1294,7 @@ class LDK {
 	/**
 	 * Runs a self check by creating random string, encrypting, backing up, fetching, decrypting and validating content.
 	 */
-	async backupSelfCheck(): Promise<Result<boolean>> {
+	async backupSelfCheck(): Promise<Result<string>> {
 		try {
 			const res = await NativeLDK.backupSelfCheck();
 			return ok(res);
@@ -1314,6 +1314,24 @@ class LDK {
 			return err(e);
 		}
 	}
+
+	async backupFile(fileName: string, content: string): Promise<Result<string>> {
+		try {
+			const res = await NativeLDK.backupFile(fileName, content);
+			return ok(res);
+		} catch (e) {
+			return err(e);
+		}
+	}
+
+	async fetchBackupFile(fileName: string): Promise<Result<string>> {
+		try {
+			const res = await NativeLDK.fetchBackupFile(fileName);
+			return ok(res);
+		} catch (e) {
+			return err(e);
+		}
+	}
 }
 
 export default new LDK();
diff --git a/lib/src/lightning-manager.ts b/lib/src/lightning-manager.ts
index e68b146b..fc8a1f7b 100644
--- a/lib/src/lightning-manager.ts
+++ b/lib/src/lightning-manager.ts
@@ -1,7 +1,6 @@
 import ldk from './ldk';
 import { Err, err, ok, Result } from './utils/result';
 import {
-	DefaultLdkDataShape,
 	DefaultTransactionDataShape,
 	EEventTypes,
 	ELdkData,
@@ -41,7 +40,6 @@ import {
 	TLdkBroadcastedTransactions,
 	TChannelUpdate,
 	TPaymentReq,
-	TPaymentTimeoutReq,
 	TLdkPaymentIds,
 	TNetworkGraphUpdated,
 	TGetTransactionPosition,
@@ -111,11 +109,6 @@ class LightningManager {
 		name: '',
 		seed: '',
 	};
-	backupSubscriptions: {
-		[id: string]: (backup: Result<TAccountBackup>) => void;
-	} = {};
-	backupSubscriptionsId = 0;
-	backupSubscriptionsDebounceTimer: NodeJS.Timeout | undefined = undefined;
 	getTransactionData: TGetTransactionData =
 		async (): Promise<TTransactionData> => DefaultTransactionDataShape;
 	getTransactionPosition: TGetTransactionPosition =
@@ -153,8 +146,6 @@ class LightningManager {
 	private pendingStartPromises: Array<(result: Result<string>) => void> = [];
 	private previousAccountName: string = '';
 
-	private backupsServerSetup = false;
-
 	constructor() {
 		// Step 0: Subscribe to all events
 		ldk.onEvent(EEventTypes.native_log, (line) => {
@@ -171,9 +162,6 @@ class LightningManager {
 			EEventTypes.broadcast_transaction,
 			this.onBroadcastTransaction.bind(this),
 		);
-
-		ldk.onEvent(EEventTypes.backup, this.onLdkBackupEvent.bind(this));
-
 		//Channel manager handle events:
 		ldk.onEvent(
 			EEventTypes.channel_manager_funding_generation_ready,
@@ -301,8 +289,8 @@ class LightningManager {
 		forceCloseOnStartup,
 		userConfig = defaultUserConfig,
 		trustedZeroConfPeers = [],
-		backupServerDetails,
 		skipParamCheck = false,
+		skipRemoteBackups = false,
 	}: TLdkStart): Promise<Result<string>> {
 		if (!account) {
 			return err(
@@ -466,15 +454,8 @@ class LightningManager {
 			);
 		}
 
-		if (backupServerDetails) {
-			promises.push(
-				ldk.backupSetup({
-					seed: account.seed,
-					network: this.network,
-					details: backupServerDetails,
-				}),
-			);
-			this.backupsServerSetup = true;
+		if (!skipRemoteBackups) {
+			promises.push(ldk.backupSelfCheck());
 		}
 
 		// Check for any errors before starting channel manager.
@@ -938,10 +919,10 @@ class LightningManager {
 	getPeers = async (): Promise<TLdkPeers> => {
 		const res = await ldk.readFromFile({ fileName: ELdkFiles.peers });
 		if (res.isOk()) {
-			return parseData(res.value.content, DefaultLdkDataShape.peers);
+			return parseData(res.value.content, []);
 		}
 
-		return DefaultLdkDataShape.peers;
+		return [];
 	};
 
 	/**
@@ -1156,112 +1137,6 @@ class LightningManager {
 		}
 	};
 
-	/**
-	 * Used to back up the data that corresponds with the provided account.
-	 * @param {TAccount} account
-	 * @param {boolean} includeTransactionHistory
-	 * @returns {TAccountBackup} This object can be stringified and used to import/restore this LDK account via importAccount.
-	 */
-	backupAccount = async ({
-		account,
-		includeTransactionHistory = false,
-	}: {
-		account: TAccount;
-		includeTransactionHistory?: boolean;
-	}): Promise<Result<TAccountBackup>> => {
-		console.warn(
-			'backupAccount() is deprecated and will be removed in future versions. Use remote backup server instead.',
-		);
-		if (!this.baseStoragePath) {
-			return err(
-				'baseStoragePath required for wallet persistence. Call setBaseStoragePath(path) first.',
-			);
-		}
-
-		try {
-			if (!account || !this?.account) {
-				return err(
-					'No account provided. Please pass an account object containing the name & seed to the start method and try again.',
-				);
-			}
-			if (!account) {
-				account = this.account;
-			}
-			if (!account?.name || !account?.seed) {
-				return err(
-					'No account name or seed provided. Please pass an account object containing the name & seed to the start method and try again.',
-				);
-			}
-
-			const accountPath = appendPath(this.baseStoragePath, account.name);
-
-			//Get serialised channel manager
-			const channelManagerRes = await ldk.readFromFile({
-				fileName: ELdkFiles.channel_manager,
-				path: accountPath,
-				format: 'hex',
-			});
-			if (channelManagerRes.isErr()) {
-				return err(channelManagerRes.error);
-			}
-
-			//Get serialised channels
-			const listChannelsRes = await ldk.listChannelFiles();
-			if (listChannelsRes.isErr()) {
-				return err(listChannelsRes.error);
-			}
-
-			let channel_monitors: { [key: string]: string } = {};
-			for (let index = 0; index < listChannelsRes.value.length; index++) {
-				const fileName = listChannelsRes.value[index];
-
-				const serialisedChannelRes = await ldk.readFromFile({
-					fileName,
-					path: appendPath(accountPath, ELdkFiles.channels),
-					format: 'hex',
-				});
-				if (serialisedChannelRes.isErr()) {
-					return err(serialisedChannelRes.error);
-				}
-
-				channel_monitors[fileName.replace('.bin', '')] =
-					serialisedChannelRes.value.content;
-			}
-
-			const accountBackup: TAccountBackup = {
-				account,
-				data: {
-					channel_manager: channelManagerRes.value.content,
-					channel_monitors: channel_monitors,
-					peers: await this.getPeers(),
-					unconfirmed_transactions: await this.getLdkUnconfirmedTxs(),
-					broadcasted_transactions: await this.getLdkBroadcastedTxs(),
-					payment_ids: await this.getLdkPaymentIds(),
-					spendable_outputs: await this.getLdkSpendableOutputs(),
-					payments_claimed: [],
-					payments_sent: [],
-					bolt11_invoices: [],
-					timestamp: Date.now(),
-				},
-				package_version: require('../package.json').version,
-				network: this.network,
-			};
-
-			//Backups can become large, so we only include transaction history if requested.
-			if (includeTransactionHistory) {
-				accountBackup.data = {
-					...accountBackup.data,
-					payments_claimed: await this.getLdkPaymentsClaimed(),
-					payments_sent: await this.getLdkPaymentsSent(),
-					bolt11_invoices: await this.getBolt11Invoices(),
-				};
-			}
-			return ok(accountBackup);
-		} catch (e) {
-			return err(e);
-		}
-	};
-
 	payWithTimeout = async ({
 		paymentRequest,
 		amountSats,
@@ -1348,62 +1223,6 @@ class LightningManager {
 		this.paymentSentSubscription && this.paymentSentSubscription.remove();
 	};
 
-	/**
-	 * Subscribe to back up events and receive full backups to callback passed
-	 * @param callback
-	 * @returns {string}
-	 */
-	subscribeToBackups(
-		callback: (backup: Result<TAccountBackup>) => void,
-	): string {
-		console.warn(
-			'subscribeToBackups() is deprecated, use backup server instead.',
-		);
-		this.backupSubscriptionsId++;
-		const id = `${this.backupSubscriptionsId}`;
-		this.backupSubscriptions[id] = callback;
-		return id;
-	}
-
-	/**
-	 * Unsubscribe from backup events
-	 * @param id
-	 */
-	unsubscribeFromBackups(id: string): void {
-		console.warn(
-			'unsubscribeFromBackups() is deprecated, use backup server instead.',
-		);
-		if (this.backupSubscriptions[id]) {
-			delete this.backupSubscriptions[id];
-		}
-	}
-
-	/**
-	 * Handle native events triggering backups by debouncing and fetching data after
-	 * a timeout to avoid too many backup events being triggered right after each other.
-	 * @returns {Promise<void>}
-	 */
-	private async onLdkBackupEvent(): Promise<void> {
-		if (this.backupsServerSetup) {
-			return;
-		}
-		if (this.backupSubscriptionsDebounceTimer) {
-			clearTimeout(this.backupSubscriptionsDebounceTimer);
-		}
-
-		this.backupSubscriptionsDebounceTimer = setTimeout(async () => {
-			const backupRes = await this.backupAccount({ account: this.account });
-
-			//Process all subscriptions
-			Object.keys(this.backupSubscriptions).forEach((id) => {
-				const callback = this.backupSubscriptions[id];
-				if (callback) {
-					callback(backupRes);
-				}
-			});
-		}, 250);
-	}
-
 	/**
 	 * Returns change destination script for the provided address.
 	 * @param {string} address
@@ -1478,12 +1297,9 @@ class LightningManager {
 				fileName: ELdkFiles.unconfirmed_transactions,
 			});
 			if (res.isOk()) {
-				return parseData(
-					res.value.content,
-					DefaultLdkDataShape.unconfirmed_transactions,
-				);
+				return parseData(res.value.content, []);
 			}
-			return DefaultLdkDataShape.unconfirmed_transactions;
+			return [];
 		};
 
 	private getLdkPaymentIds = async (): Promise<TLdkPaymentIds> => {
@@ -1491,10 +1307,7 @@ class LightningManager {
 			fileName: ELdkFiles.payment_ids,
 		});
 		if (res.isOk()) {
-			let parsed = parseData(
-				res.value.content,
-				DefaultLdkDataShape.payment_ids,
-			);
+			let parsed = parseData(res.value.content, []);
 
 			//Temp patch for wallets with incorrectly written payment ID file formats. Can be removed after a few releases.
 			if (parsed.length === 64 && res.value.content.length === 66) {
@@ -1503,7 +1316,7 @@ class LightningManager {
 
 			return parsed;
 		}
-		return DefaultLdkDataShape.payment_ids;
+		return [];
 	};
 
 	private removeLdkPaymentId = async (paymentId: string): Promise<void> => {
@@ -1543,9 +1356,9 @@ class LightningManager {
 			fileName: ELdkFiles.payments_claimed,
 		});
 		if (res.isOk()) {
-			return parseData(res.value.content, DefaultLdkDataShape.payments_claimed);
+			return parseData(res.value.content, []);
 		}
-		return DefaultLdkDataShape.payments_claimed;
+		return [];
 	};
 
 	/**
@@ -1557,9 +1370,9 @@ class LightningManager {
 			fileName: ELdkFiles.payments_sent,
 		});
 		if (res.isOk()) {
-			return parseData(res.value.content, DefaultLdkDataShape.payments_sent);
+			return parseData(res.value.content, []);
 		}
-		return DefaultLdkDataShape.payments_sent;
+		return [];
 	};
 
 	//TODO Remove any stale payments from storage if stuck for 60min. No payment claim should be stuck that long.
@@ -1573,14 +1386,11 @@ class LightningManager {
 			fileName: ELdkFiles.bolt11_invoices,
 		});
 		if (res.isOk()) {
-			let parsed = parseData(
-				res.value.content,
-				DefaultLdkDataShape.bolt11_invoices,
-			);
+			let parsed = parseData(res.value.content, []);
 
 			return parsed;
 		}
-		return DefaultLdkDataShape.bolt11_invoices;
+		return [];
 	};
 
 	appendBolt11Invoice = async (bolt11: string): Promise<void> => {
@@ -1637,12 +1447,9 @@ class LightningManager {
 			fileName: ELdkFiles.spendable_outputs,
 		});
 		if (res.isOk()) {
-			return parseData(
-				res.value.content,
-				DefaultLdkDataShape.spendable_outputs,
-			);
+			return parseData(res.value.content, []);
 		}
-		return DefaultLdkDataShape.spendable_outputs;
+		return [];
 	};
 
 	/**
@@ -1654,12 +1461,9 @@ class LightningManager {
 			fileName: ELdkFiles.broadcasted_transactions,
 		});
 		if (res.isOk()) {
-			return parseData(
-				res.value.content,
-				DefaultLdkDataShape.broadcasted_transactions,
-			);
+			return parseData(res.value.content, []);
 		}
-		return DefaultLdkDataShape.broadcasted_transactions;
+		return [];
 	}
 
 	async rebroadcastAllKnownTransactions(): Promise<any[]> {
diff --git a/lib/src/utils/types.ts b/lib/src/utils/types.ts
index 89830195..21ca7d52 100644
--- a/lib/src/utils/types.ts
+++ b/lib/src/utils/types.ts
@@ -17,7 +17,6 @@ export enum EEventTypes {
 	register_tx = 'register_tx',
 	register_output = 'register_output',
 	broadcast_transaction = 'broadcast_transaction',
-	backup = 'backup',
 	channel_manager_funding_generation_ready = 'channel_manager_funding_generation_ready',
 	channel_manager_payment_claimable = 'channel_manager_payment_claimable',
 	channel_manager_payment_sent = 'channel_manager_payment_sent',
@@ -34,7 +33,6 @@ export enum EEventTypes {
 	new_channel = 'new_channel',
 	network_graph_updated = 'network_graph_updated',
 	channel_manager_restarted = 'channel_manager_restarted',
-	backup_failed = 'backup_failed',
 }
 
 //LDK event responses
@@ -493,6 +491,7 @@ export enum ELdkData {
 	bolt11_invoices = 'bolt11_invoices',
 }
 
+//Can be removed after importAccount is officially removed
 export type TLdkData = {
 	[ELdkData.channel_manager]: string;
 	[ELdkData.channel_monitors]: { [key: string]: string };
@@ -507,6 +506,7 @@ export type TLdkData = {
 	[ELdkData.bolt11_invoices]: TBolt11Invoices;
 };
 
+//Can be removed after importAccount is officially removed
 export type TAccountBackup = {
 	account: TAccount;
 	package_version: string;
@@ -531,20 +531,6 @@ export type TBolt11Invoices = string[];
 
 export type TLdkSpendableOutputs = string[];
 
-export const DefaultLdkDataShape: TLdkData = {
-	[ELdkData.channel_manager]: '',
-	[ELdkData.channel_monitors]: {},
-	[ELdkData.peers]: [],
-	[ELdkData.unconfirmed_transactions]: [],
-	[ELdkData.broadcasted_transactions]: [],
-	[ELdkData.payment_ids]: [],
-	[ELdkData.timestamp]: 0,
-	[ELdkData.spendable_outputs]: [],
-	[ELdkData.payments_claimed]: [],
-	[ELdkData.payments_sent]: [],
-	[ELdkData.bolt11_invoices]: [],
-};
-
 export type TAccount = {
 	name: string;
 	seed: string;
@@ -570,8 +556,8 @@ export type TLdkStart = {
 	forceCloseOnStartup?: TForceCloseOnStartup;
 	userConfig?: TUserConfig;
 	trustedZeroConfPeers?: string[];
-	backupServerDetails?: TBackupServerDetails;
 	skipParamCheck?: boolean;
+	skipRemoteBackups?: boolean;
 };
 
 export interface IAddress {