11 files changed, 703 insertions, 365 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5e8294f..6ad94588 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -350,7 +350,6 @@ install(FILES
 install(FILES
   toxav/toxav.h
   toxcore/tox.h
-  toxcore/tox_group.h
   toxdns/toxdns.h
   toxencryptsave/toxencryptsave.h
   DESTINATION "include/tox")
diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index d08fc125..14510ea4 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -1172,26 +1172,26 @@ static void g_accept_friend_request(Tox *m, const uint8_t *public_key, const uin
 static Tox *invite_tox;
 static unsigned int invite_counter;
 
-static void print_group_invite_callback(Tox *tox, int32_t friendnumber, uint8_t type, const uint8_t *data,
-                                        uint16_t length,
+static void print_group_invite_callback(Tox *tox, uint32_t friendnumber, TOX_CONFERENCE_TYPE type, const uint8_t *data,
+                                        size_t length,
                                         void *userdata)
 {
     if (*((uint32_t *)userdata) != 234212) {
         return;
     }
 
-    if (type != TOX_GROUPCHAT_TYPE_TEXT) {
+    if (type != TOX_CONFERENCE_TYPE_TEXT) {
         return;
     }
 
     int g_num;
 
-    if ((g_num = tox_join_groupchat(tox, friendnumber, data, length)) == -1) {
+    if ((g_num = tox_conference_join(tox, friendnumber, data, length, NULL)) == -1) {
         return;
     }
 
     ck_assert_msg(g_num == 0, "Group number was not 0");
-    ck_assert_msg(tox_join_groupchat(tox, friendnumber, data, length) == -1,
+    ck_assert_msg(tox_conference_join(tox, friendnumber, data, length, NULL) == -1,
                   "Joining groupchat twice should be impossible.");
 
     invite_tox = tox;
@@ -1200,7 +1200,8 @@ static void print_group_invite_callback(Tox *tox, int32_t friendnumber, uint8_t
 
 static unsigned int num_recv;
 
-static void print_group_message(Tox *tox, int groupnumber, int peernumber, const uint8_t *message, uint16_t length,
+static void print_group_message(Tox *tox, uint32_t groupnumber, uint32_t peernumber, TOX_MESSAGE_TYPE type,
+                                const uint8_t *message, size_t length,
                                 void *userdata)
 {
     if (*((uint32_t *)userdata) != 234212) {
@@ -1226,7 +1227,7 @@ group_test_restart:
         toxes[i] = tox_new(0, 0);
         ck_assert_msg(toxes[i] != 0, "Failed to create tox instances %u", i);
         tox_callback_friend_request(toxes[i], &g_accept_friend_request);
-        tox_callback_group_invite(toxes[i], &print_group_invite_callback, &to_comp);
+        tox_callback_conference_invite(toxes[i], &print_group_invite_callback, &to_comp);
     }
 
     {
@@ -1264,9 +1265,9 @@ group_test_restart:
 
     printf("friends connected, took %llu seconds\n", time(NULL) - cur_time);
 
-    ck_assert_msg(tox_add_groupchat(toxes[0]) != -1, "Failed to create group");
-    ck_assert_msg(tox_invite_friend(toxes[0], 0, 0) == 0, "Failed to invite friend");
-    ck_assert_msg(tox_group_set_title(toxes[0], 0, (const uint8_t *)"Gentoo", sizeof("Gentoo") - 1) == 0,
+    ck_assert_msg(tox_conference_new(toxes[0], NULL) != -1, "Failed to create group");
+    ck_assert_msg(tox_conference_invite(toxes[0], 0, 0, NULL) == 0, "Failed to invite friend");
+    ck_assert_msg(tox_conference_set_title(toxes[0], 0, (const uint8_t *)"Gentoo", sizeof("Gentoo") - 1, NULL) == 0,
                   "Failed to set group title");
     invite_counter = ~0;
 
@@ -1279,7 +1280,7 @@ group_test_restart:
         }
 
         if (!invite_counter) {
-            ck_assert_msg(tox_invite_friend(invite_tox, 0, 0) == 0, "Failed to invite friend");
+            ck_assert_msg(tox_conference_invite(invite_tox, 0, 0, NULL) == 0, "Failed to invite friend");
         }
 
         if (done == invite_counter) {
@@ -1291,7 +1292,7 @@ group_test_restart:
     }
 
     for (i = 0; i < NUM_GROUP_TOX; ++i) {
-        int num_peers = tox_group_number_peers(toxes[i], 0);
+        int num_peers = tox_conference_peer_count(toxes[i], 0, NULL);
 
         /**
          * Group chats fail unpredictably, currently they'll rerun as many times
@@ -1321,7 +1322,8 @@ group_test_restart:
                       NUM_GROUP_TOX, i, num_peers);
 
         uint8_t title[2048];
-        int ret = tox_group_get_title(toxes[i], 0, title, sizeof(title));
+        int ret = tox_conference_get_title_size(toxes[i], 0, NULL);
+        tox_conference_get_title(toxes[i], 0, title, NULL);
         ck_assert_msg(ret == sizeof("Gentoo") - 1, "Wrong title length");
         ck_assert_msg(memcmp("Gentoo", title, ret) == 0, "Wrong title");
     }
@@ -1329,11 +1331,13 @@ group_test_restart:
     printf("group connected\n");
 
     for (i = 0; i < NUM_GROUP_TOX; ++i) {
-        tox_callback_group_message(toxes[i], &print_group_message, &to_comp);
+        tox_callback_conference_message(toxes[i], &print_group_message, &to_comp);
     }
 
-    ck_assert_msg(tox_group_message_send(toxes[rand() % NUM_GROUP_TOX], 0, (const uint8_t *)"Install Gentoo",
-                                         sizeof("Install Gentoo") - 1) == 0, "Failed to send group message.");
+    ck_assert_msg(
+        tox_conference_send_message(
+            toxes[rand() % NUM_GROUP_TOX], 0, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)"Install Gentoo",
+            sizeof("Install Gentoo") - 1, NULL) == 0, "Failed to send group message.");
     num_recv = 0;
 
     for (j = 0; j < 20; ++j) {
@@ -1348,7 +1352,7 @@ group_test_restart:
     ck_assert_msg(num_recv == NUM_GROUP_TOX, "Failed to recv group messages.");
 
     for (k = NUM_GROUP_TOX; k != 0 ; --k) {
-        tox_del_groupchat(toxes[k - 1], 0);
+        tox_conference_delete(toxes[k - 1], 0, NULL);
 
         for (j = 0; j < 10; ++j) {
             for (i = 0; i < NUM_GROUP_TOX; ++i) {
@@ -1359,7 +1363,7 @@ group_test_restart:
         }
 
         for (i = 0; i < (k - 1); ++i) {
-            int num_peers = tox_group_number_peers(toxes[i], 0);
+            int num_peers = tox_conference_peer_count(toxes[i], 0, NULL);
             ck_assert_msg(num_peers == (k - 1), "\n\tBad number of group peers (post check)."
                           "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %i\n\n",
                           (k - 1), i, num_peers);
diff --git a/other/apidsl/tox.in.h b/other/apidsl/tox.in.h
index d14e48ba..cd802a94 100644
--- a/other/apidsl/tox.in.h
+++ b/other/apidsl/tox.in.h
@@ -1470,7 +1470,8 @@ namespace friend {
      *   containing the message text.
      * @param length Length of the message to be sent.
      */
-    uint32_t message(uint32_t friend_number, MESSAGE_TYPE type, const uint8_t[length <= MAX_MESSAGE_LENGTH] message) {
+    uint32_t message(uint32_t friend_number, MESSAGE_TYPE type,
+                     const uint8_t[length <= MAX_MESSAGE_LENGTH] message) {
       NULL,
       /**
        * The friend number did not designate a valid friend.
@@ -1537,8 +1538,8 @@ namespace friend {
      * @param length The size of the message byte array.
      */
     typedef void(const uint8_t[PUBLIC_KEY_SIZE] public_key
-        //, uint32_t time_delta
-        , const uint8_t[length <= MAX_MESSAGE_LENGTH] message);
+                 //, uint32_t time_delta
+                 , const uint8_t[length <= MAX_MESSAGE_LENGTH] message);
   }
 
 
@@ -1555,8 +1556,9 @@ namespace friend {
      * @see ${event request} for more information on time_delta.
      */
     typedef void(uint32_t friend_number
-        //, uint32_t time_delta
-        , MESSAGE_TYPE type, const uint8_t[length <= MAX_MESSAGE_LENGTH] message);
+                 //, uint32_t time_delta
+                 , MESSAGE_TYPE type,
+                 const uint8_t[length <= MAX_MESSAGE_LENGTH] message);
   }
 
 }
@@ -1766,8 +1768,10 @@ namespace file {
    *
    * @return true on success.
    */
-  const bool get_file_id(uint32_t friend_number, uint32_t file_number, uint8_t[FILE_ID_LENGTH] file_id)
-      with error for get;
+  uint8_t[FILE_ID_LENGTH] file_id {
+    get(uint32_t friend_number, uint32_t file_number)
+        with error for get;
+  }
 
 }
 
@@ -1830,7 +1834,7 @@ namespace file {
    *   unknown or streaming.
    * @param file_id A file identifier of length $FILE_ID_LENGTH that can be used to
    *   uniquely identify file transfers across core restarts. If NULL, a random one will
-   *   be generated by core. It can then be obtained by using $get_file_id().
+   *   be generated by core. It can then be obtained by using ${file_id.get}().
    * @param filename Name of the file. Does not need to be the actual name. This
    *   name will be sent along with the file send request.
    * @param filename_length Size in bytes of the filename.
@@ -2019,12 +2023,245 @@ namespace file {
  *
  ******************************************************************************/
 
+error for conference {
+  /**
+   * Some error occurred.
+   */
+  FAILURE,
+}
+
+namespace conference {
 
-/******************************************************************************
- *
- * :: Group chat message sending and receiving
- *
- ******************************************************************************/
+  /**
+   * Conference types for the ${event invite} event.
+   */
+  enum class TYPE {
+    /**
+     * Text-only conferences that must be accepted with the $join function.
+     */
+    TEXT,
+    /**
+     * Video conference. The function to accept these is in toxav.
+     */
+    AV,
+  }
+
+
+  /**
+   * This event is triggered when the client is invited to join a conference.
+   */
+  event invite {
+    /**
+     * The invitation will remain valid until the inviting friend goes offline
+     * or exits the conference.
+     *
+     * @param friend_number The friend who invited us.
+     * @param type The conference type (text only or audio/video).
+     * @param cookie A piece of data of variable length required to join the
+     *   conference.
+     * @param length The length of the cookie.
+     */
+    typedef void(uint32_t friend_number, TYPE type, const uint8_t[length] cookie);
+  }
+
+
+  /**
+   * Set the callback for group messages.
+   */
+  event message {
+    /**
+     * TODO
+     */
+    typedef void(uint32_t group_number, uint32_t peer_number, MESSAGE_TYPE type,
+                 const uint8_t[length] message);
+  }
+
+
+  /**
+   * Set callback function for title changes.
+   *
+   * if peer_number == UINT32_MAX, then author is unknown (e.g. initial joining the group)
+   */
+  event title {
+    /**
+     * TODO
+     */
+    typedef void(uint32_t group_number, uint32_t peer_number, const uint8_t[length] title);
+  }
+
+
+  // rename CHANGE to something different that is a good prefix for the three
+  // things below.
+  enum class CHANGE {
+    PEER_ADD, // JOINED?
+    PEER_DEL, // PARTED?
+    PEER_NAME, // NAME_CHANGE?
+  }
+
+  /**
+   * Set callback function for peer name list changes.
+   *
+   * It gets called every time the name list changes(new peer/name, deleted peer)
+   */
+  event namelist_change {
+    /**
+     * TODO
+     */
+    typedef void(uint32_t group_number, uint32_t peer_number, CHANGE change);
+  }
+
+
+  /**
+   * Creates a new groupchat.
+   *
+   * @return the group number.
+   */
+  uint32_t new()
+      with error for conference;
+
+  /**
+   * Delete a groupchat.
+   *
+   * @return true on success.
+   */
+  bool delete(uint32_t group_number)
+      with error for conference;
+
+
+  namespace peer {
+
+    /**
+     * Return the number of peers in the group chat.
+     */
+    const uint32_t count(uint32_t group_number)
+        with error for conference;
+
+    uint8_t[size] name {
+      size(uint32_t group_number, uint32_t peer_number)
+          with error for conference;
+
+      /**
+       * Copy the name of peer_number who is in group_number to name.
+       * name must be at least $MAX_NAME_LENGTH long.
+       *
+       * return length of name if success
+       * return -1 if failure
+       */
+      get(uint32_t group_number, uint32_t peer_number)
+          with error for conference;
+    }
+
+    /**
+     * Copy the public key of peer_number who is in group_number to public_key.
+     * public_key must be $PUBLIC_KEY_SIZE long.
+     *
+     * returns 0 on success
+     * returns -1 on failure
+     */
+    uint8_t[PUBLIC_KEY_SIZE] public_key {
+      get(uint32_t group_number, uint32_t peer_number)
+          with error for conference;
+    }
+
+    /**
+     * Check if the current peer_number corresponds to ours.
+     *
+     * return 1 if the peer_number corresponds to ours.
+     * return 0 on failure.
+     */
+    const bool number_is_ours(uint32_t group_number, uint32_t peer_number);
+
+  }
+
+
+  /**
+   * invite friend_number to group_number
+   * return 0 on success
+   * return -1 on failure
+   */
+  bool invite(uint32_t friend_number, uint32_t group_number)
+      with error for conference;
+
+
+  /**
+   * Join a group (you need to have been invited first.) using cookie of length obtained
+   * in the group invite callback.
+   *
+   * returns group number on success
+   * returns -1 on failure.
+   */
+  uint32_t join(uint32_t friend_number, const uint8_t[length] cookie)
+      with error for conference;
+
+
+  namespace send {
+
+    /**
+     * send a group message
+     * return 0 on success
+     * return -1 on failure
+     */
+    bool message(uint32_t group_number, MESSAGE_TYPE type, const uint8_t[length] message)
+        with error for conference;
+
+  }
+
+
+  uint8_t[length <= MAX_NAME_LENGTH] title {
+    size(uint32_t group_number)
+        with error for conference;
+
+    /**
+     * Get group title from group_number and put it in title.
+     * title needs to be a valid memory location with a max_length size of at least MAX_NAME_LENGTH (128) bytes.
+     *
+     *  return length of copied title if success.
+     *  return -1 if failure.
+     */
+    get(uint32_t group_number)
+        with error for conference;
+
+    /**
+     * set the group's title, limited to MAX_NAME_LENGTH
+     * return 0 on success
+     * return -1 on failure
+     */
+    set(uint32_t group_number)
+        with error for conference;
+  }
+
+
+  uint32_t[size] chatlist {
+    /**
+     * Return the number of chats in the instance m.
+     * You should use this to determine how much memory to allocate
+     * for copy_chatlist.
+     */
+    size();
+
+    /**
+     * Copy a list of valid chat IDs into the array out_list.
+     * If out_list is NULL, returns 0.
+     * Otherwise, returns the number of elements copied.
+     * If the array was too small, the contents
+     * of out_list will be truncated to list_size.
+     */
+    get();
+  }
+
+
+  /**
+   * return the type of groupchat ($TYPE) that group_number is.
+   *
+   * return -1 on failure.
+   * return type on success.
+   */
+  TYPE type {
+    get(uint32_t group_number)
+        with error for conference;
+  }
+
+}
 
 
 /*******************************************************************************
@@ -2188,11 +2425,10 @@ inline namespace self {
 
 }
 
+
 } // class tox
 
 %{
-#include "tox_group.h"
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/testing/irc_syncbot.c b/testing/irc_syncbot.c
index 6aa3875d..7373b4cd 100644
--- a/testing/irc_syncbot.c
+++ b/testing/irc_syncbot.c
@@ -83,10 +83,11 @@ static int reconnect(void)
 
 static int current_group = -1;
 
-static void callback_group_invite(Tox *tox, int fid, uint8_t type, const uint8_t *data, uint16_t length, void *userdata)
+static void callback_group_invite(Tox *tox, uint32_t fid, TOX_CONFERENCE_TYPE type, const uint8_t *data, size_t length,
+                                  void *userdata)
 {
     if (current_group == -1) {
-        current_group = tox_join_groupchat(tox, fid, data, length);
+        current_group = tox_conference_join(tox, fid, data, length, NULL);
     }
 }
 
@@ -95,13 +96,13 @@ static void callback_friend_message(Tox *tox, uint32_t fid, TOX_MESSAGE_TYPE typ
                                     void *userdata)
 {
     if (length == 1 && *message == 'c') {
-        if (tox_del_groupchat(tox, current_group) == 0) {
+        if (tox_conference_delete(tox, current_group, NULL) == 0) {
             current_group = -1;
         }
     }
 
     if (length == 1 && *message == 'i') {
-        tox_invite_friend(tox, fid, current_group);
+        tox_conference_invite(tox, fid, current_group, NULL);
     }
 
     if (length == 1 && *message == 'j' && sock >= 0) {
@@ -109,15 +110,17 @@ static void callback_friend_message(Tox *tox, uint32_t fid, TOX_MESSAGE_TYPE typ
     }
 }
 
-static void copy_groupmessage(Tox *tox, int groupnumber, int friendgroupnumber, const uint8_t *message, uint16_t length,
+static void copy_groupmessage(Tox *tox, uint32_t groupnumber, uint32_t friendgroupnumber, TOX_MESSAGE_TYPE type,
+                              const uint8_t *message, size_t length,
                               void *userdata)
 {
-    if (tox_group_peernumber_is_ours(tox, groupnumber, friendgroupnumber)) {
+    if (tox_conference_peer_number_is_ours(tox, groupnumber, friendgroupnumber)) {
         return;
     }
 
     uint8_t name[TOX_MAX_NAME_LENGTH];
-    int namelen = tox_group_peername(tox, groupnumber, friendgroupnumber, name);
+    int namelen = tox_conference_peer_get_name_size(tox, groupnumber, friendgroupnumber, NULL);
+    tox_conference_peer_get_name(tox, groupnumber, friendgroupnumber, name, NULL);
 
     if (namelen == 0 || namelen == -1) {
         memcpy(name, "<unknown>", 9);
@@ -216,7 +219,7 @@ static void send_irc_group(Tox *tox, uint8_t *msg, uint16_t len)
 
     memcpy(message + length, msg + req_len + 2, len - (req_len + 2));
     length += len - (req_len + 2);
-    tox_group_message_send(tox, current_group, message, length);
+    tox_conference_send_message(tox, current_group, TOX_MESSAGE_TYPE_NORMAL, message, length, NULL);
 }
 
 static Tox *init_tox(int argc, char *argv[])
@@ -242,9 +245,8 @@ static Tox *init_tox(int argc, char *argv[])
 
     tox_self_set_name(tox, (const uint8_t *)IRC_NAME, sizeof(IRC_NAME) - 1, 0);
     tox_callback_friend_message(tox, &callback_friend_message);
-    tox_callback_group_invite(tox, &callback_group_invite, 0);
-    tox_callback_group_message(tox, &copy_groupmessage, 0);
-    tox_callback_group_action(tox, &copy_groupmessage, 0);
+    tox_callback_conference_invite(tox, &callback_group_invite, 0);
+    tox_callback_conference_message(tox, &copy_groupmessage, 0);
 
     char temp_id[128];
     printf("\nEnter the address of irc_syncbots master (38 bytes HEX format):\n");
diff --git a/testing/nTox.c b/testing/nTox.c
index a12480ec..b1c29c2d 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -529,7 +529,7 @@ static void line_eval(Tox *m, char *line)
             new_lines(idstring);
         } else if (inpt_command == 'g') { //create new group chat
             char msg[256];
-            sprintf(msg, "[g] Created new group chat with number: %u", tox_add_groupchat(m));
+            sprintf(msg, "[g] Created new group chat with number: %u", tox_conference_new(m, NULL));
             new_lines(msg);
         } else if (inpt_command == 'i') { //invite friendnum to groupnum
             char *posi[1];
@@ -537,14 +537,15 @@ static void line_eval(Tox *m, char *line)
             int groupnumber = strtoul(*posi + 1, NULL, 0);
             char msg[256];
             sprintf(msg, "[g] Invited friend number %u to group number %u, returned: %u (0 means success)", friendnumber,
-                    groupnumber, tox_invite_friend(m, friendnumber, groupnumber));
+                    groupnumber, tox_conference_invite(m, friendnumber, groupnumber, NULL));
             new_lines(msg);
         } else if (inpt_command == 'z') { //send message to groupnum
             char *posi[1];
             int groupnumber = strtoul(line + prompt_offset, posi, 0);
 
             if (**posi != 0) {
-                int res = tox_group_message_send(m, groupnumber, (uint8_t *)*posi + 1, strlen(*posi + 1));
+                int res = tox_conference_send_message(m, groupnumber, TOX_MESSAGE_TYPE_NORMAL, (uint8_t *)*posi + 1, strlen(*posi + 1),
+                                                      NULL);
 
                 if (res == 0) {
                     char msg[32 + STRING_LENGTH];
@@ -611,7 +612,7 @@ static void line_eval(Tox *m, char *line)
 
             if (posi != NULL) {
                 char msg[64];
-                int peer_cnt = tox_group_number_peers(m, group_number);
+                int peer_cnt = tox_conference_peer_count(m, group_number, NULL);
 
                 if (peer_cnt < 0) {
                     new_lines("[g] Invalid group number.");
@@ -642,7 +643,7 @@ static void line_eval(Tox *m, char *line)
                 }
             } else {
                 int groupnumber = - conversation_default - 1;
-                int res = tox_group_message_send(m, groupnumber, (uint8_t *)line, strlen(line));
+                int res = tox_conference_send_message(m, groupnumber, TOX_MESSAGE_TYPE_NORMAL, (uint8_t *)line, strlen(line), NULL);
 
                 if (res == 0) {
                     char msg[32 + STRING_LENGTH];
@@ -1050,13 +1051,14 @@ static void print_help(char *prog_name)
     puts("  -f keyfile      [Optional] Specify a keyfile to read from and write to.");
 }
 
-static void print_invite(Tox *m, int friendnumber, uint8_t type, const uint8_t *data, uint16_t length, void *userdata)
+static void print_invite(Tox *m, uint32_t friendnumber, TOX_CONFERENCE_TYPE type, const uint8_t *data, size_t length,
+                         void *userdata)
 {
     char msg[256];
 
-    if (type == TOX_GROUPCHAT_TYPE_TEXT) {
+    if (type == TOX_CONFERENCE_TYPE_TEXT) {
         sprintf(msg, "[i] received group chat invite from: %u, auto accepting and joining. group number: %u", friendnumber,
-                tox_join_groupchat(m, friendnumber, data, length));
+                tox_conference_join(m, friendnumber, data, length, NULL));
     } else {
         sprintf(msg, "[i] Group chat invite received of type %u that could not be accepted by ntox.", type);
     }
@@ -1066,7 +1068,7 @@ static void print_invite(Tox *m, int friendnumber, uint8_t type, const uint8_t *
 
 static void print_groupchatpeers(Tox *m, int groupnumber)
 {
-    int num = tox_group_number_peers(m, groupnumber);
+    int num = tox_conference_peer_count(m, groupnumber, NULL);
 
     if (num < 0) {
         return;
@@ -1079,8 +1081,14 @@ static void print_groupchatpeers(Tox *m, int groupnumber)
 
     uint8_t names[num][TOX_MAX_NAME_LENGTH];
     uint16_t lengths[num];
-    tox_group_get_names(m, groupnumber, names, lengths, num);
+
     int i;
+
+    for (i = 0; i < num; ++i) {
+        lengths[i] = tox_conference_peer_get_name_size(m, groupnumber, i, NULL);
+        tox_conference_peer_get_name(m, groupnumber, i, names[i], NULL);
+    }
+
     char numstr[16];
     char header[] = "[g]+ ";
     size_t header_len = strlen(header);
@@ -1113,12 +1121,14 @@ static void print_groupchatpeers(Tox *m, int groupnumber)
     new_lines_mark(msg, 1);
 }
 
-static void print_groupmessage(Tox *m, int groupnumber, int peernumber, const uint8_t *message, uint16_t length,
+static void print_groupmessage(Tox *m, uint32_t groupnumber, uint32_t peernumber, TOX_MESSAGE_TYPE type,
+                               const uint8_t *message, size_t length,
                                void *userdata)
 {
     char msg[256 + length];
     uint8_t name[TOX_MAX_NAME_LENGTH] = {0};
-    int len = tox_group_peername(m, groupnumber, peernumber, name);
+    int len = tox_conference_peer_get_name_size(m, groupnumber, peernumber, NULL);
+    tox_conference_peer_get_name(m, groupnumber, peernumber, name, NULL);
 
     //print_groupchatpeers(m, groupnumber);
     if (len <= 0) {
@@ -1133,27 +1143,29 @@ static void print_groupmessage(Tox *m, int groupnumber, int peernumber, const ui
 
     new_lines(msg);
 }
-static void print_groupnamelistchange(Tox *m, int groupnumber, int peernumber, uint8_t change, void *userdata)
+static void print_groupnamelistchange(Tox *m, uint32_t groupnumber, uint32_t peernumber, TOX_CONFERENCE_CHANGE change,
+                                      void *userdata)
 {
     char msg[256];
 
-    if (change == TOX_CHAT_CHANGE_PEER_ADD) {
+    if (change == TOX_CONFERENCE_CHANGE_PEER_ADD) {
         sprintf(msg, "[g] #%i: New peer %i.", groupnumber, peernumber);
         new_lines(msg);
-    } else if (change == TOX_CHAT_CHANGE_PEER_DEL) {
+    } else if (change == TOX_CONFERENCE_CHANGE_PEER_DEL) {
         /* if peer was the last in list, it simply dropped,
          * otherwise it was overwritten by the last peer
          *
          * adjust output
          */
-        int peers_total = tox_group_number_peers(m, groupnumber);
+        int peers_total = tox_conference_peer_count(m, groupnumber, NULL);
 
         if (peers_total == peernumber) {
             sprintf(msg, "[g] #%i: Peer %i left.", groupnumber, peernumber);
             new_lines(msg);
         } else {
             uint8_t peername[TOX_MAX_NAME_LENGTH] = {0};
-            int len = tox_group_peername(m, groupnumber, peernumber, peername);
+            int len = tox_conference_peer_get_name_size(m, groupnumber, peernumber, NULL);
+            tox_conference_peer_get_name(m, groupnumber, peernumber, peername, NULL);
 
             if (len <= 0) {
                 peername[0] = 0;
@@ -1163,9 +1175,10 @@ static void print_groupnamelistchange(Tox *m, int groupnumber, int peernumber, u
                     peers_total, peername, peernumber);
             new_lines(msg);
         }
-    } else if (change == TOX_CHAT_CHANGE_PEER_NAME) {
+    } else if (change == TOX_CONFERENCE_CHANGE_PEER_NAME) {
         uint8_t peername[TOX_MAX_NAME_LENGTH] = {0};
-        int len = tox_group_peername(m, groupnumber, peernumber, peername);
+        int len = tox_conference_peer_get_name_size(m, groupnumber, peernumber, NULL);
+        tox_conference_peer_get_name(m, groupnumber, peernumber, peername, NULL);
 
         if (len <= 0) {
             peername[0] = 0;
@@ -1343,13 +1356,13 @@ int main(int argc, char *argv[])
     tox_callback_friend_message(m, print_message);
     tox_callback_friend_name(m, print_nickchange);
     tox_callback_friend_status_message(m, print_statuschange);
-    tox_callback_group_invite(m, print_invite, NULL);
-    tox_callback_group_message(m, print_groupmessage, NULL);
+    tox_callback_conference_invite(m, print_invite, NULL);
+    tox_callback_conference_message(m, print_groupmessage, NULL);
     tox_callback_file_recv_chunk(m, write_file);
     tox_callback_file_recv_control(m, file_print_control);
     tox_callback_file_recv(m, file_request_accept);
     tox_callback_file_chunk_request(m, tox_file_chunk_request);
-    tox_callback_group_namelist_change(m, print_groupnamelistchange, NULL);
+    tox_callback_conference_namelist_change(m, print_groupnamelistchange, NULL);
     tox_callback_friend_connection_status(m, print_online);
 
     initscr();
diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc
index f73ac3e9..cf1dfa2c 100644
--- a/toxcore/Makefile.inc
+++ b/toxcore/Makefile.inc
@@ -1,8 +1,7 @@
 lib_LTLIBRARIES += libtoxcore.la
 
 libtoxcore_la_include_HEADERS = \
-                        ../toxcore/tox.h \
-                        ../toxcore/tox_group.h
+                        ../toxcore/tox.h
 
 libtoxcore_la_includedir = $(includedir)/tox
 
diff --git a/toxcore/group.c b/toxcore/group.c
index 730378ea..55531ad3 100644
--- a/toxcore/group.c
+++ b/toxcore/group.c
@@ -808,6 +808,25 @@ int group_peer_pubkey(const Group_Chats *g_c, int groupnumber, int peernumber, u
     return 0;
 }
 
+int group_peername_size(const Group_Chats *g_c, int groupnumber, int peernumber)
+{
+    Group_c *g = get_group_c(g_c, groupnumber);
+
+    if (!g) {
+        return -1;
+    }
+
+    if ((uint32_t)peernumber >= g->numpeers) {
+        return -1;
+    }
+
+    if (g->group[peernumber].nick_len == 0) {
+        return 8;
+    }
+
+    return g->group[peernumber].nick_len;
+}
+
 /* Copy the name of peernumber who is in groupnumber to name.
  * name must be at least MAX_NAME_LENGTH long.
  *
@@ -1063,8 +1082,8 @@ int join_groupchat(Group_Chats *g_c, int32_t friendnumber, uint8_t expected_type
  *
  *  data of length is what needs to be passed to join_groupchat().
  */
-void g_callback_group_invite(Group_Chats *g_c, void (*function)(Messenger *m, int32_t, uint8_t, const uint8_t *,
-                             uint16_t, void *), void *userdata)
+void g_callback_group_invite(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, int, const uint8_t *,
+                             size_t, void *), void *userdata)
 {
     g_c->invite_callback = function;
     g_c->invite_callback_userdata = userdata;
@@ -1074,24 +1093,14 @@ void g_callback_group_invite(Group_Chats *g_c, void (*function)(Messenger *m, in
  *
  *  Function(Group_Chats *g_c, int groupnumber, int friendgroupnumber, uint8_t * message, uint16_t length, void *userdata)
  */
-void g_callback_group_message(Group_Chats *g_c, void (*function)(Messenger *m, int, int, const uint8_t *, uint16_t,
+void g_callback_group_message(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, int, const uint8_t *,
+                              size_t,
                               void *), void *userdata)
 {
     g_c->message_callback = function;
     g_c->message_callback_userdata = userdata;
 }
 
-/* Set the callback for group actions.
- *
- *  Function(Group_Chats *g_c, int groupnumber, int friendgroupnumber, uint8_t * message, uint16_t length, void *userdata)
- */
-void g_callback_group_action(Group_Chats *g_c, void (*function)(Messenger *m, int, int, const uint8_t *, uint16_t,
-                             void *), void *userdata)
-{
-    g_c->action_callback = function;
-    g_c->action_callback_userdata = userdata;
-}
-
 /* Set handlers for custom lossy packets.
  *
  * NOTE: Handler must return 0 if packet is to be relayed, -1 if the packet should not be relayed.
@@ -1121,7 +1130,8 @@ void g_callback_group_namelistchange(Group_Chats *g_c, void (*function)(Messenge
  * Function(Group_Chats *g_c, int groupnumber, int friendgroupnumber, uint8_t * title, uint8_t length, void *userdata)
  * if friendgroupnumber == -1, then author is unknown (e.g. initial joining the group)
  */
-void g_callback_group_title(Group_Chats *g_c, void (*function)(Messenger *m, int, int, const uint8_t *, uint8_t,
+void g_callback_group_title(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, const uint8_t *,
+                            size_t,
                             void *), void *userdata)
 {
     g_c->title_callback = function;
@@ -1298,13 +1308,28 @@ int group_title_send(const Group_Chats *g_c, int groupnumber, const uint8_t *tit
     return -1;
 }
 
+int group_title_get_size(const Group_Chats *g_c, int groupnumber)
+{
+    Group_c *g = get_group_c(g_c, groupnumber);
+
+    if (!g) {
+        return -1;
+    }
+
+    if (g->title_len == 0 || g->title_len > MAX_NAME_LENGTH) {
+        return -1;
+    }
+
+    return g->title_len;
+}
+
 /* Get group title from groupnumber and put it in title.
  * title needs to be a valid memory location with a max_length size of at least MAX_NAME_LENGTH (128) bytes.
  *
  *  return length of copied title if success.
  *  return -1 if failure.
  */
-int group_title_get(const Group_Chats *g_c, int groupnumber, uint8_t *title, uint32_t max_length)
+int group_title_get(const Group_Chats *g_c, int groupnumber, uint8_t *title)
 {
     Group_c *g = get_group_c(g_c, groupnumber);
 
@@ -1316,12 +1341,8 @@ int group_title_get(const Group_Chats *g_c, int groupnumber, uint8_t *title, uin
         return -1;
     }
 
-    if (max_length > g->title_len) {
-        max_length = g->title_len;
-    }
-
-    memcpy(title, g->title, max_length);
-    return max_length;
+    memcpy(title, g->title, g->title_len);
+    return g->title_len;
 }
 
 static void handle_friend_invite_packet(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t length)
@@ -2035,7 +2056,7 @@ static void handle_message_packet_group(Group_Chats *g_c, int groupnumber, const
 
             // TODO(irungentoo):
             if (g_c->message_callback) {
-                g_c->message_callback(g_c->m, groupnumber, index, newmsg, msg_data_len, g_c->message_callback_userdata);
+                g_c->message_callback(g_c->m, groupnumber, index, 0, newmsg, msg_data_len, g_c->message_callback_userdata);
             }
 
             break;
@@ -2051,8 +2072,8 @@ static void handle_message_packet_group(Group_Chats *g_c, int groupnumber, const
             newmsg[msg_data_len] = 0;
 
             // TODO(irungentoo):
-            if (g_c->action_callback) {
-                g_c->action_callback(g_c->m, groupnumber, index, newmsg, msg_data_len, g_c->action_callback_userdata);
+            if (g_c->message_callback) {
+                g_c->message_callback(g_c->m, groupnumber, index, 1, newmsg, msg_data_len, g_c->message_callback_userdata);
             }
 
             break;
diff --git a/toxcore/group.h b/toxcore/group.h
index 56151402..6d278dde 100644
--- a/toxcore/group.h
+++ b/toxcore/group.h
@@ -116,15 +116,13 @@ typedef struct {
     Group_c *chats;
     uint32_t num_chats;
 
-    void (*invite_callback)(Messenger *m, int32_t, uint8_t, const uint8_t *, uint16_t, void *);
+    void (*invite_callback)(Messenger *m, uint32_t, int, const uint8_t *, size_t, void *);
     void *invite_callback_userdata;
-    void (*message_callback)(Messenger *m, int, int, const uint8_t *, uint16_t, void *);
+    void (*message_callback)(Messenger *m, uint32_t, uint32_t, int, const uint8_t *, size_t, void *);
     void *message_callback_userdata;
-    void (*action_callback)(Messenger *m, int, int, const uint8_t *, uint16_t, void *);
-    void *action_callback_userdata;
     void (*peer_namelistchange)(Messenger *m, int, int, uint8_t, void *);
     void *group_namelistchange_userdata;
-    void (*title_callback)(Messenger *m, int, int, const uint8_t *, uint8_t, void *);
+    void (*title_callback)(Messenger *m, uint32_t, uint32_t, const uint8_t *, size_t, void *);
     void *title_callback_userdata;
 
     struct {
@@ -138,29 +136,25 @@ typedef struct {
  *
  *  data of length is what needs to be passed to join_groupchat().
  */
-void g_callback_group_invite(Group_Chats *g_c, void (*function)(Messenger *m, int32_t, uint8_t, const uint8_t *,
-                             uint16_t, void *), void *userdata);
+void g_callback_group_invite(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, int, const uint8_t *,
+                             size_t, void *), void *userdata);
 
 /* Set the callback for group messages.
  *
  *  Function(Group_Chats *g_c, int groupnumber, int friendgroupnumber, uint8_t * message, uint16_t length, void *userdata)
  */
-void g_callback_group_message(Group_Chats *g_c, void (*function)(Messenger *m, int, int, const uint8_t *, uint16_t,
+void g_callback_group_message(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, int, const uint8_t *,
+                              size_t,
                               void *), void *userdata);
 
-/* Set the callback for group actions.
- *
- *  Function(Group_Chats *g_c, int groupnumber, int friendgroupnumber, uint8_t * message, uint16_t length, void *userdata)
- */
-void g_callback_group_action(Group_Chats *g_c, void (*function)(Messenger *m, int, int, const uint8_t *, uint16_t,
-                             void *), void *userdata);
 
 /* Set callback function for title changes.
  *
  * Function(Group_Chats *g_c, int groupnumber, int friendgroupnumber, uint8_t * title, uint8_t length, void *userdata)
  * if friendgroupnumber == -1, then author is unknown (e.g. initial joining the group)
  */
-void g_callback_group_title(Group_Chats *g_c, void (*function)(Messenger *m, int, int, const uint8_t *, uint8_t,
+void g_callback_group_title(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, const uint8_t *,
+                            size_t,
                             void *), void *userdata);
 
 /* Set callback function for peer name list changes.
@@ -200,6 +194,8 @@ int del_groupchat(Group_Chats *g_c, int groupnumber);
  */
 int group_peer_pubkey(const Group_Chats *g_c, int groupnumber, int peernumber, uint8_t *pk);
 
+int group_peername_size(const Group_Chats *g_c, int groupnumber, int peernumber);
+
 /* Copy the name of peernumber who is in groupnumber to name.
  * name must be at least MAX_NAME_LENGTH long.
  *
@@ -242,13 +238,15 @@ int group_action_send(const Group_Chats *g_c, int groupnumber, const uint8_t *ac
 int group_title_send(const Group_Chats *g_c, int groupnumber, const uint8_t *title, uint8_t title_len);
 
 
+int group_title_get_size(const Group_Chats *g_c, int groupnumber);
+
 /* Get group title from groupnumber and put it in title.
  * title needs to be a valid memory location with a max_length size of at least MAX_NAME_LENGTH (128) bytes.
  *
  *  return length of copied title if success.
  *  return -1 if failure.
  */
-int group_title_get(const Group_Chats *g_c, int groupnumber, uint8_t *title, uint32_t max_length);
+int group_title_get(const Group_Chats *g_c, int groupnumber, uint8_t *title);
 
 /* Return the number of peers in the group chat on success.
  * return -1 on failure
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 61c4227a..7b04bb14 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -2274,14 +2274,243 @@ void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *callback);
 
 
 
+typedef enum TOX_ERR_CONFERENCE {
 
-/*******************************************************************************
+    /**
+     * The function returned successfully.
+     */
+    TOX_ERR_CONFERENCE_OK,
+
+    /**
+     * Some error occurred.
+     */
+    TOX_ERR_CONFERENCE_FAILURE,
+
+} TOX_ERR_CONFERENCE;
+
+
+/**
+ * Conference types for the conference_invite event.
+ */
+typedef enum TOX_CONFERENCE_TYPE {
+
+    /**
+     * Text-only conferences that must be accepted with the tox_conference_join function.
+     */
+    TOX_CONFERENCE_TYPE_TEXT,
+
+    /**
+     * Video conference. The function to accept these is in toxav.
+     */
+    TOX_CONFERENCE_TYPE_AV,
+
+} TOX_CONFERENCE_TYPE;
+
+
+/**
+ * The invitation will remain valid until the inviting friend goes offline
+ * or exits the conference.
  *
- * :: Group chat message sending and receiving
+ * @param friend_number The friend who invited us.
+ * @param type The conference type (text only or audio/video).
+ * @param cookie A piece of data of variable length required to join the
+ *   conference.
+ * @param length The length of the cookie.
+ */
+typedef void tox_conference_invite_cb(Tox *tox, uint32_t friend_number, TOX_CONFERENCE_TYPE type, const uint8_t *cookie,
+                                      size_t length, void *user_data);
+
+
+/**
+ * Set the callback for the `conference_invite` event. Pass NULL to unset.
  *
- ******************************************************************************/
+ * This event is triggered when the client is invited to join a conference.
+ */
+void tox_callback_conference_invite(Tox *tox, tox_conference_invite_cb *callback, void *user_data);
+
+/**
+ * TODO
+ */
+typedef void tox_conference_message_cb(Tox *tox, uint32_t group_number, uint32_t peer_number, TOX_MESSAGE_TYPE type,
+                                       const uint8_t *message, size_t length, void *user_data);
+
+
+/**
+ * Set the callback for the `conference_message` event. Pass NULL to unset.
+ *
+ * Set the callback for group messages.
+ */
+void tox_callback_conference_message(Tox *tox, tox_conference_message_cb *callback, void *user_data);
+
+/**
+ * TODO
+ */
+typedef void tox_conference_title_cb(Tox *tox, uint32_t group_number, uint32_t peer_number, const uint8_t *title,
+                                     size_t length, void *user_data);
+
+
+/**
+ * Set the callback for the `conference_title` event. Pass NULL to unset.
+ *
+ * Set callback function for title changes.
+ *
+ * if peer_number == UINT32_MAX, then author is unknown (e.g. initial joining the group)
+ */
+void tox_callback_conference_title(Tox *tox, tox_conference_title_cb *callback, void *user_data);
+
+typedef enum TOX_CONFERENCE_CHANGE {
+
+    /**
+     * TODO: Generate doc
+     */
+    TOX_CONFERENCE_CHANGE_PEER_ADD,
+
+    /**
+     * TODO: Generate doc
+     */
+    TOX_CONFERENCE_CHANGE_PEER_DEL,
+
+    /**
+     * TODO: Generate doc
+     */
+    TOX_CONFERENCE_CHANGE_PEER_NAME,
+
+} TOX_CONFERENCE_CHANGE;
+
+
+/**
+ * TODO
+ */
+typedef void tox_conference_namelist_change_cb(Tox *tox, uint32_t group_number, uint32_t peer_number,
+        TOX_CONFERENCE_CHANGE change, void *user_data);
+
+
+/**
+ * Set the callback for the `conference_namelist_change` event. Pass NULL to unset.
+ *
+ * Set callback function for peer name list changes.
+ *
+ * It gets called every time the name list changes(new peer/name, deleted peer)
+ */
+void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback, void *user_data);
+
+/**
+ * Creates a new groupchat.
+ *
+ * @return the group number.
+ */
+uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE *error);
+
+/**
+ * Delete a groupchat.
+ *
+ * @return true on success.
+ */
+bool tox_conference_delete(Tox *tox, uint32_t group_number, TOX_ERR_CONFERENCE *error);
 
+/**
+ * Return the number of peers in the group chat.
+ */
+uint32_t tox_conference_peer_count(const Tox *tox, uint32_t group_number, TOX_ERR_CONFERENCE *error);
 
+size_t tox_conference_peer_get_name_size(const Tox *tox, uint32_t group_number, uint32_t peer_number,
+        TOX_ERR_CONFERENCE *error);
+
+/**
+ * Copy the name of peer_number who is in group_number to name.
+ * name must be at least TOX_MAX_NAME_LENGTH long.
+ *
+ * return length of name if success
+ * return -1 if failure
+ */
+bool tox_conference_peer_get_name(const Tox *tox, uint32_t group_number, uint32_t peer_number, uint8_t *name,
+                                  TOX_ERR_CONFERENCE *error);
+
+/**
+ * Copy the public key of peer_number who is in group_number to public_key.
+ * public_key must be TOX_PUBLIC_KEY_SIZE long.
+ *
+ * returns 0 on success
+ * returns -1 on failure
+ */
+bool tox_conference_peer_get_public_key(const Tox *tox, uint32_t group_number, uint32_t peer_number,
+                                        uint8_t *public_key, TOX_ERR_CONFERENCE *error);
+
+/**
+ * Check if the current peer_number corresponds to ours.
+ *
+ * return 1 if the peer_number corresponds to ours.
+ * return 0 on failure.
+ */
+bool tox_conference_peer_number_is_ours(const Tox *tox, uint32_t group_number, uint32_t peer_number);
+
+/**
+ * invite friend_number to group_number
+ * return 0 on success
+ * return -1 on failure
+ */
+bool tox_conference_invite(Tox *tox, uint32_t friend_number, uint32_t group_number, TOX_ERR_CONFERENCE *error);
+
+/**
+ * Join a group (you need to have been invited first.) using cookie of length obtained
+ * in the group invite callback.
+ *
+ * returns group number on success
+ * returns -1 on failure.
+ */
+uint32_t tox_conference_join(Tox *tox, uint32_t friend_number, const uint8_t *cookie, size_t length,
+                             TOX_ERR_CONFERENCE *error);
+
+/**
+ * send a group message
+ * return 0 on success
+ * return -1 on failure
+ */
+bool tox_conference_send_message(Tox *tox, uint32_t group_number, TOX_MESSAGE_TYPE type, const uint8_t *message,
+                                 size_t length, TOX_ERR_CONFERENCE *error);
+
+size_t tox_conference_get_title_size(const Tox *tox, uint32_t group_number, TOX_ERR_CONFERENCE *error);
+
+/**
+ * Get group title from group_number and put it in title.
+ * title needs to be a valid memory location with a max_length size of at least MAX_NAME_LENGTH (128) bytes.
+ *
+ *  return length of copied title if success.
+ *  return -1 if failure.
+ */
+bool tox_conference_get_title(const Tox *tox, uint32_t group_number, uint8_t *title, TOX_ERR_CONFERENCE *error);
+
+/**
+ * set the group's title, limited to MAX_NAME_LENGTH
+ * return 0 on success
+ * return -1 on failure
+ */
+bool tox_conference_set_title(Tox *tox, uint32_t group_number, const uint8_t *title, size_t length,
+                              TOX_ERR_CONFERENCE *error);
+
+/**
+ * Return the number of chats in the instance m.
+ * You should use this to determine how much memory to allocate
+ * for copy_chatlist.
+ */
+size_t tox_conference_get_chatlist_size(const Tox *tox);
+
+/**
+ * Copy a list of valid chat IDs into the array out_list.
+ * If out_list is NULL, returns 0.
+ * Otherwise, returns the number of elements copied.
+ * If the array was too small, the contents
+ * of out_list will be truncated to list_size.
+ */
+void tox_conference_get_chatlist(const Tox *tox, uint32_t *chatlist);
+
+/**
+ * return the type of groupchat (TOX_CONFERENCE_TYPE) that group_number is.
+ *
+ * return -1 on failure.
+ * return type on success.
+ */
+TOX_CONFERENCE_TYPE tox_conference_get_type(const Tox *tox, uint32_t group_number, TOX_ERR_CONFERENCE *error);
 
 
 /*******************************************************************************
@@ -2459,8 +2688,6 @@ uint16_t tox_self_get_udp_port(const Tox *tox, TOX_ERR_GET_PORT *error);
  */
 uint16_t tox_self_get_tcp_port(const Tox *tox, TOX_ERR_GET_PORT *error);
 
-#include "tox_group.h"
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/toxcore/tox_group.c b/toxcore/tox_group.c
index 62c84b22..445ce9de 100644
--- a/toxcore/tox_group.c
+++ b/toxcore/tox_group.c
@@ -32,6 +32,8 @@ typedef struct Messenger Tox;
 #include "Messenger.h"
 #include "group.h"
 
+#define SET_ERROR_PARAMETER(param, x) {if(param) {*param = x;}}
+
 /**********GROUP CHAT FUNCTIONS: WARNING Group chats will be rewritten so this might change ************/
 
 /* Set the callback for group invites.
@@ -40,33 +42,26 @@ typedef struct Messenger Tox;
  *
  * data of length is what needs to be passed to join_groupchat().
  */
-void tox_callback_group_invite(Tox *tox, void (*function)(Messenger *tox, int32_t, uint8_t, const uint8_t *, uint16_t,
-                               void *), void *userdata)
+void tox_callback_conference_invite(Tox *tox, tox_conference_invite_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    g_callback_group_invite(m->group_chat_object, function, userdata);
+    g_callback_group_invite(
+        m->group_chat_object,
+        (void (*)(Messenger * m, uint32_t, int, const uint8_t *, size_t, void *))callback,
+        user_data);
 }
 
 /* Set the callback for group messages.
  *
  *  Function(Tox *tox, int groupnumber, int peernumber, uint8_t * message, uint16_t length, void *userdata)
  */
-void tox_callback_group_message(Tox *tox, void (*function)(Messenger *tox, int, int, const uint8_t *, uint16_t, void *),
-                                void *userdata)
-{
-    Messenger *m = tox;
-    g_callback_group_message(m->group_chat_object, function, userdata);
-}
-
-/* Set the callback for group actions.
- *
- *  Function(Tox *tox, int groupnumber, int peernumber, uint8_t * action, uint16_t length, void *userdata)
- */
-void tox_callback_group_action(Tox *tox, void (*function)(Messenger *tox, int, int, const uint8_t *, uint16_t, void *),
-                               void *userdata)
+void tox_callback_conference_message(Tox *tox, tox_conference_message_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    g_callback_group_action(m->group_chat_object, function, userdata);
+    g_callback_group_message(
+        m->group_chat_object,
+        (void (*)(Messenger * m, uint32_t, uint32_t, int, const uint8_t *, size_t, void *))callback,
+        user_data);
 }
 
 /* Set callback function for title changes.
@@ -74,11 +69,10 @@ void tox_callback_group_action(Tox *tox, void (*function)(Messenger *tox, int, i
  * Function(Tox *tox, int groupnumber, int peernumber, uint8_t * title, uint8_t length, void *userdata)
  * if peernumber == -1, then author is unknown (e.g. initial joining the group)
  */
-void tox_callback_group_title(Tox *tox, void (*function)(Messenger *tox, int, int, const uint8_t *, uint8_t,
-                              void *), void *userdata)
+void tox_callback_conference_title(Tox *tox, tox_conference_title_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    g_callback_group_title(m->group_chat_object, function, userdata);
+    g_callback_group_title(m->group_chat_object, callback, user_data);
 }
 
 /* Set callback function for peer name list changes.
@@ -86,10 +80,13 @@ void tox_callback_group_title(Tox *tox, void (*function)(Messenger *tox, int, in
  * It gets called every time the name list changes(new peer/name, deleted peer)
  *  Function(Tox *tox, int groupnumber, void *userdata)
  */
-void tox_callback_group_namelist_change(Tox *tox, void (*function)(Tox *tox, int, int, uint8_t, void *), void *userdata)
+void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback, void *user_data)
 {
     Messenger *m = tox;
-    g_callback_group_namelistchange(m->group_chat_object, function, userdata);
+    g_callback_group_namelistchange(
+        m->group_chat_object,
+        (void (*)(struct Messenger *, int, int, uint8_t, void *))callback,
+        user_data);
 }
 
 /* Creates a new groupchat and puts it in the chats array.
@@ -97,10 +94,18 @@ void tox_callback_group_namelist_change(Tox *tox, void (*function)(Tox *tox, int
  * return group number on success.
  * return -1 on failure.
  */
-int tox_add_groupchat(Tox *tox)
+uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE *error)
 {
     Messenger *m = tox;
-    return add_groupchat(m->group_chat_object, GROUPCHAT_TYPE_TEXT);
+    int res = add_groupchat(m->group_chat_object, GROUPCHAT_TYPE_TEXT);
+
+    if (res == -1) {
+        SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_FAILURE);
+        return 0;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_OK);
+    return res;
 }
 
 /* Delete a groupchat from the chats array.
@@ -108,10 +113,33 @@ int tox_add_groupchat(Tox *tox)
  * return 0 on success.
  * return -1 if failure.
  */
-int tox_del_groupchat(Tox *tox, int groupnumber)
+bool tox_conference_delete(Tox *tox, uint32_t group_number, TOX_ERR_CONFERENCE *error)
 {
     Messenger *m = tox;
-    return del_groupchat(m->group_chat_object, groupnumber);
+    int res = del_groupchat(m->group_chat_object, group_number);
+
+    if (res == -1) {
+        SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_FAILURE);
+        return false;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_OK);
+    return true;
+}
+
+size_t tox_conference_peer_get_name_size(
+    const Tox *tox, uint32_t group_number, uint32_t peer_number, TOX_ERR_CONFERENCE *error)
+{
+    const Messenger *m = tox;
+    int res = group_peername_size(m->group_chat_object, group_number, peer_number);
+
+    if (res == -1) {
+        SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_FAILURE);
+        return 0;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_OK);
+    return res;
 }
 
 /* Copy the name of peernumber who is in groupnumber to name.
@@ -120,10 +148,11 @@ int tox_del_groupchat(Tox *tox, int groupnumber)
  * return length of name if success
  * return -1 if failure
  */
-int tox_group_peername(const Tox *tox, int groupnumber, int peernumber, uint8_t *name)
+bool tox_conference_peer_get_name(const Tox *tox, uint32_t group_number, uint32_t peer_number, uint8_t *name,
+                                  TOX_ERR_CONFERENCE *error)
 {
     const Messenger *m = tox;
-    return group_peername(m->group_chat_object, groupnumber, peernumber, name);
+    return group_peername(m->group_chat_object, group_number, peer_number, name);
 }
 
 /* Copy the public key of peernumber who is in groupnumber to public_key.
@@ -132,20 +161,21 @@ int tox_group_peername(const Tox *tox, int groupnumber, int peernumber, uint8_t
  * returns 0 on success
  * returns -1 on failure
  */
-int tox_group_peer_pubkey(const Tox *tox, int groupnumber, int peernumber, uint8_t *public_key)
+bool tox_conference_peer_get_public_key(const Tox *tox, uint32_t group_number, uint32_t peer_number,
+                                        uint8_t *public_key, TOX_ERR_CONFERENCE *error)
 {
     const Messenger *m = tox;
-    return group_peer_pubkey(m->group_chat_object, groupnumber, peernumber, public_key);
+    return group_peer_pubkey(m->group_chat_object, group_number, peer_number, public_key);
 }
 
 /* invite friendnumber to groupnumber
  * return 0 on success
  * return -1 on failure
  */
-int tox_invite_friend(Tox *tox, int32_t friendnumber, int groupnumber)
+bool tox_conference_invite(Tox *tox, uint32_t friendnumber, uint32_t group_number, TOX_ERR_CONFERENCE *error)
 {
     Messenger *m = tox;
-    return invite_friend(m->group_chat_object, friendnumber, groupnumber);
+    return invite_friend(m->group_chat_object, friendnumber, group_number);
 }
 
 /* Join a group (you need to have been invited first.) using data of length obtained
@@ -154,7 +184,8 @@ int tox_invite_friend(Tox *tox, int32_t friendnumber, int groupnumber)
  * returns group number on success
  * returns -1 on failure.
  */
-int tox_join_groupchat(Tox *tox, int32_t friendnumber, const uint8_t *data, uint16_t length)
+uint32_t tox_conference_join(Tox *tox, uint32_t friendnumber, const uint8_t *data, size_t length,
+                             TOX_ERR_CONFERENCE *error)
 {
     Messenger *m = tox;
     return join_groupchat(m->group_chat_object, friendnumber, GROUPCHAT_TYPE_TEXT, data, length);
@@ -164,42 +195,45 @@ int tox_join_groupchat(Tox *tox, int32_t friendnumber, const uint8_t *data, uint
  * return 0 on success
  * return -1 on failure
  */
-int tox_group_message_send(Tox *tox, int groupnumber, const uint8_t *message, uint16_t length)
+bool tox_conference_send_message(Tox *tox, uint32_t groupnumber, TOX_MESSAGE_TYPE type, const uint8_t *message,
+                                 size_t length, TOX_ERR_CONFERENCE *error)
 {
     Messenger *m = tox;
-    return group_message_send(m->group_chat_object, groupnumber, message, length);
-}
 
-/* send a group action
- * return 0 on success
- * return -1 on failure
- */
-int tox_group_action_send(Tox *tox, int groupnumber, const uint8_t *action, uint16_t length)
-{
-    Messenger *m = tox;
-    return group_action_send(m->group_chat_object, groupnumber, action, length);
+    if (type == TOX_MESSAGE_TYPE_NORMAL) {
+        return group_message_send(m->group_chat_object, groupnumber, message, length);
+    } else {
+        return group_action_send(m->group_chat_object, groupnumber, message, length);
+    }
 }
 
 /* set the group's title, limited to MAX_NAME_LENGTH
  * return 0 on success
  * return -1 on failure
  */
-int tox_group_set_title(Tox *tox, int groupnumber, const uint8_t *title, uint8_t length)
+bool tox_conference_set_title(Tox *tox, uint32_t groupnumber, const uint8_t *title, size_t length,
+                              TOX_ERR_CONFERENCE *error)
 {
     Messenger *m = tox;
     return group_title_send(m->group_chat_object, groupnumber, title, length);
 }
 
+size_t tox_conference_get_title_size(const Tox *tox, uint32_t groupnumber, TOX_ERR_CONFERENCE *error)
+{
+    const Messenger *m = tox;
+    return group_title_get_size(m->group_chat_object, groupnumber);
+}
+
 /* Get group title from groupnumber and put it in title.
  * title needs to be a valid memory location with a max_length size of at least MAX_NAME_LENGTH (128) bytes.
  *
  *  return length of copied title if success.
  *  return -1 if failure.
  */
-int tox_group_get_title(Tox *tox, int groupnumber, uint8_t *title, uint32_t max_length)
+bool tox_conference_get_title(const Tox *tox, uint32_t groupnumber, uint8_t *title, TOX_ERR_CONFERENCE *error)
 {
-    Messenger *m = tox;
-    return group_title_get(m->group_chat_object, groupnumber, title, max_length);
+    const Messenger *m = tox;
+    return group_title_get(m->group_chat_object, groupnumber, title);
 }
 
 /* Check if the current peernumber corresponds to ours.
@@ -207,7 +241,7 @@ int tox_group_get_title(Tox *tox, int groupnumber, uint8_t *title, uint32_t max_
  * return 1 if the peernumber corresponds to ours.
  * return 0 on failure.
  */
-unsigned int tox_group_peernumber_is_ours(const Tox *tox, int groupnumber, int peernumber)
+bool tox_conference_peer_number_is_ours(const Tox *tox, uint32_t groupnumber, uint32_t peernumber)
 {
     const Messenger *m = tox;
     return group_peernumber_is_ours(m->group_chat_object, groupnumber, peernumber);
@@ -216,33 +250,16 @@ unsigned int tox_group_peernumber_is_ours(const Tox *tox, int groupnumber, int p
 /* Return the number of peers in the group chat on success.
  * return -1 on failure
  */
-int tox_group_number_peers(const Tox *tox, int groupnumber)
+uint32_t tox_conference_peer_count(const Tox *tox, uint32_t groupnumber, TOX_ERR_CONFERENCE *error)
 {
     const Messenger *m = tox;
     return group_number_peers(m->group_chat_object, groupnumber);
 }
 
-/* List all the peers in the group chat.
- *
- * Copies the names of the peers to the name[length][MAX_NICK_BYTES] array.
- *
- * Copies the lengths of the names to lengths[length]
- *
- * returns the number of peers on success.
- *
- * return -1 on failure.
- */
-int tox_group_get_names(const Tox *tox, int groupnumber, uint8_t names[][TOX_MAX_NAME_LENGTH], uint16_t lengths[],
-                        uint16_t length)
-{
-    const Messenger *m = tox;
-    return group_names(m->group_chat_object, groupnumber, names, lengths, length);
-}
-
 /* Return the number of chats in the instance m.
  * You should use this to determine how much memory to allocate
  * for copy_chatlist. */
-uint32_t tox_count_chatlist(const Tox *tox)
+size_t tox_conference_get_chatlist_size(const Tox *tox)
 {
     const Messenger *m = tox;
     return count_chatlist(m->group_chat_object);
@@ -253,10 +270,11 @@ uint32_t tox_count_chatlist(const Tox *tox)
  * Otherwise, returns the number of elements copied.
  * If the array was too small, the contents
  * of out_list will be truncated to list_size. */
-uint32_t tox_get_chatlist(const Tox *tox, int32_t *out_list, uint32_t list_size)
+void tox_conference_get_chatlist(const Tox *tox, uint32_t *out_list)
 {
     const Messenger *m = tox;
-    return copy_chatlist(m->group_chat_object, out_list, list_size);
+    size_t list_size = tox_conference_get_chatlist_size(tox);
+    copy_chatlist(m->group_chat_object, out_list, list_size);
 }
 
 /* return the type of groupchat (TOX_GROUPCHAT_TYPE_) that groupnumber is.
@@ -264,7 +282,7 @@ uint32_t tox_get_chatlist(const Tox *tox, int32_t *out_list, uint32_t list_size)
  * return -1 on failure.
  * return type on success.
  */
-int tox_group_get_type(const Tox *tox, int groupnumber)
+TOX_CONFERENCE_TYPE tox_conference_get_type(const Tox *tox, uint32_t groupnumber, TOX_ERR_CONFERENCE *error)
 {
     const Messenger *m = tox;
     return group_get_type(m->group_chat_object, groupnumber);
diff --git a/toxcore/tox_group.h b/toxcore/tox_group.h
deleted file mode 100644
index 51beb570..00000000
--- a/toxcore/tox_group.h
+++ /dev/null
@@ -1,179 +0,0 @@
-#ifndef TOX_GROUP_H
-#define TOX_GROUP_H
-
-#include "tox.h"
-
-/**********GROUP CHAT FUNCTIONS ************/
-
-/* Group chat types for tox_callback_group_invite function.
- *
- * TOX_GROUPCHAT_TYPE_TEXT groupchats must be accepted with the tox_join_groupchat() function.
- * The function to accept TOX_GROUPCHAT_TYPE_AV is in toxav.
- */
-enum {
-    TOX_GROUPCHAT_TYPE_TEXT,
-    TOX_GROUPCHAT_TYPE_AV
-};
-
-/* Set the callback for group invites.
- *
- *  Function(Tox *tox, int32_t friendnumber, uint8_t type, const uint8_t *data, uint16_t length, void *userdata)
- *
- * data of length is what needs to be passed to join_groupchat().
- *
- * for what type means see the enum right above this comment.
- */
-void tox_callback_group_invite(Tox *tox, void (*function)(Tox *tox, int32_t, uint8_t, const uint8_t *, uint16_t,
-                               void *), void *userdata);
-
-/* Set the callback for group messages.
- *
- *  Function(Tox *tox, int groupnumber, int peernumber, const uint8_t * message, uint16_t length, void *userdata)
- */
-void tox_callback_group_message(Tox *tox, void (*function)(Tox *tox, int, int, const uint8_t *, uint16_t, void *),
-                                void *userdata);
-
-/* Set the callback for group actions.
- *
- *  Function(Tox *tox, int groupnumber, int peernumber, const uint8_t * action, uint16_t length, void *userdata)
- */
-void tox_callback_group_action(Tox *tox, void (*function)(Tox *tox, int, int, const uint8_t *, uint16_t, void *),
-                               void *userdata);
-
-/* Set callback function for title changes.
- *
- * Function(Tox *tox, int groupnumber, int peernumber, uint8_t * title, uint8_t length, void *userdata)
- * if peernumber == -1, then author is unknown (e.g. initial joining the group)
- */
-void tox_callback_group_title(Tox *tox, void (*function)(Tox *tox, int, int, const uint8_t *, uint8_t,
-                              void *), void *userdata);
-
-/* Set callback function for peer name list changes.
- *
- * It gets called every time the name list changes(new peer/name, deleted peer)
- *  Function(Tox *tox, int groupnumber, int peernumber, TOX_CHAT_CHANGE change, void *userdata)
- */
-typedef enum {
-    TOX_CHAT_CHANGE_PEER_ADD,
-    TOX_CHAT_CHANGE_PEER_DEL,
-    TOX_CHAT_CHANGE_PEER_NAME,
-} TOX_CHAT_CHANGE;
-
-void tox_callback_group_namelist_change(Tox *tox, void (*function)(Tox *tox, int, int, uint8_t, void *),
-                                        void *userdata);
-
-/* Creates a new groupchat and puts it in the chats array.
- *
- * return group number on success.
- * return -1 on failure.
- */
-int tox_add_groupchat(Tox *tox);
-
-/* Delete a groupchat from the chats array.
- *
- * return 0 on success.
- * return -1 if failure.
- */
-int tox_del_groupchat(Tox *tox, int groupnumber);
-
-/* Copy the name of peernumber who is in groupnumber to name.
- * name must be at least TOX_MAX_NAME_LENGTH long.
- *
- * return length of name if success
- * return -1 if failure
- */
-int tox_group_peername(const Tox *tox, int groupnumber, int peernumber, uint8_t *name);
-
-/* Copy the public key of peernumber who is in groupnumber to public_key.
- * public_key must be TOX_PUBLIC_KEY_SIZE long.
- *
- * returns 0 on success
- * returns -1 on failure
- */
-int tox_group_peer_pubkey(const Tox *tox, int groupnumber, int peernumber, uint8_t *public_key);
-
-/* invite friendnumber to groupnumber
- * return 0 on success
- * return -1 on failure
- */
-int tox_invite_friend(Tox *tox, int32_t friendnumber, int groupnumber);
-
-/* Join a group (you need to have been invited first.) using data of length obtained
- * in the group invite callback.
- *
- * returns group number on success
- * returns -1 on failure.
- */
-int tox_join_groupchat(Tox *tox, int32_t friendnumber, const uint8_t *data, uint16_t length);
-
-/* send a group message
- * return 0 on success
- * return -1 on failure
- */
-int tox_group_message_send(Tox *tox, int groupnumber, const uint8_t *message, uint16_t length);
-
-/* send a group action
- * return 0 on success
- * return -1 on failure
- */
-int tox_group_action_send(Tox *tox, int groupnumber, const uint8_t *action, uint16_t length);
-
-/* set the group's title, limited to MAX_NAME_LENGTH
- * return 0 on success
- * return -1 on failure
- */
-int tox_group_set_title(Tox *tox, int groupnumber, const uint8_t *title, uint8_t length);
-
-/* Get group title from groupnumber and put it in title.
- * title needs to be a valid memory location with a max_length size of at least MAX_NAME_LENGTH (128) bytes.
- *
- *  return length of copied title if success.
- *  return -1 if failure.
- */
-int tox_group_get_title(Tox *tox, int groupnumber, uint8_t *title, uint32_t max_length);
-
-/* Check if the current peernumber corresponds to ours.
- *
- * return 1 if the peernumber corresponds to ours.
- * return 0 on failure.
- */
-unsigned int tox_group_peernumber_is_ours(const Tox *tox, int groupnumber, int peernumber);
-
-/* Return the number of peers in the group chat on success.
- * return -1 on failure
- */
-int tox_group_number_peers(const Tox *tox, int groupnumber);
-
-/* List all the peers in the group chat.
- *
- * Copies the names of the peers to the name[length][TOX_MAX_NAME_LENGTH] array.
- *
- * Copies the lengths of the names to lengths[length]
- *
- * returns the number of peers on success.
- *
- * return -1 on failure.
- */
-int tox_group_get_names(const Tox *tox, int groupnumber, uint8_t names[][TOX_MAX_NAME_LENGTH], uint16_t lengths[],
-                        uint16_t length);
-
-/* Return the number of chats in the instance m.
- * You should use this to determine how much memory to allocate
- * for copy_chatlist. */
-uint32_t tox_count_chatlist(const Tox *tox);
-
-/* Copy a list of valid chat IDs into the array out_list.
- * If out_list is NULL, returns 0.
- * Otherwise, returns the number of elements copied.
- * If the array was too small, the contents
- * of out_list will be truncated to list_size. */
-uint32_t tox_get_chatlist(const Tox *tox, int32_t *out_list, uint32_t list_size);
-
-/* return the type of groupchat (TOX_GROUPCHAT_TYPE_) that groupnumber is.
- *
- * return -1 on failure.
- * return type on success.
- */
-int tox_group_get_type(const Tox *tox, int groupnumber);
-
-#endif /* TOX_GROUP_H */