diff --git a/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
index 9a239c5..a98ae81 100644
--- a/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
@@ -25,9 +25,11 @@ class TunnelEditTableViewController: UITableViewController {
          .deletePeer]
     ]
 
+    let tunnelsManager: TunnelsManager
     let tunnelViewModel: TunnelViewModel
 
-    init() {
+    init(tunnelsManager tm: TunnelsManager) {
+        tunnelsManager = tm
         tunnelViewModel = TunnelViewModel(tunnelConfiguration: nil)
         super.init(style: .grouped)
         self.modalPresentationStyle = .formSheet
@@ -52,12 +54,35 @@ class TunnelEditTableViewController: UITableViewController {
     }
 
     @objc func saveTapped() {
-        print("Save")
+        self.tableView.endEditing(false)
+        let tunnelSaveResult = tunnelViewModel.save()
+        switch (tunnelSaveResult) {
+        case .error(let errorMessage):
+            let erroringConfiguration = (tunnelViewModel.interfaceData.validatedConfiguration == nil) ? "Interface" : "Peer"
+            showErrorAlert(title: "Invalid \(erroringConfiguration)", message: errorMessage)
+        case .saved(let tunnelConfiguration):
+            tunnelsManager.add(tunnelConfiguration: tunnelConfiguration) { [weak self] (error) in
+                if let error = error {
+                    print("Could not save: \(error)")
+                    self?.showErrorAlert(title: "Could not save", message: "Internal error")
+                } else {
+                    self?.dismiss(animated: true, completion: nil)
+                }
+            }
+        }
     }
 
     @objc func cancelTapped() {
         dismiss(animated: true, completion: nil)
     }
+
+    func showErrorAlert(title: String, message: String) {
+        let okAction = UIAlertAction(title: "Ok", style: .default)
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
+        alert.addAction(okAction)
+
+        self.present(alert, animated: true, completion: nil)
+    }
 }
 
 // MARK: UITableViewDataSource
diff --git a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
index d58da27..f13a900 100644
--- a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
@@ -40,11 +40,11 @@ class TunnelsListTableViewController: UITableViewController {
                                       message: "Add a tunnel",
                                       preferredStyle: .actionSheet)
         alert.addAction(
-            UIAlertAction(title: "Create from scratch", style: .default) { (action) in
-                let editVC = TunnelEditTableViewController()
-                let editNC = UINavigationController(rootViewController: editVC)
-                self.present(editNC, animated: true) {
-                    print("Done")
+            UIAlertAction(title: "Create from scratch", style: .default) { [weak self] (action) in
+                if let s = self, let tunnelsManager = s.tunnelsManager {
+                    let editVC = TunnelEditTableViewController(tunnelsManager: tunnelsManager)
+                    let editNC = UINavigationController(rootViewController: editVC)
+                    s.present(editNC, animated: true)
                 }
             }
         )