diff --git a/swift/README.md b/swift/README.md
index ade103ec8..56596b8f7 100644
--- a/swift/README.md
+++ b/swift/README.md
@@ -4,7 +4,7 @@
 
 After you have completed the [common prerequisites] you will need the following:
 
-- [Xcode](https://developer.apple.com/xcode/) 15 or greater
+- [Xcode](https://developer.apple.com/xcode/) 16 or greater (Required for Swift 6)
 
 ## Permissions (already configured)
 
@@ -13,7 +13,7 @@ After you have completed the [common prerequisites] you will need the following:
 ## Documentation
 
 - [Swift Install Guide](https://docs.ditto.live/install-guides/swift)
-- [Swift API Reference](https://software.ditto.live/cocoa/DittoSwift/4.8.2/api-reference/)
+- [Swift API Reference](https://software.ditto.live/cocoa/DittoSwift/5.0.0/api-reference/documentation/dittoswift/)
 - [Swift Release Notes](https://docs.ditto.live/release-notes/swift)
 
 [common prerequisites]: https://github.com/getditto/quickstart#common-prerequisites
@@ -22,8 +22,8 @@ After you have completed the [common prerequisites] you will need the following:
 
 Assuming you have Xcode and other prerequisites installed, you can build and run the app by following these steps:
 
-1. Create an application at <https://portal.ditto.live/>.  Make note of the app ID and online playground token.
-2. Copy the `.env.sample` file at the top level of the `quickstart` repo to `.env` and add your App ID , Online playground Token, Auth URL, and Websocket URL.
+1. Create an application at <https://portal.ditto.live/>.  Make note of the Database ID and Online Playground Token.
+2. Copy the `.env.sample` file at the top level of the `quickstart` repo to `.env` and add your Database ID (used to be called App ID), Online Playground Token, and Auth URL.
 3. Launch Xcode and open the `quickstart/swift/Tasks.xcodeproj` project.
 4. Navigate to the project **Signing & Capabilities** tab and modify the **Team** and **Bundle Identifier** settings to your Apple developer account credentials to provision building to your device.
 5. In Xcode, select a connected iOS device or iOS Simulator as the destination.
diff --git a/swift/Tasks.xcodeproj/project.pbxproj b/swift/Tasks.xcodeproj/project.pbxproj
index 5aebefe8e..fb929289c 100644
--- a/swift/Tasks.xcodeproj/project.pbxproj
+++ b/swift/Tasks.xcodeproj/project.pbxproj
@@ -7,8 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		4170A8552CED346F00043F5A /* DittoObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 4170A8542CED346F00043F5A /* DittoObjC */; };
-		4170A8572CED346F00043F5A /* DittoSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 4170A8562CED346F00043F5A /* DittoSwift */; };
+		0D19ADAF2F319E1B004D866D /* DittoSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 0D19ADAE2F319E1B004D866D /* DittoSwift */; };
 		ABCDEF012345678900000001 /* TasksUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABCDEF012345678900000002 /* TasksUITests.swift */; };
 /* End PBXBuildFile section */
 
@@ -55,8 +54,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4170A8552CED346F00043F5A /* DittoObjC in Frameworks */,
-				4170A8572CED346F00043F5A /* DittoSwift in Frameworks */,
+				0D19ADAF2F319E1B004D866D /* DittoSwift in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -70,11 +68,19 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		0D40BBA52F2AAE8A006A72A4 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		41F869812CECF42500DC7268 = {
 			isa = PBXGroup;
 			children = (
 				41F8698C2CECF42500DC7268 /* Tasks */,
 				ABCDEF012345678900000005 /* TasksUITests */,
+				0D40BBA52F2AAE8A006A72A4 /* Frameworks */,
 				41F8698B2CECF42500DC7268 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -118,8 +124,7 @@
 			);
 			name = Tasks;
 			packageProductDependencies = (
-				4170A8542CED346F00043F5A /* DittoObjC */,
-				4170A8562CED346F00043F5A /* DittoSwift */,
+				0D19ADAE2F319E1B004D866D /* DittoSwift */,
 			);
 			productName = Tasks;
 			productReference = 41F8698A2CECF42500DC7268 /* Tasks.app */;
@@ -151,7 +156,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1610;
-				LastUpgradeCheck = 1610;
+				LastUpgradeCheck = 2620;
 				TargetAttributes = {
 					41F869892CECF42500DC7268 = {
 						CreatedOnToolsVersion = 16.1;
@@ -168,7 +173,7 @@
 			mainGroup = 41F869812CECF42500DC7268;
 			minimizedProjectReferenceProxies = 1;
 			packageReferences = (
-				4170A8532CED346F00043F5A /* XCRemoteSwiftPackageReference "DittoSwiftPackage" */,
+				0D19ADAD2F319E10004D866D /* XCRemoteSwiftPackageReference "DittoSwiftPackage" */,
 			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = 41F8698B2CECF42500DC7268 /* Products */;
@@ -326,6 +331,7 @@
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
@@ -382,6 +388,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -400,6 +407,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Tasks/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Ditto Tasks";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
 				INFOPLIST_KEY_NSBluetoothAlwaysUsageDescription = "Uses Bluetooth to connect and sync with nearby devices";
 				INFOPLIST_KEY_NSBluetoothPeripheralUsageDescription = "Uses Bluetooth to connect and sync with nearby devices";
 				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "Uses WiFi to connect and sync with nearby devices";
@@ -435,6 +443,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Tasks/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Ditto Tasks";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
 				INFOPLIST_KEY_NSBluetoothAlwaysUsageDescription = "Uses Bluetooth to connect and sync with nearby devices";
 				INFOPLIST_KEY_NSBluetoothPeripheralUsageDescription = "Uses Bluetooth to connect and sync with nearby devices";
 				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "Uses WiFi to connect and sync with nearby devices";
@@ -526,25 +535,20 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		4170A8532CED346F00043F5A /* XCRemoteSwiftPackageReference "DittoSwiftPackage" */ = {
+		0D19ADAD2F319E10004D866D /* XCRemoteSwiftPackageReference "DittoSwiftPackage" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/getditto/DittoSwiftPackage";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 4.14.3;
+				kind = upToNextMinorVersion;
+				minimumVersion = 5.0.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		4170A8542CED346F00043F5A /* DittoObjC */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4170A8532CED346F00043F5A /* XCRemoteSwiftPackageReference "DittoSwiftPackage" */;
-			productName = DittoObjC;
-		};
-		4170A8562CED346F00043F5A /* DittoSwift */ = {
+		0D19ADAE2F319E1B004D866D /* DittoSwift */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 4170A8532CED346F00043F5A /* XCRemoteSwiftPackageReference "DittoSwiftPackage" */;
+			package = 0D19ADAD2F319E10004D866D /* XCRemoteSwiftPackageReference "DittoSwiftPackage" */;
 			productName = DittoSwift;
 		};
 /* End XCSwiftPackageProductDependency section */
diff --git a/swift/Tasks.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/swift/Tasks.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 389c720ed..9a067e4ab 100644
--- a/swift/Tasks.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/swift/Tasks.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,8 +6,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/getditto/DittoSwiftPackage",
       "state" : {
-        "revision" : "61b203cffc6a85c1c0d0987d1833d62eca7c549c",
-        "version" : "4.14.3"
+        "revision" : "60091ac1da98c96ffa0ed7c566650e7e08d01c74",
+        "version" : "5.0.0"
       }
     }
   ],
diff --git a/swift/Tasks.xcodeproj/xcshareddata/xcschemes/Tasks.xcscheme b/swift/Tasks.xcodeproj/xcshareddata/xcschemes/Tasks.xcscheme
index bfcc99fa5..43aab3fa6 100644
--- a/swift/Tasks.xcodeproj/xcshareddata/xcschemes/Tasks.xcscheme
+++ b/swift/Tasks.xcodeproj/xcshareddata/xcschemes/Tasks.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1640"
+   LastUpgradeVersion = "2620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/swift/Tasks/DittoManager.swift b/swift/Tasks/DittoManager.swift
index 6600efc00..2eca54c2c 100644
--- a/swift/Tasks/DittoManager.swift
+++ b/swift/Tasks/DittoManager.swift
@@ -1,42 +1,63 @@
 import DittoSwift
 import Foundation
 
+enum DittoManagerError: LocalizedError {
+    case invalidAuthURL(String)
+
+    var errorDescription: String? {
+        switch self {
+        case .invalidAuthURL(let value):
+            return "DITTO_AUTH_URL is missing or not a valid URL: \"\(value)\". Check your .env configuration."
+        }
+    }
+}
+
 /// Owner of the Ditto object
+@MainActor
 class DittoManager: ObservableObject {
-    let ditto: Ditto
+    @Published var ditto: Ditto?
     static let shared = DittoManager()
 
-    private init() {
-        // https://docs.ditto.live/sdk/latest/install-guides/swift#integrating-and-initializing-sync
-        ditto = Ditto(
-            identity: .onlinePlayground(
-                appID: Env.DITTO_APP_ID,
-                token: Env.DITTO_PLAYGROUND_TOKEN,
-                // This is required to be set to false to use the correct URLs
-                // This only disables cloud sync when the webSocketURL is not set explicitly
-                enableDittoCloudSync: false,
-                customAuthURL: URL(string: Env.DITTO_AUTH_URL)
-            )
-        )
-
-        // Set the Ditto Websocket URL
-        ditto.updateTransportConfig { transportConfig in
-            transportConfig.connect.webSocketURLs.insert(Env.DITTO_WEBSOCKET_URL)
+    private init() {}
+
+    /// Initializes Ditto and configures logging. Handles thrown errors.
+    func initDitto() async throws {
+         // Configure logging for non-preview runs
+        let isPreview: Bool = ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1"
+        if !isPreview {
+            DittoLogger.minimumLogLevel = .debug
+        }
+
+        guard let authURL = URL(string: Env.DITTO_AUTH_URL) else {
+            throw DittoManagerError.invalidAuthURL(Env.DITTO_AUTH_URL)
         }
 
-        // disable sync with v3 peers, required for DQL
+        // https://docs.ditto.live/sdk/latest/ditto-config
+        let config = DittoConfig(
+            databaseID: Env.DITTO_APP_ID,
+            connect: .server(url: authURL))
+
         do {
-            try ditto.disableSyncWithV3()
-        } catch let error {
-            print(
-                "DittoManger - ERROR: disableSyncWithV3() failed with error \"\(error)\""
-            )
-        }
+            let dittoOpened = try await Ditto.open(config: config)
+            dittoOpened.auth?.expirationHandler = { ditto, secondsRemaining in
+                // Authenticate when token is expiring. This closure must not throw.
+                ditto.auth?.login(token: Env.DITTO_PLAYGROUND_TOKEN,
+                                  provider: .development) { clientInfo, error in
+                    if let error = error {
+                        // Cannot throw from here; log the error instead.
+                        print(
+                            "Ditto auth refresh failed: \(error), " +
+                            "client info: \(String(describing: clientInfo)), " +
+                            "seconds remaining \(secondsRemaining)"
+                        )
+                    }
+                }
+            }
+            self.ditto = dittoOpened
 
-        let isPreview: Bool =
-            ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1"
-        if !isPreview {
-            DittoLogger.minimumLogLevel = .debug
+        } catch {
+            self.ditto = nil
+            throw error
         }
     }
 }
diff --git a/swift/Tasks/EditScreen.swift b/swift/Tasks/EditScreen.swift
index f34a0baf5..ae4b77422 100644
--- a/swift/Tasks/EditScreen.swift
+++ b/swift/Tasks/EditScreen.swift
@@ -3,6 +3,7 @@ import DittoSwift
 import SwiftUI
 
 /// View model for EditScreen
+@MainActor
 class EditScreenViewModel: ObservableObject {
     @Published var taskTitleText: String
     @Published var isExistingTask: Bool = false
diff --git a/swift/Tasks/TaskModel.swift b/swift/Tasks/TaskModel.swift
index 509c4c30c..c76a770af 100644
--- a/swift/Tasks/TaskModel.swift
+++ b/swift/Tasks/TaskModel.swift
@@ -1,7 +1,8 @@
 import DittoSwift
+import Foundation
 
 /// A document in the `tasks` collection
-struct TaskModel {
+struct TaskModel: Sendable {
     // swiftlint:disable:next identifier_name
     let _id: String
     var title: String
diff --git a/swift/Tasks/TasksApp.swift b/swift/Tasks/TasksApp.swift
index 354c2a631..8e2829fbe 100644
--- a/swift/Tasks/TasksApp.swift
+++ b/swift/Tasks/TasksApp.swift
@@ -3,7 +3,6 @@ import SwiftUI
 @main
 struct TasksApp: App {
     @State private var isLoading = true
-    private let ditto = DittoManager.shared.ditto
 
     var body: some Scene {
         WindowGroup {
@@ -16,14 +15,10 @@ struct TasksApp: App {
             }
             .task {
                 do {
-                    // Disable DQL strict mode. When set to false, collection
-                    // definitions are no longer required. SELECT queries will
-                    // return and display all fields by default.
-                    // https://docs.ditto.live/dql/strict-mode
-                    try await ditto.store.execute(query: "ALTER SYSTEM SET DQL_STRICT_MODE = false")
+                    try await DittoManager.shared.initDitto()
                     isLoading = false
                 } catch {
-                    fatalError("Internal inconsistency, expected setting DQL strict mode to false to always succeed but it failed: \(error)")
+                    fatalError("Failed to initialize Ditto: \(error)")
                 }
             }
         }
diff --git a/swift/Tasks/TasksListScreen.swift b/swift/Tasks/TasksListScreen.swift
index 82024324a..681dae66b 100644
--- a/swift/Tasks/TasksListScreen.swift
+++ b/swift/Tasks/TasksListScreen.swift
@@ -9,7 +9,7 @@ class TasksListScreenViewModel: ObservableObject {
     @Published var isPresentingEditScreen: Bool = false
     private(set) var taskToEdit: TaskModel?
 
-    private let ditto = DittoManager.shared.ditto
+    private var ditto: Ditto? { DittoManager.shared.ditto }
     private var subscription: DittoSyncSubscription?
     private var storeObserver: DittoStoreObserver?
 
@@ -22,42 +22,48 @@ class TasksListScreenViewModel: ObservableObject {
 
         // Register observer, which runs against the local database on this peer
         // https://docs.ditto.live/sdk/latest/crud/observing-data-changes#setting-up-store-observers
-        storeObserver = try? ditto.store.registerObserver(query: observerQuery) {
-            [weak self] result in
+        storeObserver = try? ditto?.store.registerObserver(query: observerQuery) { [weak self] result in
             guard let self = self else { return }
-            self.tasks = result.items.compactMap {
-                TaskModel($0.jsonData())
+            let mappedTasks = result.items.compactMap { TaskModel($0.jsonData()) }
+            Task { @MainActor [weak self] in
+                self?.tasks = mappedTasks
             }
         }
     }
 
-    deinit {
+    /// Cancel observers/subscriptions and stop sync. Call from `.onDisappear`
+    /// — `deinit` is `nonisolated` and cannot safely touch `@MainActor` state.
+    func teardown() {
         subscription?.cancel()
         subscription = nil
 
         storeObserver?.cancel()
         storeObserver = nil
 
-        if ditto.isSyncActive {
-            DittoManager.shared.ditto.stopSync()
+        if let ditto = self.ditto, ditto.sync.isActive {
+            ditto.sync.stop()
         }
     }
 
     func setSyncEnabled(_ newValue: Bool) throws {
-        if !ditto.isSyncActive && newValue {
-            try startSync()
-        } else if ditto.isSyncActive && !newValue {
-            stopSync()
+        if let ditto = self.ditto {
+            if !ditto.sync.isActive && newValue {
+                try startSync()
+            } else if ditto.sync.isActive && !newValue {
+                stopSync()
+            }
         }
     }
 
     private func startSync() throws {
         do {
-            try ditto.startSync()
+            if let ditto = self.ditto {
+                try ditto.sync.start()
 
-            // Register a subscription, which determines what data syncs to this peer
-            // https://docs.ditto.live/sdk/latest/sync/syncing-data#creating-subscriptions
-            subscription = try ditto.sync.registerSubscription(query: subscriptionQuery)
+                // Register a subscription, which determines what data syncs to this peer
+                // https://docs.ditto.live/sdk/latest/sync/syncing-data#creating-subscriptions
+                subscription = try ditto.sync.registerSubscription(query: subscriptionQuery)
+            }
         } catch {
             print(
                 "TaskListScreenVM.\(#function) - ERROR starting sync operations: \(error.localizedDescription)"
@@ -69,12 +75,14 @@ class TasksListScreenViewModel: ObservableObject {
     private func stopSync() {
         subscription?.cancel()
         subscription = nil
-
-        ditto.stopSync()
+        if let ditto = self.ditto {
+            ditto.sync.stop()
+        }
     }
 
     func toggleComplete(task: TaskModel) {
-        Task {
+        Task { [weak self] in
+            guard let self else { return }
             let done = !task.done
             let query = """
                 UPDATE tasks
@@ -83,10 +91,12 @@ class TasksListScreenViewModel: ObservableObject {
                 """
 
             do {
-                try await ditto.store.execute(
-                    query: query,
-                    arguments: ["done": done, "_id": task._id]
-                )
+                if let ditto = self.ditto {
+                    try await ditto.store.execute(
+                        query: query,
+                        arguments: ["done": done, "_id": task._id]
+                    )
+                }
             } catch {
                 print(
                     "TaskListScreenVM.\(#function) - ERROR toggling task: \(error.localizedDescription)"
@@ -95,8 +105,9 @@ class TasksListScreenViewModel: ObservableObject {
         }
     }
 
-    nonisolated func saveEditedTask(_ task: TaskModel) {
-        Task {
+    func saveEditedTask(_ task: TaskModel) {
+        Task { [weak self] in
+            guard let self else { return }
             let query = """
                 UPDATE tasks SET
                     title = :title,
@@ -106,15 +117,17 @@ class TasksListScreenViewModel: ObservableObject {
                 """
 
             do {
-                try await ditto.store.execute(
-                    query: query,
-                    arguments: [
-                        "title": task.title,
-                        "done": task.done,
-                        "deleted": task.deleted,
-                        "_id": task._id
-                    ]
-                )
+                if let ditto = self.ditto {
+                    try await ditto.store.execute(
+                        query: query,
+                        arguments: [
+                            "title": task.title,
+                            "done": task.done,
+                            "deleted": task.deleted,
+                            "_id": task._id
+                        ]
+                    )
+                }
             } catch {
                 print(
                     "TaskListScreenVM.\(#function) - ERROR updating task: \(error.localizedDescription)"
@@ -123,14 +136,17 @@ class TasksListScreenViewModel: ObservableObject {
         }
     }
 
-    nonisolated func saveNewTask(_ task: TaskModel) {
-        Task {
+    func saveNewTask(_ task: TaskModel) {
+        Task { [weak self] in
+            guard let self else { return }
             let newTask = task.value
             let query = "INSERT INTO tasks DOCUMENTS (:newTask)"
 
             do {
-                try await ditto.store.execute(
-                    query: query, arguments: ["newTask": newTask])
+                if let ditto = self.ditto {
+                    try await ditto.store.execute(
+                        query: query, arguments: ["newTask": newTask])
+                }
             } catch {
                 print(
                     "TaskListScreenVM.\(#function) - ERROR creating new task: \(error.localizedDescription)"
@@ -139,12 +155,15 @@ class TasksListScreenViewModel: ObservableObject {
         }
     }
 
-    nonisolated func deleteTask(_ task: TaskModel) {
-        Task {
+    func deleteTask(_ task: TaskModel) {
+        Task { [weak self] in
+            guard let self else { return }
             let query = "UPDATE tasks SET deleted = true WHERE _id = :_id"
             do {
-                try await ditto.store.execute(
-                    query: query, arguments: ["_id": task._id])
+                if let ditto = self.ditto {
+                    try await ditto.store.execute(
+                        query: query, arguments: ["_id": task._id])
+                }
             } catch {
                 print(
                     "TaskListScreenVM.\(#function) - ERROR deleting task: \(error.localizedDescription)"
@@ -153,8 +172,9 @@ class TasksListScreenViewModel: ObservableObject {
         }
     }
 
-    private nonisolated func populateTasksCollection() {
-        Task {
+    private func populateTasksCollection() {
+        Task { [weak self] in
+            guard let self else { return }
             let initialTasks: [TaskModel] = [
                 TaskModel(
                     _id: "50191411-4C46-4940-8B72-5F8017A04FA7",
@@ -172,18 +192,20 @@ class TasksListScreenViewModel: ObservableObject {
 
             for task in initialTasks {
                 do {
-                    try await ditto.store.execute(
-                        query: "INSERT INTO tasks INITIAL DOCUMENTS (:task)",
-                        arguments: [
-                            "task":
-                                [
-                                    "_id": task._id,
-                                    "title": task.title,
-                                    "done": task.done,
-                                    "deleted": task.deleted
-                                ]
-                        ]
-                    )
+                    if let ditto = self.ditto {
+                        try await ditto.store.execute(
+                            query: "INSERT INTO tasks INITIAL DOCUMENTS (:task)",
+                            arguments: [
+                                "task":
+                                    [
+                                        "_id": task._id,
+                                        "title": task.title,
+                                        "done": task.done,
+                                        "deleted": task.deleted
+                                    ]
+                            ]
+                        )
+                    }
                 } catch {
                     print(
                         "TaskListScreenVM.\(#function) - ERROR creating initial task: \(error.localizedDescription)"
@@ -244,6 +266,7 @@ struct TasksListScreen: View {
                 ToolbarItem(placement: .topBarTrailing) {
                     HStack {
                         Toggle("Sync", isOn: $syncEnabled)
+                            .padding(.leading, 8)
                             .toggleStyle(SwitchToggleStyle())
                             .onChange(of: syncEnabled) { newSyncEnabled in
                                 Self.saveSyncEnabledState(newSyncEnabled)
@@ -255,20 +278,16 @@ struct TasksListScreen: View {
                             }
                     }
                 }
-                ToolbarItem(placement: .bottomBar) {
-                    HStack {
-                        Spacer()
-                        Button(action: {
-                            viewModel.onNewTask()
-                        }, label: {
-                            HStack {
-                                Image(systemName: "plus")
-                                Text("New Task")
-                            }
-                        })
-                        .buttonStyle(.borderedProminent)
-                        .padding(.bottom)
-                    }
+                ToolbarItemGroup(placement: .bottomBar) {
+                    Spacer()
+                    Button(action: {
+                        viewModel.onNewTask()
+                    }, label: {
+                        Label("New Task", systemImage: "plus")
+                    })
+                    .buttonStyle(.borderedProminent)
+                    .padding(.bottom)
+                    Spacer()
                 }
             }
             .sheet(
@@ -293,6 +312,9 @@ struct TasksListScreen: View {
                 }
             }
         }
+        .onDisappear {
+            viewModel.teardown()
+        }
     }
 
     private func deleteTaskItems(at offsets: IndexSet) {
@@ -312,7 +334,6 @@ struct TasksListScreen: View {
 
     private static func saveSyncEnabledState(_ state: Bool) {
         UserDefaults.standard.set(state, forKey: isSyncEnabledKey)
-        UserDefaults.standard.synchronize()
     }
 }