diff --git a/Signal/src/Loki/View Controllers/EditClosedGroupVC.swift b/Signal/src/Loki/View Controllers/EditClosedGroupVC.swift
index 8e0dfda5e..e1c28f137 100644
--- a/Signal/src/Loki/View Controllers/EditClosedGroupVC.swift	
+++ b/Signal/src/Loki/View Controllers/EditClosedGroupVC.swift	
@@ -2,15 +2,10 @@
 @objc(LKEditClosedGroupVC)
 final class EditClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelegate {
     private let thread: TSGroupThread
+    private var name = ""
+    private var members: [String] = [] { didSet { tableView.reloadData() } }
     private var isEditingGroupName = false { didSet { handleIsEditingGroupNameChanged() } }
 
-    private lazy var members: [String] = {
-        func getDisplayName(for hexEncodedPublicKey: String) -> String {
-            return UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? hexEncodedPublicKey
-        }
-        return GroupUtilities.getClosedGroupMembers(thread).sorted { getDisplayName(for: $0) < getDisplayName(for: $1) }
-    }()
-
     // MARK: Components
     private lazy var groupNameLabel: UILabel = {
         let result = UILabel()
@@ -63,6 +58,11 @@ final class EditClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelega
         navigationItem.backBarButtonItem = backButton
         setUpViewHierarchy()
         updateNavigationBarButtons()
+        name = thread.groupModel.groupName!
+        func getDisplayName(for publicKey: String) -> String {
+            return UserDisplayNameUtilities.getPrivateChatDisplayName(for: publicKey) ?? publicKey
+        }
+        members = GroupUtilities.getClosedGroupMembers(thread).sorted { getDisplayName(for: $0) < getDisplayName(for: $1) }
     }
 
     private func setUpViewHierarchy() {
@@ -146,8 +146,10 @@ final class EditClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelega
     }
 
     func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
-        let removeAction = UITableViewRowAction(style: .destructive, title: "Remove") { _, _ in
-            // TODO: Implement
+        let publicKey = members[indexPath.row]
+        let removeAction = UITableViewRowAction(style: .destructive, title: "Remove") { [weak self] _, _ in
+            guard let self = self, let index = self.members.firstIndex(of: publicKey) else { return }
+            self.members.remove(at: index)
         }
         removeAction.backgroundColor = Colors.destructive
         return [ removeAction ]
@@ -162,7 +164,7 @@ final class EditClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelega
         } else {
             navigationItem.leftBarButtonItem = nil
         }
-        let doneButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(handleSaveGroupNameButtonTapped))
+        let doneButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(handleDoneButtonTapped))
         doneButton.tintColor = Colors.text
         navigationItem.rightBarButtonItem = doneButton
     }
@@ -189,15 +191,49 @@ final class EditClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelega
         isEditingGroupName = false
     }
 
-    @objc private func handleSaveGroupNameButtonTapped() {
+    @objc private func handleDoneButtonTapped() {
+        if isEditingGroupName {
+            updateGroupName()
+        } else {
+            commitChanges()
+        }
+    }
+
+    private func updateGroupName() {
+        let name = groupNameTextField.text!.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
+        guard !name.isEmpty else {
+            return showError(title: NSLocalizedString("vc_create_closed_group_group_name_missing_error", comment: ""))
+        }
+        guard name.count < ClosedGroupsProtocol.maxNameSize else {
+            return showError(title: NSLocalizedString("vc_create_closed_group_group_name_too_long_error", comment: ""))
+        }
         isEditingGroupName = false
+        self.name = name
+        groupNameLabel.text = name
     }
 
     @objc private func addMembers() {
         let title = "Add Members"
-        let userSelectionVC = UserSelectionVC(with: title, excluding: Set(members)) { selectedUsers in
-            print(selectedUsers)
+        let userSelectionVC = UserSelectionVC(with: title, excluding: Set(members)) { [weak self] selectedUsers in
+            guard let self = self else { return }
+            var members = self.members
+            members.append(contentsOf: selectedUsers)
+            func getDisplayName(for publicKey: String) -> String {
+                return UserDisplayNameUtilities.getPrivateChatDisplayName(for: publicKey) ?? publicKey
+            }
+            self.members = members.sorted { getDisplayName(for: $0) < getDisplayName(for: $1) }
         }
         navigationController!.pushViewController(userSelectionVC, animated: true, completion: nil)
     }
+
+    private func commitChanges() {
+        // TODO: Implement
+    }
+
+    // MARK: Convenience
+    private func showError(title: String, message: String = "") {
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default, handler: nil))
+        presentAlert(alert)
+    }
 }
diff --git a/Signal/src/Loki/View Controllers/NewClosedGroupVC.swift b/Signal/src/Loki/View Controllers/NewClosedGroupVC.swift
index 63bb6b93c..43a0d651d 100644
--- a/Signal/src/Loki/View Controllers/NewClosedGroupVC.swift	
+++ b/Signal/src/Loki/View Controllers/NewClosedGroupVC.swift	
@@ -169,7 +169,7 @@ final class NewClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelegat
         guard let name = nameTextField.text?.trimmingCharacters(in: .whitespacesAndNewlines), name.count > 0 else {
             return showError(title: NSLocalizedString("vc_create_closed_group_group_name_missing_error", comment: ""))
         }
-        guard name.count < 64 else {
+        guard name.count < ClosedGroupsProtocol.maxNameSize else {
             return showError(title: NSLocalizedString("vc_create_closed_group_group_name_too_long_error", comment: ""))
         }
         guard selectedContacts.count >= 1 else {
diff --git a/SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift b/SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift
index 581fbd914..fc4c9eb33 100644
--- a/SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift	
+++ b/SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift	
@@ -14,6 +14,7 @@ import PromiseKit
 public final class ClosedGroupsProtocol : NSObject {
     public static let isSharedSenderKeysEnabled = true
     public static let groupSizeLimit = 20
+    public static let maxNameSize = 64
 
     // MARK: - Sending