diff --git a/app/Http/Controllers/ComputerScienceResourceController.php b/app/Http/Controllers/ComputerScienceResourceController.php
index 5fb8dd3a..f68085d2 100644
--- a/app/Http/Controllers/ComputerScienceResourceController.php
+++ b/app/Http/Controllers/ComputerScienceResourceController.php
@@ -19,21 +19,22 @@ class ComputerScienceResourceController extends Controller
 {
     public function __construct(
         protected ComputerScienceResourceService $resourceService,
+        protected ComputerScienceResourceFilter $filterService
     ) {}
 
     /**
      * Display a listing of the resource.
      */
-    public function index(Request $request, ComputerScienceResourceFilter $filterService)
+    public function index(Request $request)
     {
         $query = ComputerScienceResource::query();
 
         // Apply all filters and sorting
         $filters = $request->query();
-        $query = $filterService->applyFilters($query, $filters);
+        $query = $this->filterService->applyFilters($query, $filters);
 
         // Paginate with appended query params
-        $resources = $query->paginate(10)->appends($request->query());
+        $resources = $query->paginate(20)->appends($request->query());
 
         $news = NewsPost::limit(10)->get();
 
diff --git a/app/Http/Controllers/ResourceEditsController.php b/app/Http/Controllers/ResourceEditsController.php
index 2b6ff2bf..ba54741f 100644
--- a/app/Http/Controllers/ResourceEditsController.php
+++ b/app/Http/Controllers/ResourceEditsController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests\StoreResourceEdit;
+use App\Http\Requests\StoreResourceEditRequest;
 use App\Models\ComputerScienceResource;
 use App\Models\ResourceEdits;
 use App\Services\ResourceEditsService;
@@ -36,7 +36,7 @@ public function create(string $slug)
     /**
      * Store the edits request.
      */
-    public function store(ComputerScienceResource $computerScienceResource, StoreResourceEdit $request)
+    public function store(ComputerScienceResource $computerScienceResource, StoreResourceEditRequest $request)
     {
         $validatedData = $request->validated();
         $proposedChanges = $validatedData['proposed_changes'] ?? [];
@@ -95,7 +95,7 @@ public function merge(ResourceEditsService $editsService, ResourceEdits $resourc
 
             // Go through each property in proposed_changes, and if it exists. then set the value
             $changes = $resourceEdits->proposed_changes;
-            $proposedFields = ['name', 'description', 'page_url', 'platforms', 'difficulty', 'pricing'];
+            $proposedFields = ['name', 'description', 'page_url', 'platforms', 'difficulties', 'pricing'];
             foreach ($proposedFields as $field) {
                 if (array_key_exists($field, $changes)) {
                     $resource->$field = $changes[$field];
diff --git a/app/Http/Controllers/ResourceReviewController.php b/app/Http/Controllers/ResourceReviewController.php
index bdb62b22..e19b459e 100644
--- a/app/Http/Controllers/ResourceReviewController.php
+++ b/app/Http/Controllers/ResourceReviewController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests\StoreResourceReview;
+use App\Http\Requests\StoreResourceReviewRequest;
 use App\Models\ComputerScienceResource;
 use App\Models\ResourceReview;
 use Illuminate\Support\Facades\Auth;
@@ -11,7 +11,7 @@
 class ResourceReviewController extends Controller
 {
     // Store the review on the resource
-    public function store(StoreResourceReview $request, ComputerScienceResource $computerScienceResource)
+    public function store(StoreResourceReviewRequest $request, ComputerScienceResource $computerScienceResource)
     {
         // Validate the request data
         $validatedData = $request->validated();
@@ -61,7 +61,7 @@ public function store(StoreResourceReview $request, ComputerScienceResource $com
         return response()->json($review);
     }
 
-    public function update(StoreResourceReview $request, ComputerScienceResource $computerScienceResource)
+    public function update(StoreResourceReviewRequest $request, ComputerScienceResource $computerScienceResource)
     {
         // Validate the request data
         $validatedData = $request->validated();
diff --git a/app/Http/Requests/StoreResourceEdit.php b/app/Http/Requests/StoreResourceEditRequest.php
similarity index 88%
rename from app/Http/Requests/StoreResourceEdit.php
rename to app/Http/Requests/StoreResourceEditRequest.php
index fb9a189a..807eba71 100644
--- a/app/Http/Requests/StoreResourceEdit.php
+++ b/app/Http/Requests/StoreResourceEditRequest.php
@@ -6,7 +6,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Validation\Rule;
 
-class StoreResourceEdit extends FormRequest
+class StoreResourceEditRequest extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
@@ -30,14 +30,16 @@ public function rules(): array
 
             'proposed_changes.name' => ['nullable', 'string', 'max:100'],
             'proposed_changes.description' => ['nullable', 'string', 'max:10000'],
-            'proposed_changes.platforms' => ['nullable', 'array'],
+            'proposed_changes.platforms' => ['nullable', 'array', 'min:1'],
             'proposed_changes.platforms.*' => ['required', 'distinct', 'string', Rule::in(config('computerScienceResource.platforms'))],
             'proposed_changes.page_url' => ['nullable', 'string', 'url:http,https', 'max:255'],
-            'proposed_changes.difficulty' => ['nullable', 'string', Rule::in(config('computerScienceResource.difficulties'))],
+            'proposed_changes.difficulties' => ['nullable', 'array', 'min:1'],
+            'proposed_changes.difficulties.*' => ['required', 'distinct', 'string', Rule::in(config('computerScienceResource.difficulties'))],
             'proposed_changes.pricing' => ['nullable', 'string', Rule::in(config('computerScienceResource.pricings'))],
-            'proposed_changes.image_file' => ['nullable', 'image', 'max:500'], // 500 kilobytes
             'proposed_changes.topic_tags' => ['nullable', 'array', 'min:2'],
             'proposed_changes.topic_tags.*' => ['required', 'distinct', 'string', 'max:50', 'regex:'.config('computerScienceResource.tags_regex')],
+
+            'proposed_changes.image_file' => ['nullable', 'image', 'max:500'], // 500 kilobytes
             'proposed_changes.general_tags' => ['nullable', 'array'],
             'proposed_changes.general_tags.*' => ['required', 'distinct', 'string', 'max:50', 'regex:'.config('computerScienceResource.tags_regex')],
             'proposed_changes.programming_language_tags' => ['nullable', 'array'],
diff --git a/app/Http/Requests/StoreResourceRequest.php b/app/Http/Requests/StoreResourceRequest.php
index 0c2d35c5..e29c7a3b 100644
--- a/app/Http/Requests/StoreResourceRequest.php
+++ b/app/Http/Requests/StoreResourceRequest.php
@@ -29,7 +29,8 @@ public function rules(): array
             'platforms' => ['required', 'array', 'min:1'],
             'platforms.*' => ['required', 'distinct', 'string', Rule::in(config('computerScienceResource.platforms'))],
             'page_url' => ['required', 'string', 'url:http,https', 'max:255'],
-            'difficulty' => ['required', 'string', Rule::in(config('computerScienceResource.difficulties'))],
+            'difficulties' => ['required', 'array', 'min:1'],
+            'difficulties.*' => ['required', 'distinct', 'string', Rule::in(config('computerScienceResource.difficulties'))],
             'pricing' => ['required', 'string', Rule::in(config('computerScienceResource.pricings'))],
             'topic_tags' => ['required', 'array', 'min:2'],
             'topic_tags.*' => ['required', 'distinct', 'string', 'max:50', 'regex:'.config('computerScienceResource.tags_regex')],
diff --git a/app/Http/Requests/StoreResourceReview.php b/app/Http/Requests/StoreResourceReviewRequest.php
similarity index 96%
rename from app/Http/Requests/StoreResourceReview.php
rename to app/Http/Requests/StoreResourceReviewRequest.php
index 6966a860..36e04fb7 100644
--- a/app/Http/Requests/StoreResourceReview.php
+++ b/app/Http/Requests/StoreResourceReviewRequest.php
@@ -5,7 +5,7 @@
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Auth;
 
-class StoreResourceReview extends FormRequest
+class StoreResourceReviewRequest extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Http/Resources/ComputerScienceResourceResource.php b/app/Http/Resources/ComputerScienceResourceResource.php
index 871cf5bd..415f7e26 100644
--- a/app/Http/Resources/ComputerScienceResourceResource.php
+++ b/app/Http/Resources/ComputerScienceResourceResource.php
@@ -20,7 +20,7 @@ public function toArray(Request $request): array
             'page_url' => $this->page_url,
             'image_path' => $this->image_path,
             'platforms' => $this->platforms,
-            'difficulty' => $this->difficulty,
+            'difficulties' => $this->difficulties,
             'pricing' => $this->pricing,
             'topic_tags' => $this->topic_tags,
             'programming_language_tags' => $this->programming_language_tags,
diff --git a/app/Models/ComputerScienceResource.php b/app/Models/ComputerScienceResource.php
index 5433f2c1..adb2fb68 100644
--- a/app/Models/ComputerScienceResource.php
+++ b/app/Models/ComputerScienceResource.php
@@ -129,6 +129,14 @@ protected function platforms(): Attribute
         );
     }
 
+    protected function difficulties(): Attribute
+    {
+        return Attribute::make(
+            get: fn ($value) => explode(',', $value),
+            set: fn ($value) => implode(',', $value)
+        );
+    }
+
     /**
      * Accessor to get topic tags.
      */
diff --git a/app/Services/ComputerScienceResourceFilter.php b/app/Services/ComputerScienceResourceFilter.php
index f1bcb3d5..9ebc93cf 100644
--- a/app/Services/ComputerScienceResourceFilter.php
+++ b/app/Services/ComputerScienceResourceFilter.php
@@ -25,8 +25,8 @@ public function validate(array $request)
             'description' => ['nullable', 'string', 'max:1000'],
             'platforms' => ['nullable', 'array'],
             'platforms.*' => ['required', 'distinct', 'string', Rule::in(config('computerScienceResource.platforms'))],
-            'difficulty' => ['nullable', 'array'],
-            'difficulty.*' => ['required', 'distinct', 'string', Rule::in(config('computerScienceResource.difficulties'))],
+            'difficulties' => ['nullable', 'array'],
+            'difficulties.*' => ['required', 'distinct', 'string', Rule::in(config('computerScienceResource.difficulties'))],
             'pricing' => ['nullable', 'array'],
             'pricing.*' => ['required', 'distinct', 'string', Rule::in(config('computerScienceResource.pricings'))],
             'topics_tags' => ['nullable', 'array'],
@@ -84,9 +84,14 @@ public function applyFilters($query, array $filters)
             });
         }
 
-        // Filter by difficulty
-        if (! empty($filters['difficulty'])) {
-            $query->whereIn('difficulty', (array) $filters['difficulty']);
+        // Filter by difficulties
+        if (! empty($filters['difficulties'])) {
+            $query->where(function ($q) use ($filters) {
+                foreach ($filters['difficulties'] as $difficulty) {
+                    $q->orWhereRaw('FIND_IN_SET(?, difficulties)', [$difficulty]);
+
+                }
+            });
         }
 
         // Filter by pricing
diff --git a/app/Services/ComputerScienceResourceService.php b/app/Services/ComputerScienceResourceService.php
index af3b2250..3b62b7cf 100644
--- a/app/Services/ComputerScienceResourceService.php
+++ b/app/Services/ComputerScienceResourceService.php
@@ -53,7 +53,7 @@ public function createResource(array $validatedData): ComputerScienceResource
                 'description' => $validatedData['description'],
                 'page_url' => $validatedData['page_url'],
                 'platforms' => $validatedData['platforms'],
-                'difficulty' => $validatedData['difficulty'],
+                'difficulties' => $validatedData['difficulties'],
                 'pricing' => $validatedData['pricing'],
             ]);
 
diff --git a/database/factories/ComputerScienceResourceFactory.php b/database/factories/ComputerScienceResourceFactory.php
index c4f18bae..72e79201 100644
--- a/database/factories/ComputerScienceResourceFactory.php
+++ b/database/factories/ComputerScienceResourceFactory.php
@@ -36,7 +36,7 @@ public function definition(): array
             'image_path' => $imagePath,
             'page_url' => fake()->url(),
             'platforms' => fake()->randomElements($platforms, rand(1, 3)),
-            'difficulty' => fake()->randomElement($difficulties),
+            'difficulties' => fake()->randomElements($difficulties, rand(1, 3)),
             'pricing' => fake()->randomElement($pricings),
         ];
     }
diff --git a/database/factories/ResourceEditsFactory.php b/database/factories/ResourceEditsFactory.php
index 2687d964..b34dde71 100644
--- a/database/factories/ResourceEditsFactory.php
+++ b/database/factories/ResourceEditsFactory.php
@@ -30,7 +30,7 @@ public function definition(): array
             'image_path' => $imagePath,
             'page_url' => $this->faker->url(),
             'platforms' => $this->faker->randomElements($platforms, rand(1, 3)),
-            'difficulty' => $this->faker->randomElement($difficulties),
+            'difficulties' => $this->faker->randomElements($difficulties, rand(1, 3)),
             'pricing' => $this->faker->randomElement($pricings),
             'topic_tags' => ['data-structures', 'algorithms'],
             'programming_language_tags' => ['python'],
diff --git a/database/migrations/2025_09_06_223541_change_computer_science_resources_difficulty_to_set.php b/database/migrations/2025_09_06_223541_change_computer_science_resources_difficulty_to_set.php
new file mode 100644
index 00000000..4092301a
--- /dev/null
+++ b/database/migrations/2025_09_06_223541_change_computer_science_resources_difficulty_to_set.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        // Rename column and change type
+        DB::statement("
+            ALTER TABLE computer_science_resources
+            CHANGE difficulty difficulties SET(
+                'general',
+                'introduction',
+                'practical',
+                'advanced',
+                'academic'
+            ) NOT NULL
+        ");
+    }
+
+    public function down(): void
+    {
+        // Rollback: rename back and revert type
+        DB::statement("
+            ALTER TABLE computer_science_resources
+            CHANGE difficulties difficulty ENUM(
+                'general',
+                'introduction',
+                'practical',
+                'advanced',
+                'academic'
+            ) NOT NULL
+        ");
+    }
+};
diff --git a/resources/js/Components/Resources/FilterBar.vue b/resources/js/Components/Resources/FilterBar.vue
index 13cb5462..caa9cdc2 100644
--- a/resources/js/Components/Resources/FilterBar.vue
+++ b/resources/js/Components/Resources/FilterBar.vue
@@ -22,8 +22,8 @@ const description = ref("");
 
 // multi-select filters
 const selectedPlatforms = ref([]);
-const selectedDifficulty = ref([]);
-const selectedPricing = ref([]);
+const selectedDifficulties = ref([]);
+const selectedPricings = ref([]);
 const selectedTopics = ref([]);
 const selectedProgrammingLanguages = ref([]);
 const selectedGeneralTags = ref([]);
@@ -56,8 +56,8 @@ onMounted(() => {
     description.value = urlParams.get("description") || "";
 
     selectedPlatforms.value = extractIndexedArray(urlParams, "platforms");
-    selectedDifficulty.value = extractIndexedArray(urlParams, "difficulty");
-    selectedPricing.value = extractIndexedArray(urlParams, "pricing");
+    selectedDifficulties.value = extractIndexedArray(urlParams, "difficulties");
+    selectedPricings.value = extractIndexedArray(urlParams, "pricing");
     selectedTopics.value = extractIndexedArray(urlParams, "topics_tags");
     selectedProgrammingLanguages.value = extractIndexedArray(
         urlParams,
@@ -138,11 +138,11 @@ function search() {
             platforms: selectedPlatforms.value.length
                 ? selectedPlatforms.value
                 : undefined,
-            difficulty: selectedDifficulty.value.length
-                ? selectedDifficulty.value
+            difficulties: selectedDifficulties.value.length
+                ? selectedDifficulties.value
                 : undefined,
-            pricing: selectedPricing.value.length
-                ? selectedPricing.value
+            pricing: selectedPricings.value.length
+                ? selectedPricings.value
                 : undefined,
             topics_tags: selectedTopics.value.length
                 ? selectedTopics.value
@@ -182,8 +182,8 @@ function resetFilters() {
 
     // Arrays
     selectedPlatforms.value = [];
-    selectedDifficulty.value = [];
-    selectedPricing.value = [];
+    selectedDifficulties.value = [];
+    selectedPricings.value = [];
     selectedTopics.value = [];
     selectedProgrammingLanguages.value = [];
     selectedGeneralTags.value = [];
@@ -271,7 +271,7 @@ function resetFilters() {
                         Difficulty
                     </label>
                     <MultiSelect
-                        v-model="selectedDifficulty"
+                        v-model="selectedDifficulties"
                         :options="difficultiesObject"
                         optionLabel="label"
                         optionValue="value"
@@ -287,7 +287,7 @@ function resetFilters() {
                         Pricing
                     </label>
                     <MultiSelect
-                        v-model="selectedPricing"
+                        v-model="selectedPricings"
                         :options="pricingsObject"
                         optionLabel="label"
                         optionValue="value"
diff --git a/resources/js/Components/Resources/ResourceDescription.vue b/resources/js/Components/Resources/ResourceDescription.vue
index 8fd3921b..29d644fd 100644
--- a/resources/js/Components/Resources/ResourceDescription.vue
+++ b/resources/js/Components/Resources/ResourceDescription.vue
@@ -1,9 +1,13 @@
 <script setup>
-import { defineProps } from 'vue';
-import { Icon } from '@iconify/vue';
-import StarRating from '@/Components/StarRating/StarRating.vue';
-import { platformIcons, pricingIcons, difficultyIcons } from '@/Helpers/icons';
-import { platformLabels, pricingLabels, difficultyLabels } from '@/Helpers/labels';
+import { defineProps, computed } from "vue";
+import { Icon } from "@iconify/vue";
+import StarRating from "@/Components/StarRating/StarRating.vue";
+import { platformIcons, pricingIcons, difficultyIcons } from "@/Helpers/icons";
+import {
+    platformLabels,
+    pricingLabels,
+    difficultyLabels,
+} from "@/Helpers/labels";
 
 const props = defineProps({
     resource: {
@@ -15,7 +19,9 @@ const props = defineProps({
 
 <template>
     <div class="flex-grow w-full">
-        <div class="flex flex-col sm:flex-row sm:items-start sm:justify-between mb-4 gap-4">
+        <div
+            class="flex flex-col sm:flex-row sm:items-start sm:justify-between mb-4 gap-4"
+        >
             <div class="flex items-center gap-3">
                 <h1 class="text-3xl font-bold">
                     {{ props.resource.name }}
@@ -34,11 +40,18 @@ const props = defineProps({
                 <div class="flex items-center gap-4">
                     <div class="flex items-center gap-2">
                         <StarRating
-                            :model-value="Number(props.resource.review_summary?.overall_rating)"
+                            :model-value="
+                                Number(
+                                    props.resource.review_summary
+                                        ?.overall_rating
+                                )
+                            "
                             :size="23"
                         />
                     </div>
-                    <div class="inline-flex items-center gap-1 text-lg font-medium text-gray-700 dark:text-gray-300">
+                    <div
+                        class="inline-flex items-center gap-1 text-lg font-medium text-gray-700 dark:text-gray-300"
+                    >
                         <Icon icon="mdi:account-group" width="20" height="20" />
                         {{ props.resource.review_summary?.review_count || 0 }}
                     </div>
@@ -46,7 +59,9 @@ const props = defineProps({
             </div>
         </div>
 
-        <p class="text-gray-700 mb-6 text-base leading-relaxed whitespace-pre-line">
+        <p
+            class="text-gray-700 mb-6 text-base leading-relaxed whitespace-pre-line"
+        >
             {{ props.resource.description }}
         </p>
 
@@ -54,30 +69,70 @@ const props = defineProps({
         <div class="flex flex-col gap-3 mb-4">
             <!-- Row 1: Resource Properties -->
             <div class="flex flex-wrap items-center gap-4 text-sm">
-                <!-- Difficulty -->
-                <div v-if="props.resource.difficulty" class="flex items-center gap-1.5 bg-gray-50 dark:bg-gray-800/50 px-3 py-1 rounded-md">
-                    <span class="font-semibold text-gray-900 dark:text-gray-100">Level:</span>
-                    <span class="inline-flex items-center gap-1 text-gray-700 dark:text-gray-300">
-                        <Icon :icon="difficultyIcons[props.resource.difficulty]" width="16" height="16" />
-                        {{ difficultyLabels[props.resource.difficulty] }}
-                    </span>
+                <!-- Difficulties -->
+                <div
+                    class="flex items-center gap-1.5 bg-gray-50 dark:bg-gray-800/50 px-3 py-1 rounded-md"
+                >
+                    <span class="font-semibold text-gray-900 dark:text-gray-100"
+                        >Difficulties:</span
+                    >
+                    <div
+                        class="inline-flex flex-wrap items-center gap-2 text-gray-700 dark:text-gray-300"
+                    >
+                        <span
+                            v-for="level in props.resource.difficulties"
+                            :key="level"
+                            class="inline-flex items-center gap-1"
+                        >
+                            <Icon
+                                :icon="difficultyIcons[level.trim()]"
+                                width="16"
+                                height="16"
+                            />
+                            {{ difficultyLabels[level.trim()] }}
+                        </span>
+                    </div>
                 </div>
 
                 <!-- Pricing -->
-                <div class="flex items-center gap-1.5 bg-gray-50 dark:bg-gray-800/50 px-3 py-1 rounded-md">
-                    <span class="font-semibold text-gray-900 dark:text-gray-100">Pricing:</span>
-                    <span class="inline-flex items-center gap-1 text-gray-700 dark:text-gray-300">
-                        <Icon :icon="pricingIcons[props.resource.pricing]" width="16" height="16" />
+                <div
+                    class="flex items-center gap-1.5 bg-gray-50 dark:bg-gray-800/50 px-3 py-1 rounded-md"
+                >
+                    <span class="font-semibold text-gray-900 dark:text-gray-100"
+                        >Pricing:</span
+                    >
+                    <span
+                        class="inline-flex items-center gap-1 text-gray-700 dark:text-gray-300"
+                    >
+                        <Icon
+                            :icon="pricingIcons[props.resource.pricing]"
+                            width="16"
+                            height="16"
+                        />
                         {{ pricingLabels[props.resource.pricing] }}
                     </span>
                 </div>
 
                 <!-- Platforms -->
-                <div class="flex items-center gap-1.5 bg-gray-50 dark:bg-gray-800/50 px-3 py-1 rounded-md">
-                    <span class="font-semibold text-gray-900 dark:text-gray-100">Platforms:</span>
-                    <div class="inline-flex flex-wrap items-center gap-2 text-gray-700 dark:text-gray-300">
-                        <span v-for="type in props.resource.platforms" :key="type" class="inline-flex items-center gap-1">
-                            <Icon :icon="platformIcons[type.trim()]" width="16" height="16" />
+                <div
+                    class="flex items-center gap-1.5 bg-gray-50 dark:bg-gray-800/50 px-3 py-1 rounded-md"
+                >
+                    <span class="font-semibold text-gray-900 dark:text-gray-100"
+                        >Platforms:</span
+                    >
+                    <div
+                        class="inline-flex flex-wrap items-center gap-2 text-gray-700 dark:text-gray-300"
+                    >
+                        <span
+                            v-for="type in props.resource.platforms"
+                            :key="type"
+                            class="inline-flex items-center gap-1"
+                        >
+                            <Icon
+                                :icon="platformIcons[type.trim()]"
+                                width="16"
+                                height="16"
+                            />
                             {{ platformLabels[type.trim()] }}
                         </span>
                     </div>
@@ -87,39 +142,71 @@ const props = defineProps({
             <!-- Row 2: Tags -->
             <div class="flex flex-wrap items-center gap-4 text-sm">
                 <!-- Topic Tags -->
-                <div v-if="props.resource.topic_tags?.length" class="flex items-center gap-1 px-2 py-1 rounded-md">
-                    <span class="inline-flex items-center gap-1 font-semibold text-blue-700 dark:text-blue-200">
+                <div
+                    v-if="props.resource.topic_tags?.length"
+                    class="flex items-center gap-1 px-2 py-1 rounded-md"
+                >
+                    <span
+                        class="inline-flex items-center gap-1 font-semibold text-blue-700 dark:text-blue-200"
+                    >
                         <Icon icon="mdi:bookmark" width="14" height="14" />
                         Topics:
                     </span>
                     <div class="inline-flex flex-wrap items-center gap-0.5">
-                        <span v-for="tag in props.resource.topic_tags" :key="tag" class="inline-flex items-center gap-1 bg-blue-100/50 dark:bg-blue-800/30 px-2 py-0.5 rounded-full text-blue-700 dark:text-blue-200">
+                        <span
+                            v-for="tag in props.resource.topic_tags"
+                            :key="tag"
+                            class="inline-flex items-center gap-1 bg-blue-100/50 dark:bg-blue-800/30 px-2 py-0.5 rounded-full text-blue-700 dark:text-blue-200"
+                        >
                             {{ tag }}
                         </span>
                     </div>
                 </div>
 
                 <!-- Programming Language Tags -->
-                <div v-if="props.resource.programming_language_tags?.length" class="flex items-center gap-1.5 px-2 py-1 rounded-md">
-                    <span class="inline-flex items-center gap-1 font-semibold text-purple-700 dark:text-purple-200">
-                        <Icon icon="mdi:language-typescript" width="14" height="14" />
+                <div
+                    v-if="props.resource.programming_language_tags?.length"
+                    class="flex items-center gap-1.5 px-2 py-1 rounded-md"
+                >
+                    <span
+                        class="inline-flex items-center gap-1 font-semibold text-purple-700 dark:text-purple-200"
+                    >
+                        <Icon
+                            icon="mdi:language-typescript"
+                            width="14"
+                            height="14"
+                        />
                         Languages:
                     </span>
                     <div class="inline-flex flex-wrap items-center gap-0.5">
-                        <span v-for="tag in props.resource.programming_language_tags" :key="tag" class="inline-flex items-center gap-1 bg-purple-100/50 dark:bg-purple-800/30 px-2 py-0.5 rounded-full text-purple-700 dark:text-purple-200">
+                        <span
+                            v-for="tag in props.resource
+                                .programming_language_tags"
+                            :key="tag"
+                            class="inline-flex items-center gap-1 bg-purple-100/50 dark:bg-purple-800/30 px-2 py-0.5 rounded-full text-purple-700 dark:text-purple-200"
+                        >
                             {{ tag }}
                         </span>
                     </div>
                 </div>
 
                 <!-- General Tags -->
-                <div v-if="props.resource.general_tags?.length" class="flex items-center gap-1.5 px-2 py-1 rounded-md">
-                    <span class="inline-flex items-center gap-1 font-semibold text-yellow-700 dark:text-yellow-200">
+                <div
+                    v-if="props.resource.general_tags?.length"
+                    class="flex items-center gap-1.5 px-2 py-1 rounded-md"
+                >
+                    <span
+                        class="inline-flex items-center gap-1 font-semibold text-yellow-700 dark:text-yellow-200"
+                    >
                         <Icon icon="mdi:tag" width="14" height="14" />
                         Tags:
                     </span>
                     <div class="inline-flex flex-wrap items-center gap-0.5">
-                        <span v-for="tag in props.resource.general_tags" :key="tag" class="inline-flex items-center gap-1 bg-yellow-100/50 dark:bg-yellow-800/30 px-2 py-0.5 rounded-full text-yellow-700 dark:text-yellow-200">
+                        <span
+                            v-for="tag in props.resource.general_tags"
+                            :key="tag"
+                            class="inline-flex items-center gap-1 bg-yellow-100/50 dark:bg-yellow-800/30 px-2 py-0.5 rounded-full text-yellow-700 dark:text-yellow-200"
+                        >
                             {{ tag }}
                         </span>
                     </div>
diff --git a/resources/js/Components/Resources/ResourceItem.vue b/resources/js/Components/Resources/ResourceItem.vue
index 12a1888b..ddb87f50 100644
--- a/resources/js/Components/Resources/ResourceItem.vue
+++ b/resources/js/Components/Resources/ResourceItem.vue
@@ -7,7 +7,7 @@ import { difficultyLabels, pricingLabels, platformLabels } from "@/Helpers/label
 import { platformIcons, pricingIcons, difficultyIcons } from "@/Helpers/icons";
 import ResourceThumbnail from "./ResourceThumbnail.vue";
 
-defineProps({
+const props = defineProps({
     resource: {
         type: Object,
         required: true,
@@ -15,6 +15,7 @@ defineProps({
 });
 
 const emit = defineEmits(["upvote", "downvote"]);
+
 </script>
 
 <template>
@@ -76,12 +77,14 @@ const emit = defineEmits(["upvote", "downvote"]);
                 <!-- Row 1: Resource Properties -->
                 <div class="flex flex-wrap items-center gap-3 text-xs">
                     <!-- Difficulty -->
-                    <div v-if="resource.difficulty" class="flex items-center gap-1.5 bg-gray-50 dark:bg-gray-800/50 px-2 py-1 rounded-md">
-                        <span class="font-semibold text-gray-900 dark:text-gray-100">Level:</span>
-                        <span class="inline-flex items-center gap-1 text-gray-700 dark:text-gray-300">
-                            <Icon :icon="difficultyIcons[resource.difficulty]" width="14" height="14" />
-                            {{ difficultyLabels[resource.difficulty] }}
-                        </span>
+                    <div class="flex items-center gap-1.5 bg-gray-50 dark:bg-gray-800/50 px-2 py-1 rounded-md">
+                        <span class="font-semibold text-gray-900 dark:text-gray-100">Difficulties:</span>
+                        <div class="inline-flex flex-wrap items-center gap-2 text-gray-700 dark:text-gray-300">
+                            <span v-for="difficulty in resource.difficulties" :key="difficulty" class="inline-flex items-center gap-1">
+                                <Icon :icon="difficultyIcons[difficulty.trim()]" width="14" height="14" />
+                                {{ difficultyLabels[difficulty.trim()] }}
+                            </span>
+                        </div>
                     </div>
 
                     <!-- Pricing -->
diff --git a/resources/js/Helpers/validation.js b/resources/js/Helpers/validation.js
index 57947d56..2287f86f 100644
--- a/resources/js/Helpers/validation.js
+++ b/resources/js/Helpers/validation.js
@@ -10,7 +10,7 @@ export const resourceMandatoryFields = object({
         .required("URL is required"),
     platforms: array().of(string()).min(1, "At least one platform is required"),
     description: string().required("Description is required").max(10000),
-    difficulty: string().required("Difficulty level is required"),
+    difficulty: array().of(string()).min(1, "Difficulty level is required"),
     pricing: string().required("Pricing information is required"),
 });
 
@@ -102,7 +102,7 @@ export const nullableResourceFields = object({
     // No validation on image_file since it will be validated on backend
     platforms: array().of(string()),
     description: string().max(10000),
-    difficulty: string(),
+    difficulty: array().of(string()),
     pricing: string(),
     topic_tags: array()
         .of(string().max(50))
diff --git a/resources/js/Pages/ResourceEdits/Create.vue b/resources/js/Pages/ResourceEdits/Create.vue
index d4efa3f1..a4fb3a44 100644
--- a/resources/js/Pages/ResourceEdits/Create.vue
+++ b/resources/js/Pages/ResourceEdits/Create.vue
@@ -43,7 +43,7 @@ const formData = useForm({
         description: props.resource.description,
         page_url: props.resource.page_url,
         image_file: null,
-        difficulty: props.resource.difficulty,
+        difficulties: props.resource.difficulties,
         pricing: props.resource.pricing,
         platforms: props.resource.platforms,
         topic_tags: props.resource.topic_tags || [],
@@ -346,13 +346,13 @@ const submit = async () => {
                             >
                                 <div>
                                     <InputLabel
-                                        for="difficulty"
+                                        for="difficulties"
                                         value="Difficulty"
                                     />
-                                    <Select
-                                        id="difficulty"
+                                    <MultiSelect
+                                        id="difficulties"
                                         v-model="
-                                            formData.proposed_changes.difficulty
+                                            formData.proposed_changes.difficulties
                                         "
                                         @blur="
                                             validateField(
@@ -369,10 +369,10 @@ const submit = async () => {
                                         class="mt-2"
                                         :message="
                                             errors[
-                                                'proposed_changes.difficulty'
+                                                'proposed_changes.difficulties'
                                             ] ||
                                             formData.errors[
-                                                'proposed_changes.difficulty'
+                                                'proposed_changes.difficulties'
                                             ]
                                         "
                                     />
diff --git a/resources/js/Pages/ResourceEdits/Show.vue b/resources/js/Pages/ResourceEdits/Show.vue
index b95b5bce..c03d1e34 100644
--- a/resources/js/Pages/ResourceEdits/Show.vue
+++ b/resources/js/Pages/ResourceEdits/Show.vue
@@ -10,7 +10,7 @@ import Tag from "primevue/tag";
 import TabView from "primevue/tabview";
 import TabPanel from "primevue/tabpanel";
 
-// Component mapping for the Unified Diff view
+// Component mapping for the Difference (Diff) view
 import TextDiffViewer from "@/Components/Diff/TextDiffViewer.vue";
 import SelectDiffViewer from "@/Components/Diff/SelectDiffViewer.vue";
 import TagDiffViewer from "@/Components/Diff/TagDiffViewer.vue";
@@ -36,10 +36,10 @@ const fieldConfig = {
     name: { label: "Name", component: TextDiffViewer },
     description: { label: "Description", component: TextDiffViewer },
     page_url: { label: "URL", component: TextDiffViewer },
-    difficulty: {
+    difficulties: {
         label: "Difficulty",
         formatter: getDifficultyLabel,
-        component: SelectDiffViewer,
+        component: TagDiffViewer,
     },
     pricing: {
         label: "Pricing",
@@ -313,9 +313,9 @@ const hasChanges = computed(() => changedFields.value.length > 0);
                             </div>
                         </TabPanel>
 
-                        <!-- Unified Diff Tab -->
+                        <!-- Diff Tab -->
                         <TabPanel
-                            header="Unified Diff"
+                            header="View Differences"
                             class="custom-tab-panel"
                         >
                             <div v-if="hasChanges" class="space-y-6">
diff --git a/resources/js/Pages/Resources/Create.vue b/resources/js/Pages/Resources/Create.vue
index 3d788e24..5111a2a0 100644
--- a/resources/js/Pages/Resources/Create.vue
+++ b/resources/js/Pages/Resources/Create.vue
@@ -33,7 +33,7 @@ const formData = reactive({
     page_url: "",
     image_file: null,
     pricing: "",
-    difficulty: "",
+    difficulty: [],
     description: "",
     topic_tags: [],
     programming_language_tags: [],
diff --git a/resources/js/Pages/Resources/Form/MandatoryFields.vue b/resources/js/Pages/Resources/Form/MandatoryFields.vue
index 6c9a138c..0e34f3d3 100644
--- a/resources/js/Pages/Resources/Form/MandatoryFields.vue
+++ b/resources/js/Pages/Resources/Form/MandatoryFields.vue
@@ -162,7 +162,7 @@ watch(
                     >Difficulty
                     <span class="text-red-500"> * </span>
                 </label>
-                <Select
+                <MultiSelect
                     v-model="props.formData.difficulty"
                     :options="difficultiesObject"
                     option-label="label"
diff --git a/tests/Feature/CommentsTest.php b/tests/Feature/CommentsTest.php
index 114e8af4..be01820d 100644
--- a/tests/Feature/CommentsTest.php
+++ b/tests/Feature/CommentsTest.php
@@ -9,7 +9,7 @@
 use App\Services\ModelResolverService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\Feature\Utils\TestingUtils;
-use Tests\RequestFactories\Comment\StoreCommentRequestFactory;
+use Tests\RequestFactories\StoreCommentRequestFactory;
 use Tests\TestCase;
 
 class CommentsTest extends TestCase
diff --git a/tests/Feature/ComputerScienceResourceFilterTest.php b/tests/Feature/ComputerScienceResourceFilterTest.php
index 2399e5ee..cc3e4e81 100644
--- a/tests/Feature/ComputerScienceResourceFilterTest.php
+++ b/tests/Feature/ComputerScienceResourceFilterTest.php
@@ -13,7 +13,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\Test;
 use Tests\Feature\Utils\TestingUtils;
-use Tests\RequestFactories\ComputerScienceResource\StoreResourceRequestFactory;
+use Tests\RequestFactories\StoreResourceRequestFactory;
 use Tests\TestCase;
 use Throwable;
 
@@ -53,7 +53,7 @@ public static function invalidFieldProvider(): array
             'platforms not array' => ['platforms', 'not-an-array'],
             'platforms item invalid' => ['platforms', ['invalid_platform']],
             'platforms not distinct' => ['platforms', ['web', 'web']],
-            'difficulty invalid' => ['difficulty', 'super-hard'],
+            'difficulty invalid' => ['difficulties', ['super-hard']],
             'pricing invalid' => ['pricing', 'expensive'],
             'topics item too long' => ['topics_tags', ['a', str_repeat('b', 51), 'c']],
             'topics not distinct' => ['topics_tags', ['a', 'a', 'a']],
@@ -104,7 +104,7 @@ public static function filterProvider(): array
             'by platforms' => [['platforms' => ['website', 'bootcamp']]],
 
             'by difficulty & pricing' => [[
-                'difficulty' => ['advanced'],
+                'difficulties' => ['advanced'],
                 'pricing' => ['free'],
             ]],
 
@@ -140,7 +140,7 @@ public static function filterProvider(): array
                 'name' => 'Graph',
                 'description' => 'algorithm analysis',
                 'platforms' => ['podcast', 'website'],
-                'difficulty' => ['introduction'],
+                'difficulties' => ['introduction'],
                 'pricing' => ['free'],
                 'topics_tags' => ['algorithms', 'recursion', 'data-structures'],
                 'programming_languages_tags' => ['python'],
@@ -198,8 +198,8 @@ public function test_apply_filters(array $filters)
         }
 
         // Difficulty
-        if (! empty($filters['difficulty'])) {
-            foreach ($filters['difficulty'] as $difficulty) {
+        if (! empty($filters['difficulties'])) {
+            foreach ($filters['difficulties'] as $difficulty) {
                 $this->assertContains($difficulty, $bindings);
             }
         }
diff --git a/tests/Feature/ComputerScienceResourceTest.php b/tests/Feature/ComputerScienceResourceTest.php
index 8030391a..5535df05 100644
--- a/tests/Feature/ComputerScienceResourceTest.php
+++ b/tests/Feature/ComputerScienceResourceTest.php
@@ -12,7 +12,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\Test;
 use Tests\Feature\Utils\TestingUtils;
-use Tests\RequestFactories\ComputerScienceResource\StoreResourceRequestFactory;
+use Tests\RequestFactories\StoreResourceRequestFactory;
 use Tests\TestCase;
 
 class ComputerScienceResourceTest extends TestCase
@@ -82,7 +82,7 @@ public static function invalidFieldProvider(): array
             'description too long' => ['description', str_repeat('a', 10001)],
             'invalid platform' => ['platforms', ['invalid_platform']],
             'invalid page_url' => ['page_url', 'not-a-url'],
-            'invalid difficulty' => ['difficulty', 'invalid_difficulty'],
+            'invalid difficulty' => ['difficulties', 'invalid_difficulty'],
             'invalid pricing' => ['pricing', 'invalid_pricing'],
             'too few topic_tags' => ['topic_tags', ['tag1']],
             'invalid image_file' => ['image_file', 'not-an-image'],
diff --git a/tests/Feature/ResourceEditsTest.php b/tests/Feature/ResourceEditsTest.php
index 52cdd038..278cca30 100644
--- a/tests/Feature/ResourceEditsTest.php
+++ b/tests/Feature/ResourceEditsTest.php
@@ -13,7 +13,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use Storage;
 use Tests\Feature\Utils\TestingUtils;
-use Tests\RequestFactories\ResourceEdit\StoreResourceEditFactory;
+use Tests\RequestFactories\StoreResourceEditRequestFactory;
 use Tests\TestCase;
 
 class ResourceEditsTest extends TestCase
@@ -38,7 +38,7 @@ public static function invalidResourceEditDataProvider(): array
             'description too long' => ['description', str_repeat('a', 10001)],
             'invalid platform' => ['platforms', ['invalid_platform']],
             'invalid page_url' => ['page_url', 'not-a-url'],
-            'invalid difficulty' => ['difficulty', 'invalid_difficulty'],
+            'invalid difficulty' => ['difficulties', 'invalid_difficulty'],
             'invalid pricing' => ['pricing', 'invalid_pricing'],
             'topic_tags too few' => ['topic_tags', ['tag1']],
             'invalid image_file' => ['image_file', 'not-a-file'],
@@ -57,7 +57,7 @@ public function test_cannot_post_resource_with_invalid_fields(string $field, mix
 
         $resource = ComputerScienceResource::factory()->create();
 
-        $editData = StoreResourceEditFactory::new()->create();
+        $editData = StoreResourceEditRequestFactory::new()->create();
         $editData['proposed_changes'][$field] = $invalidValue;
 
         $response = $this->postJson(route('resource_edits.store', [
@@ -102,7 +102,7 @@ public function test_cannot_post_resource_edit_with_no_changes(): void
 
             $editData['proposed_changes']['page_url'] = $resource->page_url;
             $editData['proposed_changes']['platforms'] = $resource->platforms;
-            $editData['proposed_changes']['difficulty'] = $resource->difficulty;
+            $editData['proposed_changes']['difficulties'] = $resource->difficulties;
             $editData['proposed_changes']['pricing'] = $resource->pricing;
             $editData['proposed_changes']['topic_tags'] = $resource->topic_tags;
             $editData['proposed_changes']['programming_language_tags'] = $resource->programming_language_tags;
@@ -125,7 +125,7 @@ public function test_can_post_valid_resource_edit(): void
         $resource = ComputerScienceResource::factory()->create();
 
         // Create valid edit payload and change at least one attribute.
-        $editData = StoreResourceEditFactory::new()->create();
+        $editData = StoreResourceEditRequestFactory::new()->create();
         $editData['proposed_changes']['name'] = $resource->name.' Updated';
 
         $response = $this->post(route('resource_edits.store', $resource), $editData);
@@ -157,7 +157,7 @@ public function test_merged_edit_reflects_changes_on_original_resource(): void
                 'description' => "Resource Description Changed {$i}",
                 'image_file' => UploadedFile::fake()->image("resource_{$i}.jpg"),
                 'page_url' => "http://{$i}.com",
-                'difficulty' => fake()->randomElement(config('computerScienceResource.difficulties')),
+                'difficulties' => fake()->randomElements(config('computerScienceResource.difficulties'), rand(1, 3)),
                 'platforms' => fake()->randomElements(config('computerScienceResource.platforms'), fake()->numberBetween(1, 3)),
                 'pricing' => fake()->randomElement(config('computerScienceResource.pricings')),
                 'topic_tags' => ["$i-a", "$i-b", "$i-c"],
@@ -180,7 +180,7 @@ public function test_merged_edit_reflects_changes_on_original_resource(): void
             $oldImagePath = $resource->image_path;
 
             $this->assertEquals($changes['page_url'], $resource->page_url);
-            $this->assertEquals($changes['difficulty'], $resource->difficulty);
+            $this->assertEquals($changes['difficulties'], $resource->difficulties);
             $this->assertEquals($changes['pricing'], $resource->pricing);
 
             // Arrays
diff --git a/tests/Feature/ResourceReviewsTest.php b/tests/Feature/ResourceReviewsTest.php
index 506db870..e61a6deb 100644
--- a/tests/Feature/ResourceReviewsTest.php
+++ b/tests/Feature/ResourceReviewsTest.php
@@ -7,7 +7,7 @@
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
-use Tests\RequestFactories\ResourceReview\StoreResourceReviewFactory;
+use Tests\RequestFactories\StoreResourceReviewRequestFactory;
 use Tests\TestCase;
 
 class ResourceReviewsTest extends TestCase
@@ -49,7 +49,7 @@ public function test_invalid_data_missing_required_fields(string $field, mixed $
         $user = User::factory()->create();
         $resource = ComputerScienceResource::factory()->create();
 
-        $invalidData = StoreResourceReviewFactory::new()->create([$field => $invalidValue]);
+        $invalidData = StoreResourceReviewRequestFactory::new()->create([$field => $invalidValue]);
 
         $response = $this->actingAs($user)
             ->postJson(route('reviews.store', $resource), $invalidData);
@@ -61,7 +61,7 @@ public function test_resource_review_can_be_posted(): void
         $user = User::factory()->create();
         $resource = ComputerScienceResource::factory()->create();
 
-        $data = StoreResourceReviewFactory::new()->create();
+        $data = StoreResourceReviewRequestFactory::new()->create();
 
         $this->actingAs($user)
             ->post(route('reviews.store', $resource), $data);
@@ -77,7 +77,7 @@ public function test_resource_review_cannot_be_posted_twice(): void
         $user = User::factory()->create();
         $resource = ComputerScienceResource::factory()->create();
 
-        $data1 = StoreResourceReviewFactory::new()->create();
+        $data1 = StoreResourceReviewRequestFactory::new()->create();
         $this->actingAs($user)
             ->post(route('reviews.store', $resource), $data1);
 
@@ -86,7 +86,7 @@ public function test_resource_review_cannot_be_posted_twice(): void
             'title' => $data1['title'],
         ]);
 
-        $data2 = StoreResourceReviewFactory::new()->create();
+        $data2 = StoreResourceReviewRequestFactory::new()->create();
         $this->actingAs($user)
             ->post(route('reviews.store', $resource), $data2);
 
@@ -101,7 +101,7 @@ public function test_resource_average_has_changed(): void
         $user = User::factory()->create();
         $resource = ComputerScienceResource::factory()->create();
 
-        $data = StoreResourceReviewFactory::new()->create();
+        $data = StoreResourceReviewRequestFactory::new()->create();
 
         $this->actingAs($user)
             ->post(route('reviews.store', $resource), $data);
@@ -134,7 +134,7 @@ public function test_resource_review_average_updates_correctly(): void
 
         for ($i = 0; $i < $reviewCount; $i++) {
             $user = User::factory()->create();
-            $data = StoreResourceReviewFactory::new()->create();
+            $data = StoreResourceReviewRequestFactory::new()->create();
 
             // Add to total for averaging later
             foreach (array_keys($total) as $key) {
@@ -166,7 +166,7 @@ public function test_resource_review_can_be_updated(): void
         ];
 
         foreach ($users as $user) {
-            $data = StoreResourceReviewFactory::new()->create();
+            $data = StoreResourceReviewRequestFactory::new()->create();
             foreach (array_keys($total) as $key) {
                 $total[$key] += $data[$key];
             }
@@ -189,7 +189,7 @@ public function test_resource_review_can_be_updated(): void
 
         foreach ($users as $user) {
             // Update to new review
-            $newData = StoreResourceReviewFactory::new()->create();
+            $newData = StoreResourceReviewRequestFactory::new()->create();
             foreach (array_keys($total) as $key) {
                 $total[$key] += $newData[$key];
             }
diff --git a/tests/Feature/TagSearchTest.php b/tests/Feature/TagSearchTest.php
index 40867488..079f83e8 100644
--- a/tests/Feature/TagSearchTest.php
+++ b/tests/Feature/TagSearchTest.php
@@ -11,7 +11,7 @@
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Mockery;
 use Tests\Feature\Utils\TestingUtils;
-use Tests\RequestFactories\ComputerScienceResource\StoreResourceRequestFactory;
+use Tests\RequestFactories\StoreResourceRequestFactory;
 use Tests\TestCase;
 
 class TagSearchTest extends TestCase
diff --git a/tests/Feature/Utils/TestingUtils.php b/tests/Feature/Utils/TestingUtils.php
index 8ecdc41b..3932a040 100644
--- a/tests/Feature/Utils/TestingUtils.php
+++ b/tests/Feature/Utils/TestingUtils.php
@@ -9,10 +9,10 @@
 use App\Services\ResourceEditsService;
 use Mockery;
 use Mockery\MockInterface;
-use Tests\RequestFactories\Comment\StoreCommentRequestFactory;
-use Tests\RequestFactories\ComputerScienceResource\StoreResourceRequestFactory;
-use Tests\RequestFactories\ResourceEdit\StoreResourceEditFactory;
-use Tests\RequestFactories\ResourceReview\StoreResourceReviewFactory;
+use Tests\RequestFactories\StoreCommentRequestFactory;
+use Tests\RequestFactories\StoreResourceEditRequestFactory;
+use Tests\RequestFactories\StoreResourceRequestFactory;
+use Tests\RequestFactories\StoreResourceReviewRequestFactory;
 
 trait TestingUtils
 {
@@ -32,7 +32,7 @@ public function createReview(int $id, array $overrides = [], bool $newUser = fal
             $this->actingAs($user);
         }
 
-        $reviewForm = StoreResourceReviewFactory::new()->create($overrides);
+        $reviewForm = StoreResourceReviewRequestFactory::new()->create($overrides);
         $response = $this->post(route('reviews.store', $id), $reviewForm);
         $response->assertStatus(200); // Success
 
@@ -47,7 +47,7 @@ public function makeAndApplyResourceEdits($resourceId, $changes = [])
 
     public function createResourceEdit($resourceId, $changes = []): ResourceEdits
     {
-        $editData = StoreResourceEditFactory::new()->create();
+        $editData = StoreResourceEditRequestFactory::new()->create();
         if (! empty($changes)) {
             $editData['proposed_changes'] = array_merge($editData['proposed_changes'], $changes);
         }
diff --git a/tests/RequestFactories/Comment/StoreCommentRequestFactory.php b/tests/RequestFactories/StoreCommentRequestFactory.php
similarity index 91%
rename from tests/RequestFactories/Comment/StoreCommentRequestFactory.php
rename to tests/RequestFactories/StoreCommentRequestFactory.php
index 752eb4e6..1a215166 100644
--- a/tests/RequestFactories/Comment/StoreCommentRequestFactory.php
+++ b/tests/RequestFactories/StoreCommentRequestFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\RequestFactories\Comment;
+namespace Tests\RequestFactories;
 
 use App\Models\ComputerScienceResource;
 use Worksome\RequestFactories\RequestFactory;
diff --git a/tests/RequestFactories/ResourceEdit/StoreResourceEditFactory.php b/tests/RequestFactories/StoreResourceEditRequestFactory.php
similarity index 93%
rename from tests/RequestFactories/ResourceEdit/StoreResourceEditFactory.php
rename to tests/RequestFactories/StoreResourceEditRequestFactory.php
index 81776f05..8862b8cb 100644
--- a/tests/RequestFactories/ResourceEdit/StoreResourceEditFactory.php
+++ b/tests/RequestFactories/StoreResourceEditRequestFactory.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\RequestFactories\ResourceEdit;
+namespace Tests\RequestFactories;
 
 use Worksome\RequestFactories\RequestFactory;
 
-class StoreResourceEditFactory extends RequestFactory
+class StoreResourceEditRequestFactory extends RequestFactory
 {
     public function definition(): array
     {
@@ -35,7 +35,7 @@ public function definition(): array
             'image_path' => 'https://cdn.iconscout.com/icon/free/png-256/free-leetcode-logo-icon-download-in-svg-png-gif-file-formats--technology-social-media-company-vol-1-pack-logos-icons-3030025.png',
             'page_url' => $this->faker->url(),
             'platforms' => $this->faker->randomElements($platforms, rand(1, 3)),
-            'difficulty' => $this->faker->randomElement($difficulties),
+            'difficulties' => $this->faker->randomElements($difficulties, rand(1, 3)),
             'pricing' => $this->faker->randomElement($pricings),
             'topic_tags' => array_values($topicTags),
             'programming_language_tags' => array_values($programmingLanguageTags),
diff --git a/tests/RequestFactories/ComputerScienceResource/StoreResourceRequestFactory.php b/tests/RequestFactories/StoreResourceRequestFactory.php
similarity index 90%
rename from tests/RequestFactories/ComputerScienceResource/StoreResourceRequestFactory.php
rename to tests/RequestFactories/StoreResourceRequestFactory.php
index 82298e4c..8d5a0165 100644
--- a/tests/RequestFactories/ComputerScienceResource/StoreResourceRequestFactory.php
+++ b/tests/RequestFactories/StoreResourceRequestFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\RequestFactories\ComputerScienceResource;
+namespace Tests\RequestFactories;
 
 use Worksome\RequestFactories\RequestFactory;
 
@@ -22,7 +22,7 @@ public function definition(): array
             'description' => fake()->realText(),
             'page_url' => fake()->url(),
             'platforms' => fake()->randomElements($platforms, rand(1, 3)),
-            'difficulty' => fake()->randomElement($difficulties),
+            'difficulties' => fake()->randomElements($difficulties, rand(1, 3)),
             'pricing' => fake()->randomElement($pricings),
             'topic_tags' => array_values($topicTags),
             'programming_language_tags' => array_unique($this->faker->words(mt_rand(1, 5))),
diff --git a/tests/RequestFactories/ResourceReview/StoreResourceReviewFactory.php b/tests/RequestFactories/StoreResourceReviewRequestFactory.php
similarity index 87%
rename from tests/RequestFactories/ResourceReview/StoreResourceReviewFactory.php
rename to tests/RequestFactories/StoreResourceReviewRequestFactory.php
index e0ec34a7..d8807fbc 100644
--- a/tests/RequestFactories/ResourceReview/StoreResourceReviewFactory.php
+++ b/tests/RequestFactories/StoreResourceReviewRequestFactory.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\RequestFactories\ResourceReview;
+namespace Tests\RequestFactories;
 
 use Worksome\RequestFactories\RequestFactory;
 
-class StoreResourceReviewFactory extends RequestFactory
+class StoreResourceReviewRequestFactory extends RequestFactory
 {
     public function definition(): array
     {