diff --git a/Slingshot.CCB/Slingshot.CCB/MainWindow.xaml b/Slingshot.CCB/Slingshot.CCB/MainWindow.xaml
index 107b74e..b682c70 100644
--- a/Slingshot.CCB/Slingshot.CCB/MainWindow.xaml
+++ b/Slingshot.CCB/Slingshot.CCB/MainWindow.xaml
@@ -89,6 +89,7 @@
                         <Label Content="Advanced Options:" FontWeight="Bold" Margin="0,0,0,0"/>
                         <CheckBox Name="cbDumpResponseToXmlFile" Content="Dump response to XML files" Margin="5,10,0,10"  Padding="3,0,0,0"  />
                         <CheckBox Name="cbConsolidateSchedules" IsChecked="True" Content="Consolidate schedules to Day of Week and Time" Margin="5,0,0,10"  Padding="3,0,0,0"  />
+                        <CheckBox Name="cbDirectorsAsGroups" IsChecked="True" Content="Export Directors as Groups" Margin="5,0,0,10"  Padding="3,0,0,0"  />
                         <StackPanel Orientation="Horizontal" Margin="5,0,0,0">
                             <Label Name="lblItemsPerPage" Content="Items Per Page:" HorizontalAlignment="Left" Padding="0,5,5,5" Width="100" />
                             <TextBox x:Name="txtItemsPerPage"
diff --git a/Slingshot.CCB/Slingshot.CCB/MainWindow.xaml.cs b/Slingshot.CCB/Slingshot.CCB/MainWindow.xaml.cs
index 37d1471..10a025f 100644
--- a/Slingshot.CCB/Slingshot.CCB/MainWindow.xaml.cs
+++ b/Slingshot.CCB/Slingshot.CCB/MainWindow.xaml.cs
@@ -257,6 +257,9 @@ private void btnDownloadPackage_Click( object sender, RoutedEventArgs e )
             // Set ConsolidateScheduleNames to true to consolidate schedules names as 'Sunday at 11:00 AM'
             CcbApi.ConsolidateScheduleNames = cbConsolidateSchedules.IsChecked ?? false;
 
+            // Set ExportDepartmentDirectorsAsGroups to true to export Directors as groups
+            CcbApi.ExportDirectorsAsGroups = cbDirectorsAsGroups.IsChecked ?? false;
+
             // Reset API Request Counter.
             CcbApi.ApiRequestCount = 0;
 
diff --git a/Slingshot.CCB/Slingshot.CCB/Utilities/CcbApi.cs b/Slingshot.CCB/Slingshot.CCB/Utilities/CcbApi.cs
index 55cc86d..94ce106 100644
--- a/Slingshot.CCB/Slingshot.CCB/Utilities/CcbApi.cs
+++ b/Slingshot.CCB/Slingshot.CCB/Utilities/CcbApi.cs
@@ -200,6 +200,15 @@ public static int ApiThrottleRate
         /// </value>
         public static bool ConsolidateScheduleNames { get; set; } = false;
 
+        /// <summary>
+        /// Gets or sets a value indicating whether [export directors as groups].
+        /// Set ExportDirectorsAsGroups to true to export Directors as Groups in the hierarchy.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if [export directors as groups]; otherwise, <c>false</c>.
+        /// </value>
+        public static bool ExportDirectorsAsGroups { get; set; } = false;
+
         /// <summary>
         /// Gets or sets the daily limit.
         /// </summary>
