diff --git a/src/whois.group.php b/src/whois.group.php
new file mode 100644
index 00000000..7c9e8118
--- /dev/null
+++ b/src/whois.group.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @license   http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2
+ * @license
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @copyright Copyright (c) 2020 Joshua Smith
+ */
+
+if (!defined('__GROUP_HANDLER__')) {
+    define('__GROUP_HANDLER__', 1);
+}
+
+require_once('whois.parser.php');
+
+/**
+ * Class group_handler
+ */
+class group_handler
+{
+    function parse($data_str, $query)
+    {
+        $r = [
+            'regrinfo' => generic_parser_b($data_str['rawdata']),
+            'rawdata'  => $data_str['rawdata'],
+        ];
+
+        if (!isset($r['regrinfo']['domain']['name'])) {
+            $r['regrinfo']['domain']['name'] = $query;
+        }
+
+        return $r;
+    }
+}