diff --git a/src/grp_update_drv_dummy.cc b/src/grp_update_drv_dummy.cc
index 00aff03..3ffa700 100644
--- a/src/grp_update_drv_dummy.cc
+++ b/src/grp_update_drv_dummy.cc
@@ -1,5 +1,6 @@
 #include "grp_update_drv_dummy.hh"
 #include "pEpLog.hh"
+#include "utils.hh"
 #include <pEp/message_api.h>
 #include "listmanager_dummy.hh"
 
@@ -21,12 +22,51 @@ namespace pEp {
         identity_list *memberlist) noexcept
     {
         pEpLogClass("called");
-        string addr_list = group_identity->address;
-        string addr_manager = manager->address;
-        lmd.list_add(addr_list, addr_manager);
-        // TODO:ADD MEMBERLIST
+        PEP_STATUS status = PEP_UNKNOWN_ERROR;
 
-        return PEP_STATUS_OK;
+        if (!group_identity || !manager) {
+            status = PEP_ILLEGAL_VALUE;
+        } else {
+            if (Utils::is_c_str_empty(group_identity->address) ||
+                Utils::is_c_str_empty(manager->address)) {
+                status = PEP_ILLEGAL_VALUE;
+            } else {
+                const string addr_list = group_identity->address;
+                const string addr_manager = manager->address;
+
+                PEP_STATUS stat_add;
+                try {
+                    lmd.list_add(addr_list, addr_manager);
+                    stat_add = PEP_STATUS_OK;
+                } catch (const AlreadyExistsException &e) {
+                    pEpLogClass(Utils::nested_exception_to_string(e));
+                    stat_add = PEP_GROUP_EXISTS;
+                } catch (const exception &e) {
+                    pEpLogClass(Utils::nested_exception_to_string(e));
+                    stat_add = PEP_UNKNOWN_ERROR;
+                } catch (...) {
+                    pEpLogClass("unknown exception");
+                    status = PEP_UNKNOWN_ERROR;
+                }
+
+                if (stat_add != PEP_STATUS_OK) {
+                    status = stat_add;
+                } else {
+                    // Add the memberlist (if given)
+                    // Fail totally on the first member_invite() that fails
+                    PEP_STATUS stat_invite = PEP_UNKNOWN_ERROR;
+                    vector<pEp_identity *> cxx_memberlist = Utils::to_cxx(*memberlist);
+                    for (pEp_identity *member : cxx_memberlist) {
+                        stat_invite = this->adapter_group_invite_member(session, group_identity, member);
+                        if (stat_invite != PEP_STATUS_OK) {
+                            status = stat_invite;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        return status;
     }
 
     //    PEP_STATUS GroupUpdateDriverDummy::adapter_group_join(
@@ -39,14 +79,72 @@ namespace pEp {
     //        return PEP_STATUS_OK;
     //    }
 
+    // The engine checks if the manager is correct for the group given
+    // But the list manager does not require that
+    // So, we verify that first, too. using moderator()
     PEP_STATUS GroupUpdateDriverDummy::adapter_group_dissolve(
         PEP_SESSION session,
         pEp_identity *group_identity,
         pEp_identity *manager) noexcept
     {
         pEpLogClass("called");
+        PEP_STATUS status = PEP_UNKNOWN_ERROR;
+
+        if (!group_identity || !manager) {
+            status = PEP_ILLEGAL_VALUE;
+        } else {
+            if (Utils::is_c_str_empty(group_identity->address) ||
+                Utils::is_c_str_empty(manager->address)) {
+                status = PEP_ILLEGAL_VALUE;
+            } else {
+                const string addr_list = group_identity->address;
+                const string addr_manager = manager->address;
 
-        return PEP_STATUS_OK;
+                // Check if given manager is correct for the given group
+                PEP_STATUS stat_query = PEP_UNKNOWN_ERROR;
+                string addr_manager_queried;
+                try {
+                    addr_manager_queried = lmd.moderator(addr_list);
+                    stat_query = PEP_STATUS_OK;
+                } catch (const ListDoesNotExistException &e) {
+                    pEpLogClass(Utils::nested_exception_to_string(e));
+                    stat_query = PEP_GROUP_NOT_FOUND;
+                } catch (const exception &e) {
+                    pEpLogClass(Utils::nested_exception_to_string(e));
+                    stat_query = PEP_UNKNOWN_ERROR;
+                } catch (...) {
+                    pEpLogClass("unknown exception");
+                    stat_query = PEP_UNKNOWN_ERROR;
+                }
+
+                if (stat_query != PEP_STATUS_OK) {
+                    status = stat_query;
+                } else {
+                    if (addr_manager_queried != addr_manager) {
+                        status = PEP_CANNOT_DISABLE_GROUP;
+                    } else {
+                        try {
+                            lmd.list_delete(addr_list);
+                            status = PEP_STATUS_OK;
+                        } catch (const MemberDoesNotExistException &e) {
+                            pEpLogClass(Utils::nested_exception_to_string(e));
+                            // TODO: Silently succeed???
+                            status = PEP_STATUS_OK;
+                        } catch (const ListDoesNotExistException &e) {
+                            pEpLogClass(Utils::nested_exception_to_string(e));
+                            status = PEP_GROUP_NOT_FOUND;
+                        } catch (const exception &e) {
+                            pEpLogClass(Utils::nested_exception_to_string(e));
+                            status = PEP_UNKNOWN_ERROR;
+                        } catch (...) {
+                            pEpLogClass("unknown exception");
+                            status = PEP_UNKNOWN_ERROR;
+                        }
+                    }
+                }
+            }
+        }
+        return status;
     }
 
     PEP_STATUS GroupUpdateDriverDummy::adapter_group_invite_member(
@@ -55,7 +153,39 @@ namespace pEp {
         pEp_identity *group_member) noexcept
     {
         pEpLogClass("called");
-        return PEP_STATUS_OK;
+
+        PEP_STATUS status = PEP_UNKNOWN_ERROR;
+
+        if (!group_identity || !group_member) {
+            status = PEP_ILLEGAL_VALUE;
+        } else {
+            if (Utils::is_c_str_empty(group_identity->address) ||
+                Utils::is_c_str_empty(group_member->address)) {
+                status = PEP_ILLEGAL_VALUE;
+            } else {
+                const string addr_list = group_identity->address;
+                const string addr_member = group_member->address;
+
+                try {
+                    lmd.member_add(addr_list, addr_member);
+                    status = PEP_STATUS_OK;
+                } catch (const AlreadyExistsException &e) {
+                    // TODO: Silently succeed???
+                    pEpLogClass(Utils::nested_exception_to_string(e));
+                    status = PEP_STATUS_OK;
+                } catch (const ListDoesNotExistException &e) {
+                    pEpLogClass(Utils::nested_exception_to_string(e));
+                    return PEP_GROUP_NOT_FOUND;
+                } catch (const exception &e) {
+                    pEpLogClass(Utils::nested_exception_to_string(e));
+                    status = PEP_UNKNOWN_ERROR;
+                } catch (...) {
+                    pEpLogClass("unknown exception");
+                    status = PEP_UNKNOWN_ERROR;
+                }
+            }
+        }
+        return status;
     }
 
     PEP_STATUS GroupUpdateDriverDummy::adapter_group_remove_member(
@@ -64,7 +194,38 @@ namespace pEp {
         pEp_identity *group_member) noexcept
     {
         pEpLogClass("called");
-        return PEP_STATUS_OK;
+        PEP_STATUS status = PEP_UNKNOWN_ERROR;
+
+        if (!group_identity || !group_member) {
+            status = PEP_ILLEGAL_VALUE;
+        } else {
+            if (Utils::is_c_str_empty(group_identity->address) ||
+                Utils::is_c_str_empty(group_member->address)) {
+                status = PEP_ILLEGAL_VALUE;
+            } else {
+                const string addr_list = group_identity->address;
+                const string addr_member = group_member->address;
+
+                try {
+                    lmd.member_remove(addr_list, addr_member);
+                    status = PEP_STATUS_OK;
+                } catch (const MemberDoesNotExistException &e) {
+                    pEpLogClass(Utils::nested_exception_to_string(e));
+                    // TODO: Silently succeed???
+                    status = PEP_STATUS_OK;
+                } catch (const ListDoesNotExistException &e) {
+                    pEpLogClass(Utils::nested_exception_to_string(e));
+                    status = PEP_GROUP_NOT_FOUND;
+                } catch (const exception &e) {
+                    pEpLogClass(Utils::nested_exception_to_string(e));
+                    status = PEP_UNKNOWN_ERROR;
+                } catch (...) {
+                    pEpLogClass("unknown exception");
+                    status = PEP_UNKNOWN_ERROR;
+                }
+            }
+        }
+        return status;
     }
 
 } // namespace pEp
\ No newline at end of file