diff --git a/Functions/Export-JamfHTMLReport.ps1 b/Functions/Export-JamfHTMLReport.ps1
index a5fb65a..db58103 100644
--- a/Functions/Export-JamfHTMLReport.ps1
+++ b/Functions/Export-JamfHTMLReport.ps1
@@ -1,11 +1,52 @@
-function Export-JamfHTMLReport {
-    param (
-        [Parameter(Mandatory = $true)]
-        [string]$FilePath
-    )
-
-    # HTML template with placeholders for JAMF-specific content
-    $htmlTemplate = @"
+function Export-JamfHTMLReport {
+    param (
+        [Parameter(Mandatory = $true)]
+        [string]$FilePath
+    )
+
+    function Get-BadgeClass {
+        param (
+            [string]$AssignmentType
+        )
+
+        switch ($AssignmentType) {
+            'All Computers'      { 'badge-all-computers' }
+            'Computer Group'     { 'badge-computer-group' }
+            'Computer'           { 'badge-computer' }
+            'Mobile Device Group'{ 'badge-mobile-device-group' }
+            'User Group'         { 'badge-user-group' }
+            'User'               { 'badge-user' }
+            'Building'           { 'badge-building' }
+            'Exclude'            { 'badge-exclude' }
+            default              { 'badge-none' }
+        }
+    }
+
+    function Get-DisplayData {
+        param (
+            [Parameter(Mandatory = $true)]
+            [object]$Resource
+        )
+
+        $resourceObject = if ($Resource -is [hashtable]) { [pscustomobject]$Resource } else { $Resource }
+
+        $assignmentType = if ([string]::IsNullOrWhiteSpace($resourceObject.AssignmentType)) { 'None' } else { $resourceObject.AssignmentType }
+        $assignedTo = if ([string]::IsNullOrWhiteSpace($resourceObject.AssignedTo)) { 'Not Assigned' } else { $resourceObject.AssignedTo }
+        $exclusions = if ([string]::IsNullOrWhiteSpace($resourceObject.Exclusions)) { 'None' } else { $resourceObject.Exclusions }
+
+        return [pscustomobject]@{
+            Name              = if ($resourceObject.Name) { Escape-Html $resourceObject.Name } else { '[Unknown]' }
+            Type              = if ($resourceObject.Type) { Escape-Html $resourceObject.Type } else { '[Unknown]' }
+            AssignmentType    = Escape-Html $assignmentType
+            AssignmentTypeRaw = $assignmentType
+            AssignedTo        = Escape-Html $assignedTo
+            Exclusions        = Escape-Html $exclusions
+            Enabled           = if ($null -ne $resourceObject.Enabled) { [bool]$resourceObject.Enabled } else { $null }
+        }
+    }
+
+    # HTML template with placeholders for JAMF-specific content
+    $htmlTemplate = @"
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -351,25 +392,27 @@ function Export-JamfHTMLReport {
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
     <script src="https://cdn.datatables.net/buttons/2.2.2/js/buttons.html5.min.js"></script>
     <script>
-        jQuery(document).ready(function() {
-            // Initialize DataTables
-            var tables = jQuery('.policy-table').DataTable({
-                dom: 'Blfrtip',
-                buttons: [
-                    'copyHtml5',
-                    'excelHtml5',
-                    'csvHtml5'
-                ],
-                pageLength: 10,
-                lengthMenu: [[10, 25, 50, -1], [10, 25, 50, "All"]],
-                ordering: false,
-                columnDefs: [
-                    {
-                        targets: '_all',
-                        orderable: false
-                    }
-                ]
-            });
+        jQuery(document).ready(function() {
+            // Initialize DataTables per table instance
+            jQuery('.policy-table').each(function() {
+                jQuery(this).DataTable({
+                    dom: 'Blfrtip',
+                    buttons: [
+                        'copyHtml5',
+                        'excelHtml5',
+                        'csvHtml5'
+                    ],
+                    pageLength: 10,
+                    lengthMenu: [[10, 25, 50, -1], [10, 25, 50, "All"]],
+                    ordering: false,
+                    columnDefs: [
+                        {
+                            targets: '_all',
+                            orderable: false
+                        }
+                    ]
+                });
+            });
 
             // Assignment Type Filter
             jQuery('#assignmentTypeFilter').on('change', function() {
@@ -483,24 +526,27 @@ function Export-JamfHTMLReport {
         }
     }
 
-    # Find unassigned resources
-    Write-Host "Finding unassigned policies..." -ForegroundColor Yellow
-    $jamfResources.UnassignedPolicies = Find-UnassignedPoliciesFromProcessedData -Policies $jamfResources.Policies
-
-    Write-Host "Finding unassigned profiles..." -ForegroundColor Yellow
-    $jamfResources.UnassignedProfiles = Find-UnassignedProfilesFromProcessedData -Profiles $jamfResources.ConfigurationProfiles
-
-    # Generate summary statistics
-    $summaryStats = @{
-        TotalPolicies = $jamfResources.Policies.Count
-        TotalProfiles = $jamfResources.ConfigurationProfiles.Count + $jamfResources.MobileDeviceConfigurationProfiles.Count
-        AllComputers  = ($jamfResources.Policies + $jamfResources.ConfigurationProfiles + $jamfResources.MobileDeviceConfigurationProfiles | Where-Object { $_.AssignmentType -eq "All Computers" }).Count
-        ComputerGroup = ($jamfResources.Policies + $jamfResources.ConfigurationProfiles + $jamfResources.MobileDeviceConfigurationProfiles | Where-Object { $_.AssignmentType -eq "Computer Group" }).Count
-        UserGroup     = ($jamfResources.Policies + $jamfResources.ConfigurationProfiles + $jamfResources.MobileDeviceConfigurationProfiles | Where-Object { $_.AssignmentType -eq "User Group" }).Count
-        Computer      = ($jamfResources.Policies + $jamfResources.ConfigurationProfiles + $jamfResources.MobileDeviceConfigurationProfiles | Where-Object { $_.AssignmentType -eq "Computer" }).Count
-        User          = ($jamfResources.Policies + $jamfResources.ConfigurationProfiles + $jamfResources.MobileDeviceConfigurationProfiles | Where-Object { $_.AssignmentType -eq "User" }).Count
-        Unassigned    = ($jamfResources.Policies + $jamfResources.ConfigurationProfiles + $jamfResources.MobileDeviceConfigurationProfiles | Where-Object { $_.AssignmentType -eq "None" }).Count
-    }
+    $allResources = @($jamfResources.Policies + $jamfResources.ConfigurationProfiles + $jamfResources.MobileDeviceConfigurationProfiles)
+    $allProfiles = @($jamfResources.ConfigurationProfiles + $jamfResources.MobileDeviceConfigurationProfiles)
+
+    # Find unassigned resources using processed assignment data
+    Write-Host "Finding unassigned policies..." -ForegroundColor Yellow
+    $jamfResources.UnassignedPolicies = Find-UnassignedPoliciesFromProcessedData -Policies $jamfResources.Policies
+
+    Write-Host "Finding unassigned profiles..." -ForegroundColor Yellow
+    $jamfResources.UnassignedProfiles = Find-UnassignedProfilesFromProcessedData -Profiles $allProfiles
+
+    # Generate summary statistics
+    $summaryStats = @{
+        TotalPolicies = $jamfResources.Policies.Count
+        TotalProfiles = $allProfiles.Count
+        AllComputers  = ($allResources | Where-Object { $_.AssignmentType -eq "All Computers" }).Count
+        ComputerGroup = ($allResources | Where-Object { $_.AssignmentType -eq "Computer Group" }).Count
+        UserGroup     = ($allResources | Where-Object { $_.AssignmentType -eq "User Group" }).Count
+        Computer      = ($allResources | Where-Object { $_.AssignmentType -eq "Computer" }).Count
+        User          = ($allResources | Where-Object { $_.AssignmentType -eq "User" }).Count
+        Unassigned    = $jamfResources.UnassignedPolicies.Count + $jamfResources.UnassignedProfiles.Count
+    }
 
     $categories = @(
         @{ Key = 'all'; Name = 'All Policies & Profiles' },
@@ -519,147 +565,153 @@ function Export-JamfHTMLReport {
         $isActive = ($category -eq $categories[0])
         $categoryId = $category.Key.ToLower()
 
-        $tabHeaders += @"
-<li class='nav-item' role='presentation'>
-    <button class='nav-link$(if($isActive -and $category.Key -ne 'all'){ ' active' } else { '' })'
-            id='$categoryId-tab'
-            data-bs-toggle='tab'
-            data-bs-target='#$categoryId'
-            type='button'
-            role='tab'
-            aria-controls='$categoryId'
-            aria-selected='$(if($isActive -and $category.Key -ne 'all'){ 'true' } else { 'false' })'>
-        $($category.Name)
-    </button>
-</li>
-"@
-
-        if ($category.Key -eq 'all') {
-            $allTableRows = foreach ($cat in $categories | Where-Object { $_.Key -ne 'all' -and $_.Key -notlike 'Unassigned*' }) {
-                if ($jamfResources.ContainsKey($cat.Key)) {
-                    $categoryResources = $jamfResources[$cat.Key]
-                    if ($categoryResources) {
-                        foreach ($resource in $categoryResources) {
-                            $badgeClass = switch ($resource.AssignmentType) {
-                                'All Computers' { 'badge-all-computers' }
-                                'Computer Group' { 'badge-computer-group' }
-                                'Computer' { 'badge-computer' }
-                                'Mobile Device Group' { 'badge-mobile-device-group' }
-                                'User Group' { 'badge-user-group' }
-                                'User' { 'badge-user' }
-                                'Building' { 'badge-building' }
-                                'Exclude' { 'badge-exclude' }
-                                default { 'badge-none' }
-                            }
-                            "<tr>
-                                <td>$($resource.Name)</td>
-                                <td>$($resource.Type)</td>
-                                <td><span class='badge $badgeClass'>$($resource.AssignmentType)</span></td>
-                                <td>$($resource.AssignedTo)</td>
-                                <td>$($resource.Exclusions)</td>
-                            </tr>"
-                        }
-                    }
-                }
-            }
-            $tabContent += @"
-<div class='tab-pane fade$(if($isActive){ ' show active' } else { '' })'
-     id='$categoryId'
-     role='tabpanel'
-     aria-labelledby='$categoryId-tab'>
-    <div class='table-container'>
-        <table class='table table-striped policy-table'>
-            <thead>
-                <tr>
-                    <th>Name</th>
-                    <th>Type</th>
-                    <th>Assignment Type</th>
-                    <th>Assigned To</th>
-                    <th>Exclusions</th>
-                </tr>
-            </thead>
-            <tbody>
-                $($allTableRows -join "`n")
-            </tbody>
-        </table>
-    </div>
-</div>
-"@
-        } else {
-            $tableRows = ""
-            if ($jamfResources.ContainsKey($category.Key)) {
-                $currentCategoryResources = $jamfResources[$category.Key]
-                if ($currentCategoryResources) {
-                    $tableRows = foreach ($resource in $currentCategoryResources) {
-                        $badgeClass = switch ($resource.AssignmentType) {
-                            'All Computers' { 'badge-all-computers' }
-                            'Computer Group' { 'badge-computer-group' }
-                            'Computer' { 'badge-computer' }
-                            'Mobile Device Group' { 'badge-mobile-device-group' }
-                            'User Group' { 'badge-user-group' }
-                            'User' { 'badge-user' }
-                            'Building' { 'badge-building' }
-                            'Exclude' { 'badge-exclude' }
-                            default { 'badge-none' }
-                        }
-                        
-                        # Add enabled column for policies
-                        if ($resource.Type -eq "Policy") {
-                            "<tr>
-                                <td>$($resource.Name)</td>
-                                <td><span class='badge $badgeClass'>$($resource.AssignmentType)</span></td>
-                                <td>$($resource.AssignedTo)</td>
-                                <td>$($resource.Exclusions)</td>
-                                <td>$(if($resource.Enabled -eq 'true') { '<span class="badge bg-success">Enabled</span>' } else { '<span class="badge bg-secondary">Disabled</span>' })</td>
-                            </tr>"
-                        } else {
-                            "<tr>
-                                <td>$($resource.Name)</td>
-                                <td><span class='badge $badgeClass'>$($resource.AssignmentType)</span></td>
-                                <td>$($resource.AssignedTo)</td>
-                                <td>$($resource.Exclusions)</td>
-                            </tr>"
-                        }
-                    }
-                }
-            }
-            
-            # Determine table headers based on category
-            $tableHeaders = if ($category.Key -eq 'Policies') {
-                "<tr>
-                    <th>Name</th>
-                    <th>Assignment Type</th>
-                    <th>Assigned To</th>
-                    <th>Exclusions</th>
-                    <th>Status</th>
-                </tr>"
-            } else {
-                "<tr>
-                    <th>Name</th>
-                    <th>Assignment Type</th>
-                    <th>Assigned To</th>
-                    <th>Exclusions</th>
-                </tr>"
-            }
-            
-            $tabContent += @"
-<div class='tab-pane fade$(if($isActive -and $category.Key -ne 'all'){ ' show active' } else { '' })'
-     id='$categoryId'
-     role='tabpanel'
-     aria-labelledby='$categoryId-tab'>
-    <div class='table-container'>
-        <table class='table table-striped policy-table'>
-            <thead>
-                $tableHeaders
-            </thead>
-            <tbody>
-                $($tableRows -join "`n")
-            </tbody>
-        </table>
-    </div>
-</div>
-"@
-        }
+        $tabHeaders += @"
+<li class='nav-item' role='presentation'>
+    <button class='nav-link$(if($isActive){ ' active' } else { '' })'
+            id='$categoryId-tab'
+            data-bs-toggle='tab'
+            data-bs-target='#$categoryId'
+            type='button'
+            role='tab'
+            aria-controls='$categoryId'
+            aria-selected='$(if($isActive){ 'true' } else { 'false' })'>
+        $($category.Name)
+    </button>
+</li>
+"@
+
+        if ($category.Key -eq 'all') {
+            $allTableRows = @()
+            foreach ($cat in $categories | Where-Object { $_.Key -ne 'all' -and $_.Key -notlike 'Unassigned*' }) {
+                if ($jamfResources.ContainsKey($cat.Key)) {
+                    foreach ($resource in $jamfResources[$cat.Key]) {
+                        $display = Get-DisplayData -Resource $resource
+                        $badgeClass = Get-BadgeClass -AssignmentType $display.AssignmentTypeRaw
+                        $allTableRows += @"
+                <tr>
+                    <td>$($display.Name)</td>
+                    <td>$($display.Type)</td>
+                    <td><span class='badge $badgeClass'>$($display.AssignmentType)</span></td>
+                    <td>$($display.AssignedTo)</td>
+                    <td>$($display.Exclusions)</td>
+                </tr>
+"@
+                    }
+                }
+            }
+
+            if (-not $allTableRows -or $allTableRows.Count -eq 0) {
+                $allTableRows = @(@"
+                <tr>
+                    <td colspan='5' class='text-center text-muted'>No policies or profiles found</td>
+                </tr>
+"@)
+            }
+
+            $tabContent += @"
+<div class='tab-pane fade$(if($isActive){ ' show active' } else { '' })'
+     id='$categoryId'
+     role='tabpanel'
+     aria-labelledby='$categoryId-tab'>
+    <div class='table-container'>
+        <table class='table table-striped policy-table'>
+            <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>Type</th>
+                    <th>Assignment Type</th>
+                    <th>Assigned To</th>
+                    <th>Exclusions</th>
+                </tr>
+            </thead>
+            <tbody>
+                $($allTableRows -join "`n")
+            </tbody>
+        </table>
+    </div>
+</div>
+"@
+        } else {
+            $tableRows = @()
+            if ($jamfResources.ContainsKey($category.Key)) {
+                foreach ($resource in $jamfResources[$category.Key]) {
+                    $display = Get-DisplayData -Resource $resource
+                    $badgeClass = Get-BadgeClass -AssignmentType $display.AssignmentTypeRaw
+
+                    if ($resource.Type -eq "Policy") {
+                        $statusBadge = if ($display.Enabled) { "<span class='badge bg-success'>Enabled</span>" } else { "<span class='badge bg-secondary'>Disabled</span>" }
+                        $tableRows += @"
+                <tr>
+                    <td>$($display.Name)</td>
+                    <td><span class='badge $badgeClass'>$($display.AssignmentType)</span></td>
+                    <td>$($display.AssignedTo)</td>
+                    <td>$($display.Exclusions)</td>
+                    <td>$statusBadge</td>
+                </tr>
+"@
+                    } else {
+                        $tableRows += @"
+                <tr>
+                    <td>$($display.Name)</td>
+                    <td><span class='badge $badgeClass'>$($display.AssignmentType)</span></td>
+                    <td>$($display.AssignedTo)</td>
+                    <td>$($display.Exclusions)</td>
+                </tr>
+"@
+                    }
+                }
+            }
+
+            $hasPolicyStatusColumn = $category.Key -in @('Policies', 'UnassignedPolicies')
+            if (-not $tableRows -or $tableRows.Count -eq 0) {
+                $colspan = if ($hasPolicyStatusColumn) { 5 } else { 4 }
+                $emptyMessage = switch ($category.Key) {
+                    'UnassignedPolicies' { 'No unassigned policies found' }
+                    'UnassignedProfiles' { 'No unassigned profiles found' }
+                    default { 'No data available' }
+                }
+                $tableRows = @(@"
+                <tr>
+                    <td colspan='$colspan' class='text-center text-muted'>$emptyMessage</td>
+                </tr>
+"@)
+            }
+
+            $tableHeaders = if ($hasPolicyStatusColumn) {
+                "<tr>
+                    <th>Name</th>
+                    <th>Assignment Type</th>
+                    <th>Assigned To</th>
+                    <th>Exclusions</th>
+                    <th>Status</th>
+                </tr>"
+            } else {
+                "<tr>
+                    <th>Name</th>
+                    <th>Assignment Type</th>
+                    <th>Assigned To</th>
+                    <th>Exclusions</th>
+                </tr>"
+            }
+
+            $tabContent += @"
+<div class='tab-pane fade$(if($isActive -and $category.Key -ne 'all'){ ' show active' } else { '' })'
+     id='$categoryId'
+     role='tabpanel'
+     aria-labelledby='$categoryId-tab'>
+    <div class='table-container'>
+        <table class='table table-striped policy-table'>
+            <thead>
+                $tableHeaders
+            </thead>
+            <tbody>
+                $($tableRows -join "`n")
+            </tbody>
+        </table>
+    </div>
+</div>
+"@
+        }
     }
 
     # Summary cards
diff --git a/Functions/Find-UnassignedPoliciesFromProcessedData.ps1 b/Functions/Find-UnassignedPoliciesFromProcessedData.ps1
index 405517f..7a4f1f6 100644
--- a/Functions/Find-UnassignedPoliciesFromProcessedData.ps1
+++ b/Functions/Find-UnassignedPoliciesFromProcessedData.ps1
@@ -10,28 +10,52 @@ function Find-UnassignedPoliciesFromProcessedData {
     
     $unassignedPolicies = @()
     
-    foreach ($policy in $Policies) {
-        $policyDetails = Get-JamfPolicyDetails -PolicyId $policy.id
-        
-        if ($policyDetails) {
-            $hasAssignments = $false
-            
-            # Check for any assignments
-            if ($policyDetails.scope.all_computers -eq "true" -or
-                $policyDetails.scope.computers.computer -or
-                $policyDetails.scope.computer_groups.computer_group) {
-                $hasAssignments = $true
-            }
-            
-            if (-not $hasAssignments) {
-                $unassignedPolicies += @{
-                    Id      = $policy.id
-                    Name    = $policy.name
-                    Enabled = $policy.enabled -eq "true"
-                }
-            }
-        }
-    }
+    foreach ($policy in $Policies) {
+        if ($null -eq $policy) { continue }
+
+        $policyObject = if ($policy -is [hashtable]) { [pscustomobject]$policy } else { $policy }
+
+        if ($policyObject.PSObject.Properties.Name -contains 'AssignmentType') {
+            if ([string]::IsNullOrWhiteSpace($policyObject.AssignmentType) -or $policyObject.AssignmentType -eq 'None') {
+                $unassignedPolicies += $policy
+            }
+            continue
+        }
+
+        $policyId = if ($policyObject.PSObject.Properties.Name -contains 'id') { $policyObject.id } elseif ($policyObject.PSObject.Properties.Name -contains 'ID') { $policyObject.ID } else { $null }
+        if (-not $policyId) { continue }
+
+        $policyDetails = Get-JamfPolicyDetails -PolicyId $policyId
+
+        if ($policyDetails) {
+            $hasAssignments = $false
+
+            # Check for any assignments
+            if ($policyDetails.scope.all_computers -eq "true" -or
+                $policyDetails.scope.computers.computer -or
+                $policyDetails.scope.computer_groups.computer_group) {
+                $hasAssignments = $true
+            }
+
+            if (-not $hasAssignments) {
+                $enabledState = $false
+                if ($policyDetails.general -and $policyDetails.general.enabled -ne $null) {
+                    $enabledState = [bool]$policyDetails.general.enabled
+                }
+
+                $unassignedPolicies += @{
+                    Id             = $policyId
+                    ID             = $policyId
+                    Name           = if ($policyDetails.general.name) { $policyDetails.general.name } else { $policyObject.name }
+                    Type           = 'Policy'
+                    AssignmentType = 'None'
+                    AssignedTo     = 'Not Assigned'
+                    Exclusions     = ''
+                    Enabled        = $enabledState
+                }
+            }
+        }
+    }
     
     return $unassignedPolicies
 }
diff --git a/Functions/Find-UnassignedProfilesFromProcessedData.ps1 b/Functions/Find-UnassignedProfilesFromProcessedData.ps1
index 85a8828..97776b1 100644
--- a/Functions/Find-UnassignedProfilesFromProcessedData.ps1
+++ b/Functions/Find-UnassignedProfilesFromProcessedData.ps1
@@ -10,39 +10,55 @@ function Find-UnassignedProfilesFromProcessedData {
     
     $unassignedProfiles = @()
     
-    foreach ($profile in $Profiles) {
-        $hasAssignments = $false
-        
-        if ($profile.Scope) {
-            if ($profile.Type -eq "macOS Configuration Profile") {
-                # Check macOS assignments
-                if ($profile.Scope.AllComputers -or 
-                    $profile.Scope.Computers.Count -gt 0 -or 
-                    $profile.Scope.ComputerGroups.Count -gt 0 -or 
-                    $profile.Scope.Users.Count -gt 0 -or 
-                    $profile.Scope.UserGroups.Count -gt 0) {
-                    $hasAssignments = $true
-                }
-            } elseif ($profile.Type -eq "Mobile Device Configuration Profile") {
-                # Check mobile device assignments
-                if ($profile.Scope.AllMobileDevices -or 
-                    $profile.Scope.MobileDevices.Count -gt 0 -or 
-                    $profile.Scope.MobileDeviceGroups.Count -gt 0 -or 
-                    $profile.Scope.Users.Count -gt 0 -or 
-                    $profile.Scope.UserGroups.Count -gt 0) {
-                    $hasAssignments = $true
-                }
-            }
-        }
-        
-        if (-not $hasAssignments) {
-            $unassignedProfiles += @{
-                Id   = $profile.Id
-                Name = $profile.Name
-                Type = $profile.Type
-            }
-        }
-    }
+    foreach ($profile in $Profiles) {
+        if ($null -eq $profile) { continue }
+
+        $profileObject = if ($profile -is [hashtable]) { [pscustomobject]$profile } else { $profile }
+
+        if ($profileObject.PSObject.Properties.Name -contains 'AssignmentType') {
+            if ([string]::IsNullOrWhiteSpace($profileObject.AssignmentType) -or $profileObject.AssignmentType -eq 'None') {
+                $unassignedProfiles += $profile
+            }
+            continue
+        }
+
+        $hasAssignments = $false
+
+        if ($profileObject.Scope) {
+            if ($profileObject.Type -eq "macOS Configuration Profile") {
+                if ($profileObject.Scope.AllComputers -or
+                    $profileObject.Scope.Computers.Count -gt 0 -or
+                    $profileObject.Scope.ComputerGroups.Count -gt 0 -or
+                    $profileObject.Scope.Users.Count -gt 0 -or
+                    $profileObject.Scope.UserGroups.Count -gt 0) {
+                    $hasAssignments = $true
+                }
+            } elseif ($profileObject.Type -eq "Mobile Device Configuration Profile") {
+                if ($profileObject.Scope.AllMobileDevices -or
+                    $profileObject.Scope.MobileDevices.Count -gt 0 -or
+                    $profileObject.Scope.MobileDeviceGroups.Count -gt 0 -or
+                    $profileObject.Scope.Users.Count -gt 0 -or
+                    $profileObject.Scope.UserGroups.Count -gt 0) {
+                    $hasAssignments = $true
+                }
+            }
+        }
+
+        if (-not $hasAssignments) {
+            $profileId = if ($profileObject.PSObject.Properties.Name -contains 'Id') { $profileObject.Id } elseif ($profileObject.PSObject.Properties.Name -contains 'ID') { $profileObject.ID } else { $null }
+            $profileType = if ($profileObject.Type) { $profileObject.Type } else { 'Configuration Profile' }
+
+            $unassignedProfiles += @{
+                Id             = $profileId
+                ID             = $profileId
+                Name           = $profileObject.Name
+                Type           = $profileType
+                AssignmentType = 'None'
+                AssignedTo     = 'Not Assigned'
+                Exclusions     = ''
+            }
+        }
+    }
     
     return $unassignedProfiles
 }
diff --git a/JamfAssignmentChecker.ps1 b/JamfAssignmentChecker.ps1
index 9dd8a0d..9c94d9f 100644
--- a/JamfAssignmentChecker.ps1
+++ b/JamfAssignmentChecker.ps1
@@ -226,25 +226,112 @@ Write-Host ""
 
 
 # Load the PowerShell functions (force reload)
-$Functions = Get-ChildItem -Path "$(Get-Location)\Functions\*.ps1" -ErrorAction SilentlyContinue
-foreach ($function in $Functions) {
-    try {
-        # Force reload by removing any existing function definition first
-        $functionName = [System.IO.Path]::GetFileNameWithoutExtension($function.Name)
-        if (Get-Command $functionName -ErrorAction SilentlyContinue) {
-            Remove-Item "Function:\$functionName" -ErrorAction SilentlyContinue
-        }
-        . $function.FullName
-    } catch {
-        Write-Error "Failed to import function $($function.FullName): $_"
-    }
-}
-
-# Script configuration hashtable (will be populated from config.ps1 or user input)
-$script:Config = @{
-    BaseUrl      = ""
-    Username     = ""
-    Password     = ""
+$Functions = Get-ChildItem -Path "$(Get-Location)\Functions\*.ps1" -ErrorAction SilentlyContinue
+foreach ($function in $Functions) {
+    try {
+        # Force reload by removing any existing function definition first
+        $functionName = [System.IO.Path]::GetFileNameWithoutExtension($function.Name)
+        if (Get-Command $functionName -ErrorAction SilentlyContinue) {
+            Remove-Item "Function:\$functionName" -ErrorAction SilentlyContinue
+        }
+        . $function.FullName
+    } catch {
+        Write-Error "Failed to import function $($function.FullName): $_"
+    }
+}
+
+# Helper utilities ----------------------------------------------------------
+function Get-TrimmedList {
+    param (
+        [Parameter(Mandatory = $true)]
+        [string]$Value,
+
+        [Parameter(Mandatory = $true)]
+        [string]$InputName
+    )
+
+    if ([string]::IsNullOrWhiteSpace($Value)) {
+        throw "Value for '$InputName' cannot be empty."
+    }
+
+    $items = $Value -split ',' | ForEach-Object { $_.Trim() } | Where-Object { -not [string]::IsNullOrWhiteSpace($_) }
+
+    if (-not $items) {
+        throw "Value for '$InputName' cannot be empty."
+    }
+
+    return $items
+}
+
+function Get-ExportPath {
+    param (
+        [string]$RequestedPath,
+
+        [Parameter(Mandatory = $true)]
+        [string]$DefaultFileName,
+
+        [string]$DefaultFolder
+    )
+
+    if (-not [string]::IsNullOrWhiteSpace($RequestedPath)) {
+        return $RequestedPath
+    }
+
+    $timestamp = Get-Date -Format 'yyyyMMdd_HHmmss'
+    $fileName = if ($DefaultFileName -match '{timestamp}') {
+        $DefaultFileName -replace '{timestamp}', $timestamp
+    } else {
+        $nameWithoutExtension = [System.IO.Path]::GetFileNameWithoutExtension($DefaultFileName)
+        $extension = [System.IO.Path]::GetExtension($DefaultFileName)
+        if ([string]::IsNullOrWhiteSpace($nameWithoutExtension)) {
+            "Export_$timestamp$extension"
+        } else {
+            "$nameWithoutExtension`_$timestamp$extension"
+        }
+    }
+
+    if ([string]::IsNullOrWhiteSpace($DefaultFolder)) {
+        $DefaultFolder = (Get-Location).Path
+    }
+
+    return Join-Path -Path $DefaultFolder -ChildPath $fileName
+}
+
+function Resolve-RequiredList {
+    param (
+        [string]$RawValue,
+
+        [Parameter(Mandatory = $true)]
+        [string]$InputName,
+
+        [string]$Context
+    )
+
+    if ([string]::IsNullOrWhiteSpace($RawValue)) {
+        $contextMessage = if ([string]::IsNullOrWhiteSpace($Context)) {
+            ''
+        } else {
+            " when using $Context"
+        }
+
+        Write-Host "ERROR: $InputName parameter is required$contextMessage." -ForegroundColor Red
+        exit 1
+    }
+
+    try {
+        return Get-TrimmedList -Value $RawValue -InputName $InputName
+    } catch {
+        $message = if ($_.Exception) { $_.Exception.Message } else { $_.ToString() }
+        Write-Host "ERROR: $message" -ForegroundColor Red
+        exit 1
+    }
+}
+
+# Script configuration hashtable (will be populated from config.ps1 or user input)
+$script:Config = @{
+    BaseUrl      = ""
+    Username     = ""
+    Password     = ""
     ClientId     = ""
     ClientSecret = ""
     Token        = ""
@@ -263,127 +350,104 @@ if (-not (Connect-JamfPro)) {
 if ($parameterMode) {
     # Execute based on command-line parameters
     switch ($selectedOption) {
-        '1' {
-            # Check Computer Assignments
-            if ([string]::IsNullOrWhiteSpace($ComputerNames)) {
-                Write-Host "ERROR: ComputerNames parameter is required when using -CheckComputer" -ForegroundColor Red
-                exit 1
-            }
-            
-            $computers = $ComputerNames -split ','
-            $allAssignments = @()
-            
-            foreach ($computerName in $computers) {
-                $computerName = $computerName.Trim()
-                Write-Host "`nSearching for computer: $computerName" -ForegroundColor Cyan
-                
-                $computer = Get-JamfComputer -ComputerName $computerName
-                
-                if ($computer) {
-                    $assignments = Get-ComputerAssignments -Computer $computer
-                    Show-ComputerAssignments -Assignments $assignments
-                    $allAssignments += $assignments
-                } else {
-                    Write-Host "Computer '$computerName' not found!" -ForegroundColor Red
-                }
-            }
-            
-            # Export if requested
-            if ($ExportToCSV -and $allAssignments.Count -gt 0) {
-                Export-AssignmentsToCSV -Assignments $allAssignments -FilePath $ExportPath
-            }
-        }
-        '2' {
-            # Check User Assignments
-            Write-Host "User assignment checking not yet implemented." -ForegroundColor Yellow
-        }
-        '3' {
-            # Check Group Assignments
-            if ([string]::IsNullOrWhiteSpace($GroupNames)) {
-                if (-not $parameterMode) {
-                    Write-Host "`nEnter group name(s) to check (comma-separated for multiple):" -ForegroundColor Cyan
-                    $GroupNames = Read-Host
-                }
-                
-                if ([string]::IsNullOrWhiteSpace($GroupNames)) {
-                    Write-Host "ERROR: Group name(s) required" -ForegroundColor Red
-                    if ($parameterMode) { exit 1 }
-                    continue
-                }
-            }
-            
-            # Ask for group type if not in parameter mode
-            $groupType = "Computer"
-            if (-not $parameterMode) {
-                Write-Host "`nSelect group type:" -ForegroundColor Cyan
-                Write-Host "  [1] Computer Group (default)" -ForegroundColor White
+        '1' {
+            # Check Computer Assignments
+            $computers = Resolve-RequiredList -RawValue $ComputerNames -InputName 'ComputerNames' -Context '-CheckComputer'
+            $allAssignments = @()
+
+            foreach ($computerName in $computers) {
+                Write-Host "`nSearching for computer: $computerName" -ForegroundColor Cyan
+
+                $computer = Get-JamfComputer -ComputerName $computerName
+
+                if (-not $computer) {
+                    Write-Host "Computer '$computerName' not found!" -ForegroundColor Red
+                    continue
+                }
+
+                $assignments = Get-ComputerAssignments -Computer $computer
+                Show-ComputerAssignments -Assignments $assignments
+                $allAssignments += $assignments
+            }
+
+            # Export if requested
+            if ($ExportToCSV -and $allAssignments.Count -gt 0) {
+                $path = Get-ExportPath -RequestedPath $ExportPath -DefaultFileName 'ComputerAssignments_{timestamp}.csv'
+                Export-AssignmentsToCSV -Assignments $allAssignments -FilePath $path
+            }
+        }
+        '2' {
+            # Check User Assignments
+            Write-Host "User assignment checking not yet implemented." -ForegroundColor Yellow
+        }
+        '3' {
+            # Check Group Assignments
+            # Ask for group type if not in parameter mode
+            $groupType = "Computer"
+            if (-not $parameterMode) {
+                Write-Host "`nSelect group type:" -ForegroundColor Cyan
+                Write-Host "  [1] Computer Group (default)" -ForegroundColor White
                 Write-Host "  [2] Mobile Device Group" -ForegroundColor White
                 $typeChoice = Read-Host "Choice (1 or 2)"
                 
                 if ($typeChoice -eq "2") {
                     $groupType = "MobileDevice"
-                }
-            }
-            
-            $groups = $GroupNames -split ','
-            $allAssignments = @()
-            
-            foreach ($groupName in $groups) {
-                $groupName = $groupName.Trim()
-                Write-Host "`nAnalyzing group: $groupName ($groupType)" -ForegroundColor Cyan
-                
-                $assignments = Get-GroupAssignments -GroupName $groupName -GroupType $groupType
-                
-                if ($assignments) {
-                    Show-GroupAssignments -Assignments $assignments
-                    $allAssignments += $assignments
-                } else {
-                    Write-Host "Failed to analyze group '$groupName'" -ForegroundColor Red
-                }
-            }
-            
-            # Export if requested
-            if ($ExportToCSV -and $allAssignments.Count -gt 0) {
-                if ([string]::IsNullOrWhiteSpace($ExportPath)) {
-                    $ExportPath = ".\GroupAssignments_$(Get-Date -Format 'yyyyMMdd_HHmmss').csv"
-                }
-                Export-GroupAssignmentsToCSV -Assignments $allAssignments -FilePath $ExportPath
-            }
-            
-            if (-not $parameterMode) {
-                Read-Host "`nPress Enter to continue"
-            }
-        }
-        '4' {
-            # Check Mobile Device Assignments
-            if ([string]::IsNullOrWhiteSpace($MobileDeviceNames)) {
-                Write-Host "ERROR: MobileDeviceNames parameter is required when using -CheckMobileDevice" -ForegroundColor Red
-                exit 1
-            }
-            
-            $mobileDevices = $MobileDeviceNames -split ','
-            $allAssignments = @()
-            
-            foreach ($mobileDeviceName in $mobileDevices) {
-                $mobileDeviceName = $mobileDeviceName.Trim()
-                Write-Host "`nSearching for mobile device: $mobileDeviceName" -ForegroundColor Cyan
-                
-                $mobileDevice = Get-JamfMobileDevice -MobileDeviceName $mobileDeviceName
-                
-                if ($mobileDevice) {
-                    $assignments = Get-MobileDeviceAssignments -MobileDevice $mobileDevice
-                    Show-MobileDeviceAssignments -Assignments $assignments
-                    $allAssignments += $assignments
-                } else {
-                    Write-Host "Mobile device '$mobileDeviceName' not found!" -ForegroundColor Red
-                }
-            }
-            
-            # Export if requested
-            if ($ExportToCSV -and $allAssignments.Count -gt 0) {
-                Export-MobileDeviceAssignmentsToCSV -Assignments $allAssignments -FilePath $ExportPath
-            }
-        }
+                }
+            }
+
+            $groups = Resolve-RequiredList -RawValue $GroupNames -InputName 'GroupNames' -Context '-CheckGroup'
+            $allAssignments = @()
+
+            foreach ($groupName in $groups) {
+                Write-Host "`nAnalyzing group: $groupName ($groupType)" -ForegroundColor Cyan
+
+                $assignments = Get-GroupAssignments -GroupName $groupName -GroupType $groupType
+
+                if (-not $assignments) {
+                    Write-Host "Failed to analyze group '$groupName'" -ForegroundColor Red
+                    continue
+                }
+
+                Show-GroupAssignments -Assignments $assignments
+                $allAssignments += $assignments
+            }
+
+            # Export if requested
+            if ($ExportToCSV -and $allAssignments.Count -gt 0) {
+                $path = Get-ExportPath -RequestedPath $ExportPath -DefaultFileName 'GroupAssignments_{timestamp}.csv'
+                Export-GroupAssignmentsToCSV -Assignments $allAssignments -FilePath $path
+            }
+
+            if (-not $parameterMode) {
+                Read-Host "`nPress Enter to continue"
+            }
+        }
+        '4' {
+            # Check Mobile Device Assignments
+            $mobileDevices = Resolve-RequiredList -RawValue $MobileDeviceNames -InputName 'MobileDeviceNames' -Context '-CheckMobileDevice'
+            $allAssignments = @()
+
+            foreach ($mobileDeviceName in $mobileDevices) {
+                Write-Host "`nSearching for mobile device: $mobileDeviceName" -ForegroundColor Cyan
+
+                $mobileDevice = Get-JamfMobileDevice -MobileDeviceName $mobileDeviceName
+
+                if (-not $mobileDevice) {
+                    Write-Host "Mobile device '$mobileDeviceName' not found!" -ForegroundColor Red
+                    continue
+                }
+
+                $assignments = Get-MobileDeviceAssignments -MobileDevice $mobileDevice
+                Show-MobileDeviceAssignments -Assignments $assignments
+                $allAssignments += $assignments
+            }
+
+            # Export if requested
+            if ($ExportToCSV -and $allAssignments.Count -gt 0) {
+                $path = Get-ExportPath -RequestedPath $ExportPath -DefaultFileName 'MobileDeviceAssignments_{timestamp}.csv'
+                Export-MobileDeviceAssignmentsToCSV -Assignments $allAssignments -FilePath $path
+            }
+        }
         '5' {
             # Show ALL Computer Assignments
             $allAssignments = Show-AllComputerAssignments -ExportToCSV:$ExportToCSV -ExportPath $ExportPath
@@ -393,64 +457,54 @@ if ($parameterMode) {
             $allAssignments = Show-AllUserAssignments -ExportToCSV:$ExportToCSV -ExportPath $ExportPath
         }
         '7' {
-            # Show All Policies
-            $allPolicies = Show-AllPolicies -IncludeDisabled:$false
-            
-            if ($ExportToCSV) {
-                if ([string]::IsNullOrWhiteSpace($ExportPath)) {
-                    $ExportPath = "$env:temp\JamfAllPolicies_$(Get-Date -Format 'yyyyMMdd_HHmmss').csv"
-                }
-                Export-PoliciesToCSV -Policies $allPolicies -FilePath $ExportPath
-            }
-        }
-        '8' {
-            # Show All Profiles
-            $allProfiles = Show-AllProfiles
-            
-            if ($ExportToCSV) {
-                if ([string]::IsNullOrWhiteSpace($ExportPath)) {
-                    $ExportPath = "$env:temp\JamfAllProfiles_$(Get-Date -Format 'yyyyMMdd_HHmmss').csv"
-                }
-                Export-ProfilesToCSV -Profiles $allProfiles -FilePath $ExportPath
-            }
-        }
-        '9' {
-            # Find Unassigned Policies
-            $unassignedPolicies = Find-UnassignedPolicies
-            
-            if ($ExportToCSV -and $unassignedPolicies.Count -gt 0) {
-                if ([string]::IsNullOrWhiteSpace($ExportPath)) {
-                    $ExportPath = "$env:temp\JamfUnassignedPolicies_$(Get-Date -Format 'yyyyMMdd_HHmmss').csv"
-                }
-                $unassignedPolicies | Export-Csv -Path $ExportPath -NoTypeInformation -Force
-                Write-Host "Exported to: $ExportPath" -ForegroundColor Green
-            }
-        }
-        '10' {
-            # Find Unassigned Profiles
-            $unassignedProfiles = Find-UnassignedProfiles
-            
-            if ($ExportToCSV -and $unassignedProfiles.Count -gt 0) {
-                if ([string]::IsNullOrWhiteSpace($ExportPath)) {
-                    $ExportPath = "$env:temp\JamfUnassignedProfiles_$(Get-Date -Format 'yyyyMMdd_HHmmss').csv"
-                }
-                $unassignedProfiles | Export-Csv -Path $ExportPath -NoTypeInformation -Force
-                Write-Host "Exported to: $ExportPath" -ForegroundColor Green
-            }
-        }
-        '11' {
-            # Find Empty Groups
-            Write-Host "Find empty groups not yet implemented." -ForegroundColor Yellow
-        }
-        '12' {
-            # Generate HTML Report
-            if ([string]::IsNullOrWhiteSpace($ExportPath)) {
-                $ExportPath = "$env:temp\JamfAssignmentReport_$(Get-Date -Format 'yyyyMMdd_HHmmss').html"
-            }
-            Export-JamfHTMLReport -FilePath $ExportPath
-        }
-    }
-} else {
+            # Show All Policies
+            $allPolicies = Show-AllPolicies -IncludeDisabled:$false
+
+            if ($ExportToCSV) {
+                $path = Get-ExportPath -RequestedPath $ExportPath -DefaultFileName 'JamfAllPolicies_{timestamp}.csv' -DefaultFolder $env:temp
+                Export-PoliciesToCSV -Policies $allPolicies -FilePath $path
+            }
+        }
+        '8' {
+            # Show All Profiles
+            $allProfiles = Show-AllProfiles
+
+            if ($ExportToCSV) {
+                $path = Get-ExportPath -RequestedPath $ExportPath -DefaultFileName 'JamfAllProfiles_{timestamp}.csv' -DefaultFolder $env:temp
+                Export-ProfilesToCSV -Profiles $allProfiles -FilePath $path
+            }
+        }
+        '9' {
+            # Find Unassigned Policies
+            $unassignedPolicies = Find-UnassignedPolicies
+
+            if ($ExportToCSV -and $unassignedPolicies.Count -gt 0) {
+                $path = Get-ExportPath -RequestedPath $ExportPath -DefaultFileName 'JamfUnassignedPolicies_{timestamp}.csv' -DefaultFolder $env:temp
+                $unassignedPolicies | Export-Csv -Path $path -NoTypeInformation -Force
+                Write-Host "Exported to: $path" -ForegroundColor Green
+            }
+        }
+        '10' {
+            # Find Unassigned Profiles
+            $unassignedProfiles = Find-UnassignedProfiles
+
+            if ($ExportToCSV -and $unassignedProfiles.Count -gt 0) {
+                $path = Get-ExportPath -RequestedPath $ExportPath -DefaultFileName 'JamfUnassignedProfiles_{timestamp}.csv' -DefaultFolder $env:temp
+                $unassignedProfiles | Export-Csv -Path $path -NoTypeInformation -Force
+                Write-Host "Exported to: $path" -ForegroundColor Green
+            }
+        }
+        '11' {
+            # Find Empty Groups
+            Write-Host "Find empty groups not yet implemented." -ForegroundColor Yellow
+        }
+        '12' {
+            # Generate HTML Report
+            $path = Get-ExportPath -RequestedPath $ExportPath -DefaultFileName 'JamfAssignmentReport_{timestamp}.html' -DefaultFolder $env:temp
+            Export-JamfHTMLReport -FilePath $path
+        }
+    }
+} else {
     # Interactive mode
     do {
         $choice = Show-MainMenu
@@ -465,14 +519,15 @@ if ($parameterMode) {
                     $assignments = Get-ComputerAssignments -Computer $computer
                     Show-ComputerAssignments -Assignments $assignments
                     
-                    $export = Read-Host "`nExport to CSV? (y/n)"
-                    if ($export -eq 'y') {
-                        $path = Read-Host "Enter export path (e.g., C:\Reports\assignments.csv)"
-                        Export-AssignmentsToCSV -Assignments @($assignments) -FilePath $path
-                    }
-                } else {
-                    Write-Host "Computer not found!" -ForegroundColor Red
-                }
+                    $export = Read-Host "`nExport to CSV? (y/n)"
+                    if ($export -eq 'y') {
+                        $path = Read-Host "Enter export path (e.g., C:\Reports\assignments.csv)"
+                        $resolvedPath = Get-ExportPath -RequestedPath $path -DefaultFileName 'ComputerAssignments_{timestamp}.csv'
+                        Export-AssignmentsToCSV -Assignments @($assignments) -FilePath $resolvedPath
+                    }
+                } else {
+                    Write-Host "Computer not found!" -ForegroundColor Red
+                }
                 
                 Read-Host "`nPress Enter to continue"
             }
@@ -493,14 +548,15 @@ if ($parameterMode) {
                     $assignments = Get-MobileDeviceAssignments -MobileDevice $mobileDevice
                     Show-MobileDeviceAssignments -Assignments $assignments
                     
-                    $export = Read-Host "`nExport to CSV? (y/n)"
-                    if ($export -eq 'y') {
-                        $path = Read-Host "Enter export path (e.g., C:\Reports\mobile-assignments.csv)"
-                        Export-MobileDeviceAssignmentsToCSV -Assignments @($assignments) -FilePath $path
-                    }
-                } else {
-                    Write-Host "Mobile device not found!" -ForegroundColor Red
-                }
+                    $export = Read-Host "`nExport to CSV? (y/n)"
+                    if ($export -eq 'y') {
+                        $path = Read-Host "Enter export path (e.g., C:\Reports\mobile-assignments.csv)"
+                        $resolvedPath = Get-ExportPath -RequestedPath $path -DefaultFileName 'MobileDeviceAssignments_{timestamp}.csv'
+                        Export-MobileDeviceAssignmentsToCSV -Assignments @($assignments) -FilePath $resolvedPath
+                    }
+                } else {
+                    Write-Host "Mobile device not found!" -ForegroundColor Red
+                }
                 
                 Read-Host "`nPress Enter to continue"
             }
@@ -543,53 +599,57 @@ if ($parameterMode) {
                 $includeDisabled = Read-Host "Include disabled policies? (y/n)"
                 $allPolicies = Show-AllPolicies -IncludeDisabled:($includeDisabled -eq 'y')
                 
-                $export = Read-Host "`nExport to CSV? (y/n)"
-                if ($export -eq 'y') {
-                    $path = Read-Host "Enter export path (e.g., C:\Reports\policies.csv)"
-                    Export-PoliciesToCSV -Policies $allPolicies -FilePath $path
-                }
-                
-                Read-Host "`nPress Enter to continue"
-            }
-            '8' {
-                # Show All Profiles
-                $allProfiles = Show-AllProfiles
-                
-                $export = Read-Host "`nExport to CSV? (y/n)"
-                if ($export -eq 'y') {
-                    $path = Read-Host "Enter export path (e.g., C:\Reports\profiles.csv)"
-                    Export-ProfilesToCSV -Profiles $allProfiles -FilePath $path
-                }
-                
-                Read-Host "`nPress Enter to continue"
-            }
-            '9' {
-                # Find Unassigned Policies
-                $unassignedPolicies = Find-UnassignedPolicies
-                
-                if ($unassignedPolicies.Count -gt 0) {
-                    $export = Read-Host "`nExport to CSV? (y/n)"
-                    if ($export -eq 'y') {
-                        $path = Read-Host "Enter export path (e.g., C:\Reports\unassigned-policies.csv)"
-                        $unassignedPolicies | Export-Csv -Path $path -NoTypeInformation -Force
-                        Write-Host "Exported to: $path" -ForegroundColor Green
-                    }
-                }
-                
-                Read-Host "`nPress Enter to continue"
-            }
-            '10' {
-                # Find Unassigned Profiles
-                $unassignedProfiles = Find-UnassignedProfiles
-                
-                if ($unassignedProfiles.Count -gt 0) {
-                    $export = Read-Host "`nExport to CSV? (y/n)"
-                    if ($export -eq 'y') {
-                        $path = Read-Host "Enter export path (e.g., C:\Reports\unassigned-profiles.csv)"
-                        $unassignedProfiles | Export-Csv -Path $path -NoTypeInformation -Force
-                        Write-Host "Exported to: $path" -ForegroundColor Green
-                    }
-                }
+                $export = Read-Host "`nExport to CSV? (y/n)"
+                if ($export -eq 'y') {
+                    $path = Read-Host "Enter export path (e.g., C:\Reports\policies.csv)"
+                    $resolvedPath = Get-ExportPath -RequestedPath $path -DefaultFileName 'JamfAllPolicies_{timestamp}.csv' -DefaultFolder $env:temp
+                    Export-PoliciesToCSV -Policies $allPolicies -FilePath $resolvedPath
+                }
+
+                Read-Host "`nPress Enter to continue"
+            }
+            '8' {
+                # Show All Profiles
+                $allProfiles = Show-AllProfiles
+
+                $export = Read-Host "`nExport to CSV? (y/n)"
+                if ($export -eq 'y') {
+                    $path = Read-Host "Enter export path (e.g., C:\Reports\profiles.csv)"
+                    $resolvedPath = Get-ExportPath -RequestedPath $path -DefaultFileName 'JamfAllProfiles_{timestamp}.csv' -DefaultFolder $env:temp
+                    Export-ProfilesToCSV -Profiles $allProfiles -FilePath $resolvedPath
+                }
+
+                Read-Host "`nPress Enter to continue"
+            }
+            '9' {
+                # Find Unassigned Policies
+                $unassignedPolicies = Find-UnassignedPolicies
+
+                if ($unassignedPolicies.Count -gt 0) {
+                    $export = Read-Host "`nExport to CSV? (y/n)"
+                    if ($export -eq 'y') {
+                        $path = Read-Host "Enter export path (e.g., C:\Reports\unassigned-policies.csv)"
+                        $resolvedPath = Get-ExportPath -RequestedPath $path -DefaultFileName 'JamfUnassignedPolicies_{timestamp}.csv' -DefaultFolder $env:temp
+                        $unassignedPolicies | Export-Csv -Path $resolvedPath -NoTypeInformation -Force
+                        Write-Host "Exported to: $resolvedPath" -ForegroundColor Green
+                    }
+                }
+
+                Read-Host "`nPress Enter to continue"
+            }
+            '10' {
+                # Find Unassigned Profiles
+                $unassignedProfiles = Find-UnassignedProfiles
+
+                if ($unassignedProfiles.Count -gt 0) {
+                    $export = Read-Host "`nExport to CSV? (y/n)"
+                    if ($export -eq 'y') {
+                        $path = Read-Host "Enter export path (e.g., C:\Reports\unassigned-profiles.csv)"
+                        $resolvedPath = Get-ExportPath -RequestedPath $path -DefaultFileName 'JamfUnassignedProfiles_{timestamp}.csv' -DefaultFolder $env:temp
+                        $unassignedProfiles | Export-Csv -Path $resolvedPath -NoTypeInformation -Force
+                        Write-Host "Exported to: $resolvedPath" -ForegroundColor Green
+                    }
+                }
                 
                 Read-Host "`nPress Enter to continue"
             }
@@ -598,16 +658,14 @@ if ($parameterMode) {
                 Write-Host "Find empty groups not yet implemented." -ForegroundColor Yellow
                 Read-Host "`nPress Enter to continue"
             }
-            '12' {
-                # Generate HTML Report
-                $ExportPath = Read-Host "Enter export path for HTML report (e.g., C:\Reports\jamf-report.html)"
-                if ([string]::IsNullOrWhiteSpace($ExportPath)) {
-                    $ExportPath = ".\JamfAssignmentReport_$(Get-Date -Format 'yyyyMMdd_HHmmss').html"
-                }
-                Export-JamfHTMLReport -FilePath $ExportPath
-
-                Read-Host "`nPress Enter to continue"
-            }
+            '12' {
+                # Generate HTML Report
+                $ExportPath = Read-Host "Enter export path for HTML report (e.g., C:\Reports\jamf-report.html)"
+                $resolvedPath = Get-ExportPath -RequestedPath $ExportPath -DefaultFileName 'JamfAssignmentReport_{timestamp}.html' -DefaultFolder $env:temp
+                Export-JamfHTMLReport -FilePath $resolvedPath
+
+                Read-Host "`nPress Enter to continue"
+            }
             '0' {
                 Write-Host "`nThank you for using JAMF Assignment Checker! 👋" -ForegroundColor Green
                 break