@@ -474,7 +483,7 @@ private static bool GetGroupProfiles( List<int> selectedGroupTypes, DateTime? mo
 
                         if ( selectedGroupTypes.Contains( groupTypeId ) )
                         {
-                            var importGroups = CcbGroup.Translate( groupNode );
+                            var importGroups = CcbGroup.Translate( groupNode, CcbApi.ExportDirectorsAsGroups );
 
                             if ( importGroups != null )
                             {
@@ -562,7 +571,7 @@ private static bool GetGroupProfilesWorkaround( List<int> selectedGroupTypes, Da
                                 // any participants.
                                 IncompleteGroups.Add( groupId );
 
-                                var importGroups = CcbGroup.Translate( groupNode );
+                                var importGroups = CcbGroup.Translate( groupNode, CcbApi.ExportDirectorsAsGroups );
 
                                 if ( importGroups != null )
                                 {
@@ -615,7 +624,7 @@ private static void GetGroupProfileById( int groupId )
                 return;
             }
 
-            var importGroups = CcbGroup.Translate( groupNode );
+            var importGroups = CcbGroup.Translate( groupNode, CcbApi.ExportDirectorsAsGroups );
             if ( importGroups == null )
             {
                 return;
@@ -645,11 +654,19 @@ private static void ExportDepartments()
                 }
 
                 var sourceDepartments = xdocCustomFields.Element( "ccb_api" )?.Element( "response" )?.Elements( "items" );
+                MD5 md5Hasher = MD5.Create();
 
                 foreach ( var sourceDepartment in sourceDepartments.Elements( "item" ) )
                 {
+                    // Use hash of 9999 + department id to create a unique group id
+                    var hashedDepartmentId = md5Hasher.ComputeHash( Encoding.UTF8.GetBytes( $@"
+                     {9999}
+                     {sourceDepartment.Element( "id" ).Value}
+                    " ) );
+                    var groupId = Math.Abs( BitConverter.ToInt32( hashedDepartmentId, 0 ) ); // used abs to ensure positive number
+
                     var group = new Group();
-                    group.Id = ( "9999" + sourceDepartment.Element( "id" ).Value ).AsInteger();
+                    group.Id = groupId;
                     group.Name = sourceDepartment.Element( "name" )?.Value;
                     group.Order = sourceDepartment.Element( "order" ).Value.AsInteger();
                     group.IsActive = true;
diff --git a/Slingshot.CCB/Slingshot.CCB/Utilities/Translators/CcbGroup.cs b/Slingshot.CCB/Slingshot.CCB/Utilities/Translators/CcbGroup.cs
index 072c326..5af77ee 100644
--- a/Slingshot.CCB/Slingshot.CCB/Utilities/Translators/CcbGroup.cs
+++ b/Slingshot.CCB/Slingshot.CCB/Utilities/Translators/CcbGroup.cs
@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
@@ -11,7 +12,7 @@ namespace Slingshot.CCB.Utilities.Translators
 {
     public static class CcbGroup
     {
-        public static List<Group> Translate( XElement inputGroup )
+        public static List<Group> Translate( XElement inputGroup, bool exportDirectorsAsGroups = true )
         {
             List<Group> groups = new List<Group>();
 
@@ -40,20 +41,26 @@ public static List<Group> Translate( XElement inputGroup )
 
             groups.Add( group );
 
-
             var importedDepartmentId = inputGroup.Element( "department" )?.Attribute( "id" )?.Value;
             var importedDirectorId = inputGroup.Element( "director" )?.Attribute( "id" )?.Value;
 
             var hasDepartment = importedDepartmentId.IsNotNullOrWhitespace();
             var hasDirector = importedDirectorId.IsNotNullOrWhitespace();
             
-            // add the department as a group with an id of 9999 + its id to create a unique group id for it
+            MD5 md5Hasher = MD5.Create();
+            
+            // add the department as a group with id set to hash of 9999 + department id to create a unique group id for it
             if ( hasDepartment )
             {
-                departmentId = ( "9999" + importedDepartmentId ).AsInteger();
+                // Use hashed value to keep number from growing to long.
+                var hashedDepartmentId = md5Hasher.ComputeHash( Encoding.UTF8.GetBytes( $@"
+                     {9999}
+                     {importedDepartmentId}
+                    " ) );
+                departmentId = Math.Abs( BitConverter.ToInt32( hashedDepartmentId, 0 ) ); // used abs to ensure positive number
 
                 var departmentName = inputGroup.Element( "department" ).Value;
-                departmentName = departmentName.IsNullOrWhiteSpace() ? string.Empty : "No Department Name";
+                departmentName = departmentName.IsNullOrWhiteSpace() ? "No Department Name" : departmentName;
 
                 var departmentGroup = new Group
                 {
@@ -63,21 +70,24 @@ public static List<Group> Translate( XElement inputGroup )
                     GroupTypeId = 9999
                 };
 
+                if ( !exportDirectorsAsGroups && hasDirector )
+                {
+                    departmentGroup.GroupMembers.Add( new GroupMember { PersonId = inputGroup.Element( "director" ).Attribute( "id" ).Value.AsInteger(), Role = "Director", GroupId = departmentGroup.Id } );
+                }
+
                 groups.Add( departmentGroup );
             }
 
-            // add the director as a group with an id of 9998 + its id to create a unique group id for it
-            if ( hasDirector )
+            if ( exportDirectorsAsGroups && hasDirector )
             {
-                if ( hasDepartment )
-                {
-                    directorId = ( "9998" + importedDepartmentId + importedDirectorId ).AsInteger();
-                }
-                else
-                {
-                    directorId = ( "9998" + importedDirectorId ).AsInteger();
-                }
-
+                // add the director as a group with id set to hash of 9998 + its id + its department id (if any) to create a unique group id for it
+                var departmentIdString = departmentId.HasValue ? departmentId.Value.ToString() : string.Empty;
+                var hashedDirectorId = md5Hasher.ComputeHash( Encoding.UTF8.GetBytes( $@"
+                     {9998}
+                     {importedDirectorId}
+                     {departmentIdString}
+                    " ) );
+                directorId = Math.Abs( BitConverter.ToInt32( hashedDirectorId, 0 ) ); // used abs to ensure positive number
                 var directorName = inputGroup.Element( "director" ).Element( "full_name" ).Value;
 
                 var directorGroup = new Group
@@ -176,7 +186,7 @@ public static List<Group> Translate( XElement inputGroup )
             }
 
             // determine the parent group
-            if ( directorId.HasValue )
+            if ( exportDirectorsAsGroups && directorId.HasValue )
             {
                 group.ParentGroupId = directorId.Value;
             }