diff --git a/app/Http/Controllers/Api/V1/Admin/AdminHouseholdController.php b/app/Http/Controllers/Api/V1/Admin/AdminHouseholdController.php
index 9481e1f..37d533c 100644
--- a/app/Http/Controllers/Api/V1/Admin/AdminHouseholdController.php
+++ b/app/Http/Controllers/Api/V1/Admin/AdminHouseholdController.php
@@ -142,6 +142,11 @@ class AdminHouseholdController extends ApiController
             }
         }
 
+        if (! $tenantId) {
+            // Fall back to the first available Tenant in the database to prevent blocking super-admins
+            $tenantId = Tenant::value('id');
+        }
+
         if (! $tenantId) {
             return $this->fail('Could not resolve LGU/Tenant context for the selected Barangay.', null, 400);
         }
@@ -264,9 +269,11 @@ class AdminHouseholdController extends ApiController
         $data = $request->validated();
 
         if (! empty($data['user_id'])) {
-            $isMember = HouseholdMember::where('user_id', $data['user_id'])->exists();
-            if ($isMember) {
-                return $this->fail('The selected resident already belongs to a household.', ['user_id' => ['already_member']], 422);
+            $isMemberOfCurrent = HouseholdMember::where('user_id', $data['user_id'])
+                ->where('household_id', $household->id)
+                ->exists();
+            if ($isMemberOfCurrent) {
+                return $this->fail('The selected resident already belongs to this household.', ['user_id' => ['already_member_here']], 422);
             }
 
             $user = User::findOrFail($data['user_id']);
@@ -282,22 +289,61 @@ class AdminHouseholdController extends ApiController
             }
         }
 
-        $member = HouseholdMember::create([
-            'household_id' => $household->id,
-            'user_id' => $data['user_id'] ?? null,
-            'relationship' => $data['relationship'],
-            'full_name' => $fullName,
-            'date_of_birth' => $data['date_of_birth'] ?? null,
-        ]);
+        $member = DB::transaction(function () use ($data, $household, $fullName) {
+            if (! empty($data['user_id'])) {
+                // Find all existing memberships of this user
+                $existingMemberships = HouseholdMember::where('user_id', $data['user_id'])->get();
 
-        if ($data['relationship'] === HouseholdMember::RELATIONSHIP_HEAD && ! empty($data['user_id'])) {
-            $household->update(['head_user_id' => $data['user_id']]);
-        }
+                foreach ($existingMemberships as $oldMember) {
+                    $oldHousehold = $oldMember->household;
+                    if ($oldHousehold) {
+                        // Delete the old membership
+                        $oldMember->delete();
 
-        $currentMemberCount = $household->members()->count();
-        if ($household->household_size < $currentMemberCount) {
-            $household->update(['household_size' => $currentMemberCount]);
-        }
+                        // If they were the head of that old household
+                        if ($oldHousehold->head_user_id == $data['user_id']) {
+                            $otherMembers = $oldHousehold->members()->where('user_id', '!=', $data['user_id'])->get();
+                            if ($otherMembers->isEmpty()) {
+                                // Delete empty household
+                                $oldHousehold->delete();
+                            } else {
+                                // Reassign head to next available member
+                                $nextHead = $otherMembers->first();
+                                $oldHousehold->update([
+                                    'head_user_id' => $nextHead->user_id,
+                                ]);
+                                $nextHead->update([
+                                    'relationship' => HouseholdMember::RELATIONSHIP_HEAD,
+                                ]);
+                            }
+                        } else {
+                            if ($oldHousehold->members()->count() === 0) {
+                                $oldHousehold->delete();
+                            }
+                        }
+                    }
+                }
+            }
+
+            $m = HouseholdMember::create([
+                'household_id' => $household->id,
+                'user_id' => $data['user_id'] ?? null,
+                'relationship' => $data['relationship'],
+                'full_name' => $fullName,
+                'date_of_birth' => $data['date_of_birth'] ?? null,
+            ]);
+
+            if ($data['relationship'] === HouseholdMember::RELATIONSHIP_HEAD && ! empty($data['user_id'])) {
+                $household->update(['head_user_id' => $data['user_id']]);
+            }
+
+            $currentMemberCount = $household->members()->count();
+            if ($household->household_size < $currentMemberCount) {
+                $household->update(['household_size' => $currentMemberCount]);
+            }
+
+            return $m;
+        });
 
         $household->load(['head', 'barangay', 'members.user', 'assignedDropOffPoint'])->loadCount('members');
 
diff --git a/app/Http/Controllers/Api/V1/Admin/AdminQrBatchController.php b/app/Http/Controllers/Api/V1/Admin/AdminQrBatchController.php
index 0e107fa..51b61f5 100644
--- a/app/Http/Controllers/Api/V1/Admin/AdminQrBatchController.php
+++ b/app/Http/Controllers/Api/V1/Admin/AdminQrBatchController.php
@@ -28,7 +28,7 @@ class AdminQrBatchController extends ApiController
     {
         $request->validate([
             'purpose' => ['nullable', 'in:free_allocation,store_inventory,promotional'],
-            'target_area_id' => ['nullable', 'integer'],
+            'household_id' => ['nullable', 'integer'],
             'q' => ['nullable', 'string', 'max:100'],
             'per_page' => ['nullable', 'integer', 'min:1', 'max:500'],
         ]);
@@ -36,12 +36,12 @@ class AdminQrBatchController extends ApiController
         $perPage = (int) $request->input('per_page', 25);
 
         $batches = QrCodeBatch::query()
-            ->with(['targetArea', 'createdBy'])
+            ->with(['household.head', 'createdBy'])
             ->withCount('codes')
             ->when($request->filled('purpose'), fn ($q) => $q->where('purpose', $request->string('purpose')))
             ->when(
-                $request->filled('target_area_id'),
-                fn ($q) => $q->where('target_area_id', $request->integer('target_area_id')),
+                $request->filled('household_id'),
+                fn ($q) => $q->where('household_id', $request->integer('household_id')),
             )
             ->when(
                 $request->filled('q'),
@@ -65,28 +65,27 @@ class AdminQrBatchController extends ApiController
     public function store(GenerateBatchRequest $request, BatchGenerator $generator): JsonResponse
     {
         $data = $request->validated();
-        $area = isset($data['target_area_id'])
-            ? ServiceArea::where('uuid', $data['target_area_id'])->first()
-            : null;
+        $household = Household::where('uuid', $data['household_id'])->firstOrFail();
 
         $batch = $generator->generate(
             quantity: (int) $data['quantity'],
             purpose: $data['purpose'],
-            targetArea: $area,
+            targetArea: null,
             targetStoreId: $data['target_store_id'] ?? null,
             createdBy: $request->user(),
             expiresAt: isset($data['expires_at']) ? Carbon::parse($data['expires_at']) : null,
             notes: $data['notes'] ?? null,
+            householdId: $household->id,
         );
 
-        $batch->load(['targetArea', 'createdBy', 'codes']);
+        $batch->load(['household.head', 'createdBy', 'codes']);
 
         return $this->created(new QrCodeBatchResource($batch), 'Batch generated');
     }
 
     public function show(QrCodeBatch $qrCodeBatch): JsonResponse
     {
-        $qrCodeBatch->load(['targetArea', 'createdBy', 'codes']);
+        $qrCodeBatch->load(['household.head', 'createdBy', 'codes']);
 
         return $this->ok(new QrCodeBatchResource($qrCodeBatch));
     }
diff --git a/app/Http/Controllers/Api/V1/Admin/AdminTeamController.php b/app/Http/Controllers/Api/V1/Admin/AdminTeamController.php
index 99de8b0..4a6c2f3 100644
--- a/app/Http/Controllers/Api/V1/Admin/AdminTeamController.php
+++ b/app/Http/Controllers/Api/V1/Admin/AdminTeamController.php
@@ -7,6 +7,7 @@ use App\Http\Requests\Team\StoreCollectionTeamRequest;
 use App\Http\Resources\CollectionTeamResource;
 use App\Models\CollectionTeam;
 use App\Models\TeamMember;
+use App\Models\User;
 use App\Services\Team\TeamConflictDetector;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -49,9 +50,20 @@ class AdminTeamController extends ApiController
     public function store(StoreCollectionTeamRequest $request): JsonResponse
     {
         $data = $request->validated();
-        $helperIds = $data['helper_ids'] ?? [];
         $override = (bool) ($data['override_conflicts'] ?? false);
-        unset($data['helper_ids'], $data['override_conflicts']);
+        
+        if (! isset($data['helper_count']) && isset($data['helper_ids'])) {
+            $data['helper_count'] = count($data['helper_ids']);
+            $data['helper_assignment_mode'] = 'manual';
+        }
+
+        $helperIds = $this->resolveHelpers($data);
+        $expectedCount = (int) ($data['helper_count'] ?? 0);
+        if ($expectedCount > 0 && count($helperIds) < $expectedCount) {
+            return $this->fail('Not enough available helpers found.', [
+                'helper_count' => ['Only ' . count($helperIds) . ' available helper(s) found.']
+            ], 422);
+        }
 
         if (! $override) {
             $conflicts = $this->conflicts->check(
@@ -65,6 +77,8 @@ class AdminTeamController extends ApiController
             }
         }
 
+        unset($data['helper_ids'], $data['override_conflicts'], $data['helper_count'], $data['helper_assignment_mode']);
+
         $team = DB::transaction(function () use ($data, $helperIds) {
             $team = CollectionTeam::create($data);
 
@@ -99,16 +113,29 @@ class AdminTeamController extends ApiController
     public function update(StoreCollectionTeamRequest $request, CollectionTeam $team): JsonResponse
     {
         $data = $request->validated();
-        $helperIds = $data['helper_ids'] ?? null;
         $override = (bool) ($data['override_conflicts'] ?? false);
-        unset($data['helper_ids'], $data['override_conflicts']);
+
+        $helperIds = null;
+        if (array_key_exists('helper_count', $data) || array_key_exists('helper_ids', $data)) {
+            if (! isset($data['helper_count']) && isset($data['helper_ids'])) {
+                $data['helper_count'] = count($data['helper_ids']);
+                $data['helper_assignment_mode'] = 'manual';
+            }
+            $helperIds = $this->resolveHelpers($data, $team->id);
+            $expectedCount = (int) ($data['helper_count'] ?? 0);
+            if ($expectedCount > 0 && count($helperIds) < $expectedCount) {
+                return $this->fail('Not enough available helpers found.', [
+                    'helper_count' => ['Only ' . count($helperIds) . ' available helper(s) found.']
+                ], 422);
+            }
+        }
 
         if (! $override) {
             $conflicts = $this->conflicts->check(
                 $data['driver_id'] ?? $team->driver_id,
                 $data['scanner_id'] ?? $team->scanner_id,
                 $data['truck_id'] ?? $team->truck_id,
-                $helperIds ?? [],
+                $helperIds ?? $team->helpers()->pluck('user_id')->toArray(),
                 $team->id,
             );
             if (! empty($conflicts)) {
@@ -116,6 +143,8 @@ class AdminTeamController extends ApiController
             }
         }
 
+        unset($data['helper_ids'], $data['override_conflicts'], $data['helper_count'], $data['helper_assignment_mode']);
+
         DB::transaction(function () use ($team, $data, $helperIds) {
             $team->update($data);
 
@@ -141,6 +170,40 @@ class AdminTeamController extends ApiController
         );
     }
 
+    protected function resolveHelpers(array $data, ?int $excludeTeamId = null): array
+    {
+        $mode = $data['helper_assignment_mode'] ?? 'manual';
+        $count = (int) ($data['helper_count'] ?? 0);
+
+        if ($count <= 0) {
+            return [];
+        }
+
+        if ($mode === 'manual') {
+            return $data['helper_ids'] ?? [];
+        }
+
+        $override = (bool) ($data['override_conflicts'] ?? false);
+        $query = User::where('role', User::ROLE_HELPER)->where('status', User::STATUS_ACTIVE);
+
+        if (! $override) {
+            $today = now()->toDateString();
+            $assignedHelperIds = TeamMember::query()
+                ->where('role_in_team', TeamMember::ROLE_HELPER)
+                ->whereDate('assigned_from', '<=', $today)
+                ->where(function ($q) use ($today) {
+                    $q->whereNull('assigned_until')->orWhereDate('assigned_until', '>=', $today);
+                })
+                ->when($excludeTeamId, fn ($q, $id) => $q->where('team_id', '!=', $id))
+                ->pluck('user_id')
+                ->toArray();
+
+            $query->whereNotIn('id', $assignedHelperIds);
+        }
+
+        return $query->inRandomOrder()->take($count)->pluck('id')->toArray();
+    }
+
     public function destroy(CollectionTeam $team): JsonResponse
     {
         $team->delete();
diff --git a/app/Http/Controllers/Api/V1/Admin/AdminUserController.php b/app/Http/Controllers/Api/V1/Admin/AdminUserController.php
index 0683d15..cd60323 100644
--- a/app/Http/Controllers/Api/V1/Admin/AdminUserController.php
+++ b/app/Http/Controllers/Api/V1/Admin/AdminUserController.php
@@ -6,10 +6,14 @@ use App\Http\Controllers\Api\V1\ApiController;
 use App\Http\Requests\Admin\RejectProfileRequest;
 use App\Http\Requests\Admin\UpdateUserRequest;
 use App\Http\Resources\UserDetailResource;
+use App\Http\Resources\HouseholdResource;
 use App\Models\User;
+use App\Models\Household;
+use App\Models\HouseholdMember;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
+use Illuminate\Support\Facades\DB;
 
 class AdminUserController extends ApiController
 {
@@ -110,6 +114,19 @@ class AdminUserController extends ApiController
 
     public function activate(User $user): JsonResponse
     {
+        if ($user->role === User::ROLE_RESIDENT) {
+            if (! auth()->user()->isSuperAdmin()) {
+                return $this->forbidden('Only Super Admins can activate or approve resident profiles');
+            }
+
+            $householdMember = \App\Models\HouseholdMember::where('user_id', $user->id)->first();
+            $household = $householdMember ? $householdMember->household : $user->headedHousehold;
+
+            if (! $household || ! $household->coordinates) {
+                return $this->fail('Resident household must have coordinates pinned before activation', null, 422);
+            }
+        }
+
         $user->forceFill(['status' => User::STATUS_ACTIVE])->save();
 
         return $this->ok(new UserDetailResource($user->fresh()), 'User activated');
@@ -134,6 +151,19 @@ class AdminUserController extends ApiController
             return $this->fail('User has no verifiable profile', null, 422);
         }
 
+        if ($user->role === User::ROLE_RESIDENT) {
+            if (! auth()->user()->isSuperAdmin()) {
+                return $this->forbidden('Only Super Admins can activate or approve resident profiles');
+            }
+
+            $householdMember = \App\Models\HouseholdMember::where('user_id', $user->id)->first();
+            $household = $householdMember ? $householdMember->household : $user->headedHousehold;
+
+            if (! $household || ! $household->coordinates) {
+                return $this->fail('Resident household must have coordinates pinned before activation', null, 422);
+            }
+        }
+
         $profile->markVerified($request->user());
         $user->forceFill(['status' => User::STATUS_ACTIVE])->save();
 
@@ -152,4 +182,113 @@ class AdminUserController extends ApiController
 
         return $this->ok(new UserDetailResource($user->fresh()->load($user->profileRelation())), 'Profile rejected');
     }
+
+    public function groupIntoHousehold(Request $request, User $user): JsonResponse
+    {
+        if ($user->role !== User::ROLE_RESIDENT) {
+            return $this->fail('Only Resident users can be grouped into households', null, 422);
+        }
+
+        $data = $request->validate([
+            'household_id' => ['nullable', 'integer', 'exists:households,id'],
+            // If household_id is null, require new household details:
+            'address_line' => ['required_without:household_id', 'nullable', 'string', 'max:255'],
+            'barangay_id' => ['required_without:household_id', 'nullable', 'integer', 'exists:barangays,id'],
+            'lat' => ['required_without:household_id', 'nullable', 'numeric', 'between:-90,90'],
+            'lng' => ['required_without:household_id', 'nullable', 'numeric', 'between:-180,180'],
+            'household_size' => ['nullable', 'integer', 'min:1', 'max:50'],
+        ]);
+
+        if (! empty($data['household_id'])) {
+            $isMemberOfCurrent = HouseholdMember::where('user_id', $user->id)
+                ->where('household_id', $data['household_id'])
+                ->exists();
+            if ($isMemberOfCurrent) {
+                return $this->fail('Resident already belongs to this household.', null, 422);
+            }
+        }
+
+        $household = DB::transaction(function () use ($data, $user) {
+            // Find all existing memberships of this user
+            $existingMemberships = HouseholdMember::where('user_id', $user->id)->get();
+
+            foreach ($existingMemberships as $oldMember) {
+                $oldHousehold = $oldMember->household;
+                if ($oldHousehold) {
+                    // Delete the old membership
+                    $oldMember->delete();
+
+                    // If they were the head of that old household
+                    if ($oldHousehold->head_user_id == $user->id) {
+                        $otherMembers = $oldHousehold->members()->where('user_id', '!=', $user->id)->get();
+                        if ($otherMembers->isEmpty()) {
+                            // Delete empty household
+                            $oldHousehold->delete();
+                        } else {
+                            // Reassign head to next available member
+                            $nextHead = $otherMembers->first();
+                            $oldHousehold->update([
+                                'head_user_id' => $nextHead->user_id,
+                            ]);
+                            $nextHead->update([
+                                'relationship' => HouseholdMember::RELATIONSHIP_HEAD,
+                            ]);
+                        }
+                    } else {
+                        if ($oldHousehold->members()->count() === 0) {
+                            $oldHousehold->delete();
+                        }
+                    }
+                }
+            }
+
+            if (! empty($data['household_id'])) {
+                $h = Household::findOrFail($data['household_id']);
+                HouseholdMember::create([
+                    'household_id' => $h->id,
+                    'user_id' => $user->id,
+                    'relationship' => HouseholdMember::RELATIONSHIP_OTHER,
+                    'full_name' => $user->full_name,
+                ]);
+
+                $currentMemberCount = $h->members()->count();
+                if ($h->household_size < $currentMemberCount) {
+                    $h->update(['household_size' => $currentMemberCount]);
+                }
+
+                return $h;
+            } else {
+                $point = new \MatanYadaev\EloquentSpatial\Objects\Point((float) $data['lat'], (float) $data['lng'], 4326);
+                $dopFinder = app(\App\Services\DropOff\DropOffPointFinder::class);
+                $nearestDop = $dopFinder->nearest((float) $data['lat'], (float) $data['lng']);
+
+                $h = Household::create([
+                    'tenant_id' => $user->tenant_id,
+                    'head_user_id' => $user->id,
+                    'barangay_id' => $data['barangay_id'],
+                    'address_line' => $data['address_line'],
+                    'coordinates' => $point,
+                    'household_size' => $data['household_size'] ?? 1,
+                    'assigned_drop_off_point_id' => $nearestDop?->id,
+                    'verification_status' => Household::VERIFICATION_PENDING,
+                ]);
+
+                HouseholdMember::create([
+                    'household_id' => $h->id,
+                    'user_id' => $user->id,
+                    'relationship' => HouseholdMember::RELATIONSHIP_HEAD,
+                    'full_name' => $user->full_name,
+                ]);
+
+                return $h;
+            }
+        });
+
+        $user->load(['residentProfile', 'driverProfile', 'helperProfile', 'scannerProfile', 'storePartnerProfile']);
+
+        return $this->ok([
+            'user' => new UserDetailResource($user),
+            'household' => new HouseholdResource($household->load(['head', 'barangay'])),
+        ], 'User successfully grouped into household');
+    }
 }
diff --git a/app/Http/Controllers/Api/V1/Auth/RegisterController.php b/app/Http/Controllers/Api/V1/Auth/RegisterController.php
index 3477149..234413a 100644
--- a/app/Http/Controllers/Api/V1/Auth/RegisterController.php
+++ b/app/Http/Controllers/Api/V1/Auth/RegisterController.php
@@ -8,15 +8,19 @@ use App\Http\Resources\UserResource;
 use App\Models\NotificationPreference;
 use App\Models\OtpCode;
 use App\Models\User;
+use App\Models\Household;
+use App\Models\HouseholdMember;
 use App\Services\Otp\OtpService;
+use App\Services\DropOff\DropOffPointFinder;
 use App\Tenancy\Tenancy;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
+use MatanYadaev\EloquentSpatial\Objects\Point;
 
 class RegisterController extends ApiController
 {
-    public function __invoke(RegisterRequest $request, OtpService $otp): JsonResponse
+    public function __invoke(RegisterRequest $request, OtpService $otp, DropOffPointFinder $dopFinder): JsonResponse
     {
         $data = $request->validated();
 
@@ -27,7 +31,7 @@ class RegisterController extends ApiController
             return $this->fail('Pick your LGU first.', ['tenant' => ['LGU code required']], 400);
         }
 
-        $user = DB::transaction(function () use ($data, $tenant) {
+        $user = DB::transaction(function () use ($data, $tenant, $dopFinder) {
             $user = User::create([
                 'tenant_id' => $tenant->id,
                 'first_name' => $data['first_name'],
@@ -53,6 +57,29 @@ class RegisterController extends ApiController
                 'language' => $data['preferred_language'] ?? 'en',
             ]);
 
+            if ($data['role'] === User::ROLE_RESIDENT) {
+                $point = new Point((float) $data['lat'], (float) $data['lng'], 4326);
+                $nearestDop = $dopFinder->nearest((float) $data['lat'], (float) $data['lng']);
+
+                $household = Household::create([
+                    'tenant_id' => $tenant->id,
+                    'head_user_id' => $user->id,
+                    'barangay_id' => $data['barangay_id'],
+                    'address_line' => $data['address_line'],
+                    'coordinates' => $point,
+                    'household_size' => $data['household_size'] ?? 1,
+                    'assigned_drop_off_point_id' => $nearestDop?->id,
+                    'verification_status' => Household::VERIFICATION_PENDING,
+                ]);
+
+                HouseholdMember::create([
+                    'household_id' => $household->id,
+                    'user_id' => $user->id,
+                    'relationship' => HouseholdMember::RELATIONSHIP_HEAD,
+                    'full_name' => $user->full_name,
+                ]);
+            }
+
             return $user;
         });
 
diff --git a/app/Http/Controllers/Api/V1/Driver/DriverTripController.php b/app/Http/Controllers/Api/V1/Driver/DriverTripController.php
index 58ece8f..504cc0c 100644
--- a/app/Http/Controllers/Api/V1/Driver/DriverTripController.php
+++ b/app/Http/Controllers/Api/V1/Driver/DriverTripController.php
@@ -30,7 +30,7 @@ class DriverTripController extends ApiController
     public function show(Request $request, Trip $trip): JsonResponse
     {
         $this->authorizeDriver($request, $trip);
-        $trip->load(['route', 'team', 'truck', 'dumpsite', 'stops.dropOffPoint', 'timelineEvents.recordedBy']);
+        $trip->load(['route', 'team.driver', 'team.scanner', 'team.helpers.user', 'truck', 'dumpsite', 'stops.dropOffPoint', 'timelineEvents.recordedBy']);
 
         return $this->ok(new TripResource($trip));
     }
diff --git a/app/Http/Controllers/Api/V1/Helper/HelperAssignmentController.php b/app/Http/Controllers/Api/V1/Helper/HelperAssignmentController.php
new file mode 100644
index 0000000..4c00c52
--- /dev/null
+++ b/app/Http/Controllers/Api/V1/Helper/HelperAssignmentController.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Http\Controllers\Api\V1\Helper;
+
+use App\Http\Controllers\Api\V1\ApiController;
+use App\Http\Resources\TeamMemberResource;
+use App\Models\TeamMember;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class HelperAssignmentController extends ApiController
+{
+    public function assignment(Request $request): JsonResponse
+    {
+        $user = $request->user();
+        $today = now()->toDateString();
+
+        $assignment = TeamMember::query()
+            ->where('user_id', $user->id)
+            ->where('role_in_team', TeamMember::ROLE_HELPER)
+            ->whereDate('assigned_from', '<=', $today)
+            ->where(function ($q) use ($today) {
+                $q->whereNull('assigned_until')->orWhereDate('assigned_until', '>=', $today);
+            })
+            ->with(['team.driver', 'team.scanner', 'team.truck', 'team.area'])
+            ->orderBy('id', 'desc')
+            ->first();
+
+        if (! $assignment) {
+            return $this->ok(null, 'No active assignment for today.');
+        }
+
+        return $this->ok(new TeamMemberResource($assignment));
+    }
+
+    public function accept(Request $request): JsonResponse
+    {
+        $user = $request->user();
+        $today = now()->toDateString();
+
+        $assignment = TeamMember::query()
+            ->where('user_id', $user->id)
+            ->where('role_in_team', TeamMember::ROLE_HELPER)
+            ->whereDate('assigned_from', '<=', $today)
+            ->where(function ($q) use ($today) {
+                $q->whereNull('assigned_until')->orWhereDate('assigned_until', '>=', $today);
+            })
+            ->orderBy('id', 'desc')
+            ->first();
+
+        if (! $assignment) {
+            return $this->fail('No active assignment to accept.', null, 404);
+        }
+
+        $assignment->update(['status' => TeamMember::STATUS_ACCEPTED]);
+
+        return $this->ok(new TeamMemberResource($assignment->load(['team.driver', 'team.scanner', 'team.truck', 'team.area'])), 'Assignment accepted.');
+    }
+
+    public function reject(Request $request): JsonResponse
+    {
+        $user = $request->user();
+        $today = now()->toDateString();
+
+        $assignment = TeamMember::query()
+            ->where('user_id', $user->id)
+            ->where('role_in_team', TeamMember::ROLE_HELPER)
+            ->whereDate('assigned_from', '<=', $today)
+            ->where(function ($q) use ($today) {
+                $q->whereNull('assigned_until')->orWhereDate('assigned_until', '>=', $today);
+            })
+            ->orderBy('id', 'desc')
+            ->first();
+
+        if (! $assignment) {
+            return $this->fail('No active assignment to reject.', null, 404);
+        }
+
+        $assignment->update(['status' => TeamMember::STATUS_REJECTED]);
+
+        return $this->ok(new TeamMemberResource($assignment->load(['team.driver', 'team.scanner', 'team.truck', 'team.area'])), 'Assignment rejected.');
+    }
+
+    public function history(Request $request): JsonResponse
+    {
+        $user = $request->user();
+
+        $assignments = TeamMember::query()
+            ->where('user_id', $user->id)
+            ->where('role_in_team', TeamMember::ROLE_HELPER)
+            ->with(['team.driver', 'team.scanner', 'team.truck', 'team.area'])
+            ->orderBy('assigned_from', 'desc')
+            ->paginate($request->integer('per_page', 15));
+
+        return $this->ok(TeamMemberResource::collection($assignments));
+    }
+}
diff --git a/app/Http/Controllers/Api/V1/Scanner/ScannerController.php b/app/Http/Controllers/Api/V1/Scanner/ScannerController.php
index 4ac899f..5901c02 100644
--- a/app/Http/Controllers/Api/V1/Scanner/ScannerController.php
+++ b/app/Http/Controllers/Api/V1/Scanner/ScannerController.php
@@ -15,6 +15,33 @@ class ScannerController extends ApiController
 {
     public function __construct(private readonly ScanService $scanner) {}
 
+    public function teamDetails(Request $request): JsonResponse
+    {
+        $user = $request->user();
+
+        $team = \App\Models\CollectionTeam::query()
+            ->with(['driver', 'truck', 'helpers.user'])
+            ->where('scanner_id', $user->id)
+            ->where('status', \App\Models\CollectionTeam::STATUS_ACTIVE)
+            ->first();
+
+        if (! $team) {
+            return $this->fail('No active collection team assigned to this scanner', null, 404);
+        }
+
+        $trip = \App\Models\Trip::query()
+            ->with(['route.stops.dropOffPoint', 'stops.dropOffPoint'])
+            ->where('team_id', $team->id)
+            ->whereIn('status', [\App\Models\Trip::STATUS_SCHEDULED, \App\Models\Trip::STATUS_IN_PROGRESS, \App\Models\Trip::STATUS_AT_DUMPSITE])
+            ->orderBy('scheduled_date')
+            ->first();
+
+        return $this->ok([
+            'team' => \App\Http\Resources\CollectionTeamResource::make($team),
+            'active_trip' => $trip ? \App\Http\Resources\TripResource::make($trip) : null,
+        ]);
+    }
+
     public function scan(Request $request): JsonResponse
     {
         $data = $request->validate([
diff --git a/app/Http/Requests/Auth/RegisterRequest.php b/app/Http/Requests/Auth/RegisterRequest.php
index 2ee28c3..b8095c5 100644
--- a/app/Http/Requests/Auth/RegisterRequest.php
+++ b/app/Http/Requests/Auth/RegisterRequest.php
@@ -31,6 +31,11 @@ class RegisterRequest extends FormRequest
                 User::ROLE_STORE_PARTNER,
             ])],
             'preferred_language' => ['nullable', 'string', 'in:en,tl,ceb'],
+            'address_line' => [Rule::requiredIf($this->input('role') === User::ROLE_RESIDENT), 'nullable', 'string', 'max:255'],
+            'barangay_id' => [Rule::requiredIf($this->input('role') === User::ROLE_RESIDENT), 'nullable', 'integer', 'exists:barangays,id'],
+            'lat' => [Rule::requiredIf($this->input('role') === User::ROLE_RESIDENT), 'nullable', 'numeric', 'between:-90,90'],
+            'lng' => [Rule::requiredIf($this->input('role') === User::ROLE_RESIDENT), 'nullable', 'numeric', 'between:-180,180'],
+            'household_size' => [Rule::requiredIf($this->input('role') === User::ROLE_RESIDENT), 'nullable', 'integer', 'min:1', 'max:50'],
         ];
     }
 }
diff --git a/app/Http/Requests/Qr/GenerateBatchRequest.php b/app/Http/Requests/Qr/GenerateBatchRequest.php
index 4876a60..e2a8217 100644
--- a/app/Http/Requests/Qr/GenerateBatchRequest.php
+++ b/app/Http/Requests/Qr/GenerateBatchRequest.php
@@ -22,7 +22,7 @@ class GenerateBatchRequest extends FormRequest
                 QrCodeBatch::PURPOSE_STORE,
                 QrCodeBatch::PURPOSE_PROMO,
             ])],
-            'target_area_id' => ['nullable', 'string', 'exists:service_areas,uuid'],
+            'household_id' => ['required', 'string', 'exists:households,uuid'],
             'target_store_id' => ['nullable', 'integer'],
             'expires_at' => ['nullable', 'date', 'after:today'],
             'notes' => ['nullable', 'string', 'max:1000'],
diff --git a/app/Http/Requests/Team/StoreCollectionTeamRequest.php b/app/Http/Requests/Team/StoreCollectionTeamRequest.php
index bf80e9b..01692a3 100644
--- a/app/Http/Requests/Team/StoreCollectionTeamRequest.php
+++ b/app/Http/Requests/Team/StoreCollectionTeamRequest.php
@@ -23,6 +23,8 @@ class StoreCollectionTeamRequest extends FormRequest
             'truck_id' => ['nullable', 'integer', 'exists:trucks,id'],
             'helper_ids' => ['nullable', 'array'],
             'helper_ids.*' => ['integer', 'exists:users,id'],
+            'helper_count' => ['nullable', 'integer', 'min:0', 'max:10'],
+            'helper_assignment_mode' => ['nullable', 'string', Rule::in(['random', 'manual'])],
             'status' => ['nullable', Rule::in([CollectionTeam::STATUS_ACTIVE, CollectionTeam::STATUS_INACTIVE])],
             'notes' => ['nullable', 'string', 'max:1000'],
             'override_conflicts' => ['nullable', 'boolean'],
diff --git a/app/Http/Resources/CollectionTeamResource.php b/app/Http/Resources/CollectionTeamResource.php
index cd833c2..222667e 100644
--- a/app/Http/Resources/CollectionTeamResource.php
+++ b/app/Http/Resources/CollectionTeamResource.php
@@ -23,6 +23,7 @@ class CollectionTeamResource extends JsonResource
                 'name' => $m->user?->full_name,
                 'assigned_from' => $m->assigned_from?->toDateString(),
                 'assigned_until' => $m->assigned_until?->toDateString(),
+                'status' => $m->status,
             ])),
             'notes' => $this->notes,
             'created_at' => $this->created_at?->toIso8601String(),
diff --git a/app/Http/Resources/QrCodeBatchResource.php b/app/Http/Resources/QrCodeBatchResource.php
index 989a2f4..c442ea8 100644
--- a/app/Http/Resources/QrCodeBatchResource.php
+++ b/app/Http/Resources/QrCodeBatchResource.php
@@ -22,6 +22,11 @@ class QrCodeBatchResource extends JsonResource
             'purpose' => $this->purpose,
             'target_area' => $this->whenLoaded('targetArea', fn () => $this->targetArea?->code),
             'target_store_id' => $this->target_store_id,
+            'household' => $this->whenLoaded('household', fn () => $this->household ? [
+                'id' => $this->household->id,
+                'address' => $this->household->address_line,
+                'head_name' => $this->household->head?->full_name,
+            ] : null),
             'created_by' => $this->whenLoaded('createdBy', fn () => $this->createdBy?->full_name),
             'printed_at' => $this->printed_at?->toIso8601String(),
             'expires_at' => $this->expires_at?->toIso8601String(),
diff --git a/app/Http/Resources/TeamMemberResource.php b/app/Http/Resources/TeamMemberResource.php
new file mode 100644
index 0000000..fe9cf4f
--- /dev/null
+++ b/app/Http/Resources/TeamMemberResource.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class TeamMemberResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'role_in_team' => $this->role_in_team,
+            'status' => $this->status,
+            'assigned_from' => $this->assigned_from?->toDateString(),
+            'assigned_until' => $this->assigned_until?->toDateString(),
+            'team' => CollectionTeamResource::make($this->whenLoaded('team')),
+            'user' => UserResource::make($this->whenLoaded('user')),
+            'created_at' => $this->created_at?->toIso8601String(),
+        ];
+    }
+}
diff --git a/app/Http/Resources/UserDetailResource.php b/app/Http/Resources/UserDetailResource.php
index efa418d..96b0e47 100644
--- a/app/Http/Resources/UserDetailResource.php
+++ b/app/Http/Resources/UserDetailResource.php
@@ -30,6 +30,7 @@ class UserDetailResource extends JsonResource
             'last_login_at' => $this->last_login_at?->toIso8601String(),
             'created_at' => $this->created_at?->toIso8601String(),
             'profile' => $profile?->toArray(),
+            'has_household' => $this->headedHousehold()->exists() || $this->householdMemberships()->exists(),
         ];
     }
 }
diff --git a/app/Models/QrCodeBatch.php b/app/Models/QrCodeBatch.php
index 6acea3a..45d4a0c 100644
--- a/app/Models/QrCodeBatch.php
+++ b/app/Models/QrCodeBatch.php
@@ -28,6 +28,7 @@ class QrCodeBatch extends Model
         'purpose',
         'target_area_id',
         'target_store_id',
+        'household_id',
         'created_by_admin_id',
         'printed_at',
         'expires_at',
@@ -53,6 +54,11 @@ class QrCodeBatch extends Model
         return $this->belongsTo(ServiceArea::class, 'target_area_id');
     }
 
+    public function household(): BelongsTo
+    {
+        return $this->belongsTo(Household::class, 'household_id');
+    }
+
     public function createdBy(): BelongsTo
     {
         return $this->belongsTo(User::class, 'created_by_admin_id');
diff --git a/app/Models/TeamMember.php b/app/Models/TeamMember.php
index 5e907b8..3c5907e 100644
--- a/app/Models/TeamMember.php
+++ b/app/Models/TeamMember.php
@@ -18,9 +18,15 @@ class TeamMember extends Model
 
     public const ROLE_LEAD = 'lead';
 
+    public const STATUS_PENDING = 'pending';
+
+    public const STATUS_ACCEPTED = 'accepted';
+
+    public const STATUS_REJECTED = 'rejected';
+
     protected $fillable = [
         'team_id', 'user_id', 'role_in_team',
-        'assigned_from', 'assigned_until',
+        'assigned_from', 'assigned_until', 'status',
     ];
 
     protected function casts(): array
diff --git a/app/Services/Qr/BatchGenerator.php b/app/Services/Qr/BatchGenerator.php
index 999901e..87fe74f 100644
--- a/app/Services/Qr/BatchGenerator.php
+++ b/app/Services/Qr/BatchGenerator.php
@@ -7,6 +7,7 @@ use App\Models\QrCodeBatch;
 use App\Models\ServiceArea;
 use App\Models\User;
 use App\States\QrCode\Unassigned;
+use App\States\QrCode\Active;
 use App\Tenancy\Tenancy;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
@@ -26,6 +27,7 @@ class BatchGenerator
         ?User $createdBy = null,
         ?\DateTimeInterface $expiresAt = null,
         ?string $notes = null,
+        ?int $householdId = null,
     ): QrCodeBatch {
         $now = Carbon::now();
         $areaCode = $targetArea?->code ?? 'PH';
@@ -34,7 +36,7 @@ class BatchGenerator
 
         return DB::transaction(function () use (
             $batchNumber, $quantity, $purpose, $targetArea, $targetStoreId,
-            $createdBy, $expiresAt, $notes, $now, $areaCode, $batchSeq,
+            $createdBy, $expiresAt, $notes, $now, $areaCode, $batchSeq, $householdId,
         ) {
             $batch = QrCodeBatch::create([
                 'batch_number' => $batchNumber,
@@ -42,6 +44,7 @@ class BatchGenerator
                 'purpose' => $purpose,
                 'target_area_id' => $targetArea?->id,
                 'target_store_id' => $targetStoreId,
+                'household_id' => $householdId,
                 'created_by_admin_id' => $createdBy?->id,
                 'expires_at' => $expiresAt,
                 'notes' => $notes,
@@ -61,7 +64,10 @@ class BatchGenerator
                     'serial' => $serial,
                     'barcode_value' => $serial,
                     'batch_id' => $batch->id,
-                    'status' => Unassigned::$name,
+                    'status' => $householdId ? Active::$name : Unassigned::$name,
+                    'assigned_to_household_id' => $householdId,
+                    'allocated_at' => $householdId ? $tsNow : null,
+                    'activated_at' => $householdId ? $tsNow : null,
                     'expires_at' => $expiresAt,
                     'created_at' => $tsNow,
                     'updated_at' => $tsNow,
diff --git a/database/migrations/2026_06_29_080410_add_household_id_to_qr_code_batches_table.php b/database/migrations/2026_06_29_080410_add_household_id_to_qr_code_batches_table.php
new file mode 100644
index 0000000..b3866b9
--- /dev/null
+++ b/database/migrations/2026_06_29_080410_add_household_id_to_qr_code_batches_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('qr_code_batches', function (Blueprint $table) {
+            $table->foreignId('household_id')
+                ->nullable()
+                ->after('target_store_id')
+                ->constrained('households')
+                ->nullOnDelete();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('qr_code_batches', function (Blueprint $table) {
+            $table->dropForeign(['household_id']);
+            $table->dropColumn('household_id');
+        });
+    }
+};
diff --git a/database/migrations/2026_06_29_085121_add_status_to_team_members_table.php b/database/migrations/2026_06_29_085121_add_status_to_team_members_table.php
new file mode 100644
index 0000000..40f8b73
--- /dev/null
+++ b/database/migrations/2026_06_29_085121_add_status_to_team_members_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('team_members', function (Blueprint $table) {
+            $table->string('status')->default('pending')->after('assigned_until');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('team_members', function (Blueprint $table) {
+            $table->dropColumn('status');
+        });
+    }
+};
diff --git a/resources/views/admin/households.blade.php b/resources/views/admin/households.blade.php
index 40d3bd8..06eebba 100644
--- a/resources/views/admin/households.blade.php
+++ b/resources/views/admin/households.blade.php
@@ -242,6 +242,7 @@
     let editingHouseholdId = null;
     let editingMemberId = null;
     let availableResidentsForMember = [];
+    let currentHousehold = null;
 
     function statusBadge(s) {
         const map = { pending: 'badge-pending', approved: 'badge-active', rejected: 'badge-rejected' };
@@ -459,7 +460,7 @@
                 select.innerHTML = '<option value="">No residents without households found</option>';
             } else {
                 select.innerHTML = '<option value="">Select Resident</option>' +
-                    list.map(u => `<option value="${u.id}">${window.Verde.escapeHtml(u.full_name)} (${window.Verde.escapeHtml(u.email)})</option>`).join('');
+                    list.map(u => `<option value="${u.db_id || u.id}">${window.Verde.escapeHtml(u.full_name)} (${window.Verde.escapeHtml(u.email)})</option>`).join('');
             }
         } else {
             select.innerHTML = '<option value="">Failed to load residents</option>';
@@ -595,14 +596,31 @@
 
     async function loadAvailableResidentsForMember() {
         memberUserId.innerHTML = '<option value="">Loading residents…</option>';
-        const res = await window.Verde.apiFetch('/api/v1/admin/users?role=resident&without_household=1');
+        const res = await window.Verde.apiFetch('/api/v1/admin/users?role=resident');
         if (res.ok) {
             availableResidentsForMember = res.body.data ?? [];
-            if (availableResidentsForMember.length === 0) {
-                memberUserId.innerHTML = '<option value="">No residents without households found</option>';
+            
+            // Filter out residents who are already members or head of this household
+            const existingMemberUserIds = [];
+            if (currentHousehold && currentHousehold.members) {
+                currentHousehold.members.forEach(m => {
+                    if (m.user_id) existingMemberUserIds.push(parseInt(m.user_id, 10));
+                });
+            }
+            if (currentHousehold && currentHousehold.head && currentHousehold.head.db_id) {
+                existingMemberUserIds.push(parseInt(currentHousehold.head.db_id, 10));
+            }
+
+            const filteredResidents = availableResidentsForMember.filter(u => {
+                const uId = parseInt(u.db_id || u.id, 10);
+                return !existingMemberUserIds.includes(uId);
+            });
+
+            if (filteredResidents.length === 0) {
+                memberUserId.innerHTML = '<option value="">No available residents found</option>';
             } else {
                 memberUserId.innerHTML = '<option value="">Select Resident</option>' +
-                    availableResidentsForMember.map(u => `<option value="${u.id}">${window.Verde.escapeHtml(u.full_name)} (${window.Verde.escapeHtml(u.email)})</option>`).join('');
+                    filteredResidents.map(u => `<option value="${u.db_id || u.id}">${window.Verde.escapeHtml(u.full_name)} (${window.Verde.escapeHtml(u.email)})</option>`).join('');
             }
         } else {
             memberUserId.innerHTML = '<option value="">Failed to load residents</option>';
@@ -777,7 +795,8 @@
         }
 
         const h = res.body.data;
-        
+        currentHousehold = h;
+
         createForm.querySelector('[name="address_line"]').value = h.address_line;
         createForm.querySelector('[name="household_size"]').value = h.household_size;
 
diff --git a/resources/views/admin/qr-batches.blade.php b/resources/views/admin/qr-batches.blade.php
index a5225db..481cdfd 100644
--- a/resources/views/admin/qr-batches.blade.php
+++ b/resources/views/admin/qr-batches.blade.php
@@ -1,13 +1,16 @@
-@extends('admin.layouts.app', ['pageTitle' => 'QR Code Batches'])
+@extends('admin.layouts.app', ['pageTitle' => 'QR Code Sales'])
 
 @section('page')
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" crossorigin="">
+<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" crossorigin=""></script>
+
 <div class="mx-auto max-w-7xl">
     <header class="mb-6 flex items-end justify-between">
         <div>
-            <h2 class="text-2xl font-semibold tracking-tight text-neutral-900">QR Code Batches</h2>
-            <p class="mt-1 text-sm text-neutral-500">Generate, print, and audit QR code lifecycle.</p>
+            <h2 class="text-2xl font-semibold tracking-tight text-neutral-900">QR Code Sales</h2>
+            <p class="mt-1 text-sm text-neutral-500">Sell QR codes directly to verified households and audit code distribution.</p>
         </div>
-        <button id="new-btn" class="btn-primary">+ Generate Batch</button>
+        <button id="new-btn" class="btn-primary">+ Sale QR</button>
     </header>
 
     <div class="table-wrap">
@@ -15,6 +18,7 @@
             <thead>
                 <tr>
                     <th>Batch #</th>
+                    <th>Household</th>
                     <th>Purpose</th>
                     <th>Quantity</th>
                     <th>Unassigned</th>
@@ -25,7 +29,7 @@
                 </tr>
             </thead>
             <tbody id="rows">
-                <tr><td colspan="8" class="py-10 text-center text-sm text-neutral-400">Loading…</td></tr>
+                <tr><td colspan="9" class="py-10 text-center text-sm text-neutral-400">Loading…</td></tr>
             </tbody>
         </table>
     </div>
@@ -35,7 +39,7 @@
     <div class="slide-over-mask" data-close></div>
     <div class="slide-over-panel translate-x-0 p-6">
         <div class="mb-4 flex items-center justify-between">
-            <h3 class="text-base font-semibold text-neutral-900">Generate batch</h3>
+            <h3 class="text-base font-semibold text-neutral-900">Sale QR</h3>
             <button data-close class="text-neutral-400 hover:text-neutral-600">
                 <svg class="h-5 w-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M18 6L6 18M6 6l12 12"/></svg>
             </button>
@@ -43,7 +47,7 @@
         <form id="create-form" class="space-y-4">
             <div>
                 <label class="form-label">Quantity</label>
-                <input name="quantity" type="number" min="1" max="50000" value="100" required class="form-input">
+                <input name="quantity" type="number" min="1" max="50000" value="10" required class="form-input">
             </div>
             <div>
                 <label class="form-label">Purpose</label>
@@ -54,11 +58,14 @@
                 </select>
             </div>
             <div>
-                <label class="form-label">Target Service Area</label>
-                <select name="target_area_id" id="area-select" class="form-select">
-                    <option value="">— None —</option>
+                <label class="form-label">Select Household</label>
+                <select name="household_id" id="household-select" class="form-select" required>
+                    <option value="">— Select Household —</option>
                 </select>
-                <p class="mt-1 text-xs text-neutral-500">Free allocation prefers area-targeted batches.</p>
+            </div>
+            <div id="map-container" class="hidden">
+                <label class="form-label mb-1">Household Location</label>
+                <div id="modal-map" class="w-full rounded-md border border-neutral-200 bg-neutral-50 h-[220px]" style="z-index: 1;"></div>
             </div>
             <div>
                 <label class="form-label">Notes (optional)</label>
@@ -66,7 +73,7 @@
             </div>
             <div class="flex justify-end gap-2 pt-2">
                 <button type="button" data-close class="btn-ghost">Cancel</button>
-                <button type="submit" class="btn-primary">Generate</button>
+                <button type="submit" class="btn-primary">Submit Sale</button>
             </div>
         </form>
     </div>
@@ -75,30 +82,72 @@
 <script type="module">
     const rows = document.getElementById('rows');
     const modal = document.getElementById('form-modal');
-    const areaSelect = document.getElementById('area-select');
+    const householdSelect = document.getElementById('household-select');
 
-    async function loadAreas() {
-        const res = await window.Verde.apiFetch('/api/v1/service-areas');
+    let map = null;
+    let marker = null;
+    let households = [];
+
+    function initMap() {
+        if (map) return;
+        map = L.map('modal-map').setView([12.8797, 121.7740], 6);
+        L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            attribution: '&copy; OpenStreetMap'
+        }).addTo(map);
+    }
+
+    async function loadHouseholds() {
+        const res = await window.Verde.apiFetch('/api/v1/admin/households?per_page=100');
         if (!res.ok) return;
-        const items = res.body.data ?? [];
-        items.forEach(a => {
+        households = res.body.data ?? [];
+        householdSelect.innerHTML = '<option value="">— Select Household —</option>';
+        households.forEach(h => {
             const opt = document.createElement('option');
-            opt.value = a.id; // wait — service_areas use uuid as route key, but we need DB id; backend store accepts integer id only
-            opt.textContent = `${a.name} (${a.code})`;
-            areaSelect.appendChild(opt);
+            opt.value = h.id;
+            opt.textContent = `${h.head ? h.head.full_name : 'Household'} (${h.address_line})`;
+            householdSelect.appendChild(opt);
         });
     }
 
+    householdSelect.addEventListener('change', (e) => {
+        const hId = e.target.value;
+        const container = document.getElementById('map-container');
+        if (!hId) {
+            container.classList.add('hidden');
+            return;
+        }
+
+        const h = households.find(item => item.id === hId);
+        if (h && h.coordinates) {
+            container.classList.remove('hidden');
+            initMap();
+            
+            setTimeout(() => {
+                map.invalidateSize();
+                const pos = [h.coordinates.lat, h.coordinates.lng];
+                map.setView(pos, 16);
+                
+                if (marker) {
+                    marker.setLatLng(pos);
+                } else {
+                    marker = L.marker(pos).addTo(map);
+                }
+            }, 100);
+        } else {
+            container.classList.add('hidden');
+        }
+    });
+
     async function load() {
-        rows.innerHTML = `<tr><td colspan="8" class="py-10 text-center text-sm text-neutral-400">Loading…</td></tr>`;
+        rows.innerHTML = `<tr><td colspan="9" class="py-10 text-center text-sm text-neutral-400">Loading…</td></tr>`;
         const res = await window.Verde.apiFetch('/api/v1/admin/qr-batches?per_page=50');
         if (!res.ok) {
-            rows.innerHTML = `<tr><td colspan="8" class="py-10 text-center text-sm text-red-500">Failed to load.</td></tr>`;
+            rows.innerHTML = `<tr><td colspan="9" class="py-10 text-center text-sm text-red-500">Failed to load.</td></tr>`;
             return;
         }
         const items = res.body.data ?? [];
         if (items.length === 0) {
-            rows.innerHTML = `<tr><td colspan="8" class="py-10 text-center text-sm text-neutral-400">No batches yet. Generate your first one.</td></tr>`;
+            rows.innerHTML = `<tr><td colspan="9" class="py-10 text-center text-sm text-neutral-400">No batches yet. Sell your first one.</td></tr>`;
             return;
         }
         const token = localStorage.getItem('verde:token') ?? '';
@@ -107,8 +156,12 @@
             const printed = b.printed_at
                 ? `<span class="badge badge-active">${window.Verde.formatDate(b.printed_at, { dateStyle: 'short' })}</span>`
                 : '<span class="badge badge-inactive">No</span>';
+            const householdInfo = b.household
+                ? `<div class="font-medium text-neutral-900">${window.Verde.escapeHtml(b.household.head_name || '—')}</div><div class="text-xs text-neutral-500">${window.Verde.escapeHtml(b.household.address)}</div>`
+                : '<span class="text-neutral-400">—</span>';
             return `<tr>
                 <td class="font-mono text-xs text-neutral-700">${window.Verde.escapeHtml(b.batch_number)}</td>
+                <td>${householdInfo}</td>
                 <td><span class="badge badge-info">${window.Verde.escapeHtml(b.purpose)}</span></td>
                 <td>${b.quantity}</td>
                 <td>${sc.unassigned ?? 0}</td>
@@ -131,32 +184,36 @@
         });
     }
 
-    document.getElementById('new-btn').addEventListener('click', () => modal.classList.remove('hidden'));
-    modal.querySelectorAll('[data-close]').forEach(el => el.addEventListener('click', () => modal.classList.add('hidden')));
+    document.getElementById('new-btn').addEventListener('click', () => {
+        modal.classList.remove('hidden');
+        loadHouseholds();
+    });
+    modal.querySelectorAll('[data-close]').forEach(el => el.addEventListener('click', () => {
+        modal.classList.add('hidden');
+        document.getElementById('map-container').classList.add('hidden');
+    }));
 
     document.getElementById('create-form').addEventListener('submit', async (e) => {
         e.preventDefault();
         const fd = new FormData(e.target);
         const payload = Object.fromEntries(fd.entries());
         payload.quantity = parseInt(payload.quantity, 10);
-        if (!payload.target_area_id) delete payload.target_area_id;
-        else payload.target_area_id = parseInt(payload.target_area_id, 10);
 
         const res = await window.Verde.apiFetch('/api/v1/admin/qr-batches', {
             method: 'POST',
             body: JSON.stringify(payload),
         });
         if (res.ok) {
-            window.Verde.toast(`Batch ${res.body.data.batch_number} generated`, 'success');
+            window.Verde.toast(`Batch ${res.body.data.batch_number} generated and assigned`, 'success');
             modal.classList.add('hidden');
+            document.getElementById('map-container').classList.add('hidden');
             e.target.reset();
             load();
         } else {
-            window.Verde.toast(res.body?.message ?? 'Generation failed', 'error');
+            window.Verde.toast(res.body?.message ?? 'Sale failed', 'error');
         }
     });
 
-    loadAreas();
     load();
 </script>
 @endsection
diff --git a/resources/views/admin/teams.blade.php b/resources/views/admin/teams.blade.php
index 39e8750..3d4e073 100644
--- a/resources/views/admin/teams.blade.php
+++ b/resources/views/admin/teams.blade.php
@@ -41,9 +41,9 @@
 
 <div id="form-modal" class="hidden">
     <div class="slide-over-mask" data-close></div>
-    <div class="slide-over-panel translate-x-0 p-6 overflow-y-auto">
+    <div class="slide-over-panel translate-x-0 p-6 overflow-y-auto" style="max-width: 500px; width: 90%;">
         <div class="mb-4 flex items-center justify-between">
-            <h3 class="text-base font-semibold text-neutral-900">New team</h3>
+            <h3 id="modal-title" class="text-base font-semibold text-neutral-900">New Team</h3>
             <button data-close class="text-neutral-400 hover:text-neutral-600">
                 <svg class="h-5 w-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M18 6L6 18M6 6l12 12"/></svg>
             </button>
@@ -60,6 +60,32 @@
             <div><label class="form-label">Truck</label>
                 <select name="truck_id" id="truck-select" class="form-select"><option value="">— Select —</option></select>
             </div>
+            <div>
+                <label class="form-label">Number of Helpers</label>
+                <input type="number" name="helper_count" id="helper-count" class="form-input" min="0" max="10" value="0" required>
+            </div>
+            <div id="helper-assignment-mode-container" class="hidden">
+                <label class="form-label">Helper Assignment Mode</label>
+                <div class="flex gap-4 mt-2">
+                    <label class="inline-flex items-center cursor-pointer">
+                        <input type="radio" name="helper_assignment_mode" value="random" checked class="form-radio text-green-600 focus:ring-green-500">
+                        <span class="ml-2 text-sm text-neutral-700">Random Assignment</span>
+                    </label>
+                    <label class="inline-flex items-center cursor-pointer">
+                        <input type="radio" name="helper_assignment_mode" value="manual" class="form-radio text-green-600 focus:ring-green-500">
+                        <span class="ml-2 text-sm text-neutral-700">Manual Selection</span>
+                    </label>
+                </div>
+            </div>
+            <div id="manual-helpers-list-container" class="hidden space-y-2 border border-neutral-200 rounded-md p-3 bg-neutral-50">
+                <div class="flex justify-between items-center mb-1">
+                    <label class="form-label text-xs font-semibold">Select Helpers</label>
+                    <span id="helper-selection-counter" class="text-xs text-neutral-500">0 of 0 selected</span>
+                </div>
+                <div id="helpers-checkbox-list" class="space-y-1.5 max-h-48 overflow-y-auto pr-1">
+                    <!-- Dynamic helper checkboxes -->
+                </div>
+            </div>
             <div><label class="form-label">Status</label>
                 <select name="status" class="form-select">
                     <option value="active">Active</option>
@@ -72,7 +98,7 @@
             </label>
             <div class="flex justify-end gap-2 pt-2">
                 <button type="button" data-close class="btn-ghost">Cancel</button>
-                <button type="submit" class="btn-primary">Create</button>
+                <button type="submit" id="submit-btn" class="btn-primary">Create</button>
             </div>
         </form>
     </div>
@@ -83,6 +109,9 @@
     const modal = document.getElementById('form-modal');
     const conflictBanner = document.getElementById('conflict-banner');
 
+    let editingTeamId = null;
+    let allHelpers = [];
+
     function badge(s) {
         return `<span class="badge ${s === 'active' ? 'badge-active' : 'badge-inactive'}">${s}</span>`;
     }
@@ -111,6 +140,62 @@
         });
     }
 
+    async function loadHelpers() {
+        const res = await window.Verde.apiFetch('/api/v1/admin/users?role=helper&status=active&per_page=200');
+        if (!res.ok) return;
+        allHelpers = res.body.data ?? [];
+        
+        const listContainer = document.getElementById('helpers-checkbox-list');
+        listContainer.innerHTML = allHelpers.map(u => `
+            <label class="flex items-center gap-2.5 text-sm text-neutral-700 hover:bg-neutral-100 p-1.5 rounded cursor-pointer">
+                <input type="checkbox" name="helper_ids[]" value="${u.db_id}" class="helper-checkbox rounded border-neutral-300 text-verde-600 focus:ring-verde-500">
+                <div class="flex flex-col">
+                    <span class="font-medium text-neutral-800">${window.Verde.escapeHtml(u.full_name)}</span>
+                    <span class="text-[10px] text-neutral-400">${window.Verde.escapeHtml(u.email)}</span>
+                </div>
+            </label>
+        `).join('');
+
+        listContainer.querySelectorAll('.helper-checkbox').forEach(cb => {
+            cb.addEventListener('change', updateHelperSelectionCounter);
+        });
+    }
+
+    function updateHelperSelectionCounter() {
+        const checkedCount = document.querySelectorAll('.helper-checkbox:checked').length;
+        const requiredCount = parseInt(document.getElementById('helper-count').value, 10) || 0;
+        document.getElementById('helper-selection-counter').textContent = `${checkedCount} of ${requiredCount} selected`;
+    }
+
+    // Helper visibility toggles
+    const helperCountInput = document.getElementById('helper-count');
+    const helperAssignmentModeContainer = document.getElementById('helper-assignment-mode-container');
+    const manualHelpersListContainer = document.getElementById('manual-helpers-list-container');
+
+    function toggleHelperFields() {
+        const count = parseInt(helperCountInput.value, 10) || 0;
+        if (count > 0) {
+            helperAssignmentModeContainer.classList.remove('hidden');
+            const mode = document.querySelector('input[name="helper_assignment_mode"]:checked')?.value || 'random';
+            if (mode === 'manual') {
+                manualHelpersListContainer.classList.remove('hidden');
+                updateHelperSelectionCounter();
+            } else {
+                manualHelpersListContainer.classList.add('hidden');
+            }
+        } else {
+            helperAssignmentModeContainer.classList.add('hidden');
+            manualHelpersListContainer.classList.add('hidden');
+            // Uncheck all helper checkboxes
+            document.querySelectorAll('.helper-checkbox').forEach(cb => cb.checked = false);
+        }
+    }
+
+    helperCountInput.addEventListener('input', toggleHelperFields);
+    document.querySelectorAll('input[name="helper_assignment_mode"]').forEach(radio => {
+        radio.addEventListener('change', toggleHelperFields);
+    });
+
     async function load() {
         rows.innerHTML = `<tr><td colspan="6" class="py-10 text-center text-sm text-neutral-400">Loading…</td></tr>`;
         const params = new URLSearchParams();
@@ -124,18 +209,29 @@
         if (!res.ok) { rows.innerHTML = `<tr><td colspan="6" class="py-10 text-center text-sm text-red-500">Failed to load.</td></tr>`; return; }
         const items = res.body.data ?? [];
         if (items.length === 0) { rows.innerHTML = `<tr><td colspan="6" class="py-10 text-center text-sm text-neutral-400">No teams yet.</td></tr>`; return; }
-        rows.innerHTML = items.map(t => `
+        
+        rows.innerHTML = items.map(t => {
+            const helpersList = t.helpers && t.helpers.length > 0
+                ? t.helpers.map(h => window.Verde.escapeHtml(h.user?.full_name ?? '')).join(', ')
+                : '—';
+            return `
             <tr>
-                <td class="font-medium text-neutral-900">${window.Verde.escapeHtml(t.name)}</td>
+                <td class="font-medium text-neutral-900">
+                    <div>${window.Verde.escapeHtml(t.name)}</div>
+                    <div class="text-xs text-neutral-500 mt-0.5 font-normal">Helpers: ${helpersList}</div>
+                </td>
                 <td>${t.driver ? window.Verde.escapeHtml(t.driver.full_name ?? t.driver.email) : '—'}</td>
                 <td>${t.scanner ? window.Verde.escapeHtml(t.scanner.full_name ?? t.scanner.email) : '—'}</td>
                 <td>${t.truck ? `<span class="font-mono text-xs">${window.Verde.escapeHtml(t.truck.plate_number)}</span>` : '—'}</td>
                 <td>${badge(t.status)}</td>
-                <td class="text-right">
-                    <button data-id="${t.id}" data-action="delete" class="btn-ghost px-3 py-1 text-xs">Delete</button>
+                <td class="text-right space-x-1">
+                    <button data-id="${t.id}" data-action="edit" class="btn-ghost px-3 py-1 text-xs">Edit</button>
+                    <button data-id="${t.id}" data-action="delete" class="btn-ghost px-3 py-1 text-xs text-red-600 hover:text-red-700">Delete</button>
                 </td>
             </tr>
-        `).join('');
+            `;
+        }).join('');
+
         rows.querySelectorAll('button[data-action="delete"]').forEach(btn => {
             btn.addEventListener('click', async () => {
                 if (!confirm('Delete this team?')) return;
@@ -144,12 +240,71 @@
                 else window.Verde.toast(r.body?.message ?? 'Delete failed', 'error');
             });
         });
+
+        rows.querySelectorAll('button[data-action="edit"]').forEach(btn => {
+            btn.addEventListener('click', () => editTeam(btn.dataset.id));
+        });
+    }
+
+    async function editTeam(id) {
+        editingTeamId = id;
+        document.getElementById('modal-title').textContent = 'Edit Team';
+        document.getElementById('submit-btn').textContent = 'Save';
+        conflictBanner.classList.add('hidden');
+
+        const res = await window.Verde.apiFetch(`/api/v1/admin/teams/${id}`);
+        if (!res.ok) {
+            window.Verde.toast('Failed to load team details', 'error');
+            return;
+        }
+
+        const t = res.body.data;
+        const form = document.getElementById('create-form');
+        form.reset();
+
+        form.querySelector('[name="name"]').value = t.name;
+        form.querySelector('[name="driver_id"]').value = t.driver ? (t.driver.db_id || '') : '';
+        form.querySelector('[name="scanner_id"]').value = t.scanner ? (t.scanner.db_id || '') : '';
+        form.querySelector('[name="truck_id"]').value = t.truck ? (t.truck.db_id || '') : '';
+        form.querySelector('[name="status"]').value = t.status;
+        document.getElementById('override-conflicts').checked = false;
+
+        const currentHelpers = t.helpers ?? [];
+        helperCountInput.value = currentHelpers.length;
+
+        // Uncheck all checkboxes first
+        document.querySelectorAll('.helper-checkbox').forEach(cb => cb.checked = false);
+
+        if (currentHelpers.length > 0) {
+            // Set mode to manual
+            form.querySelector('input[name="helper_assignment_mode"][value="manual"]').checked = true;
+            
+            // Check checkboxes for matching helper IDs
+            const currentHelperIds = currentHelpers.map(h => h.user?.db_id).filter(Boolean);
+            document.querySelectorAll('.helper-checkbox').forEach(cb => {
+                if (currentHelperIds.includes(parseInt(cb.value, 10))) {
+                    cb.checked = true;
+                }
+            });
+        } else {
+            form.querySelector('input[name="helper_assignment_mode"][value="random"]').checked = true;
+        }
+
+        toggleHelperFields();
+        modal.classList.remove('hidden');
     }
 
     document.getElementById('new-btn').addEventListener('click', () => {
+        editingTeamId = null;
+        document.getElementById('modal-title').textContent = 'New Team';
+        document.getElementById('submit-btn').textContent = 'Create';
         conflictBanner.classList.add('hidden');
+        document.getElementById('create-form').reset();
+        document.querySelectorAll('.helper-checkbox').forEach(cb => cb.checked = false);
+        toggleHelperFields();
         modal.classList.remove('hidden');
     });
+
     modal.querySelectorAll('[data-close]').forEach(el => el.addEventListener('click', () => modal.classList.add('hidden')));
     document.getElementById('filter-apply').addEventListener('click', load);
     document.getElementById('filter-status').addEventListener('change', load);
@@ -157,20 +312,44 @@
     document.getElementById('create-form').addEventListener('submit', async (e) => {
         e.preventDefault();
         conflictBanner.classList.add('hidden');
+        
         const fd = new FormData(e.target);
         const payload = Object.fromEntries(fd.entries());
-        ['driver_id', 'scanner_id', 'truck_id'].forEach(k => {
+        
+        // Convert to ints
+        ['driver_id', 'scanner_id', 'truck_id', 'helper_count'].forEach(k => {
             if (payload[k]) payload[k] = parseInt(payload[k], 10);
             else delete payload[k];
         });
+
         if (document.getElementById('override-conflicts').checked) payload.override_conflicts = true;
 
-        const res = await window.Verde.apiFetch('/api/v1/admin/teams', {
-            method: 'POST',
+        // Validate manual helpers selection
+        if (payload.helper_count > 0 && payload.helper_assignment_mode === 'manual') {
+            const selectedHelperIds = Array.from(document.querySelectorAll('.helper-checkbox:checked')).map(cb => parseInt(cb.value, 10));
+            if (selectedHelperIds.length !== payload.helper_count) {
+                window.Verde.toast(`Please select exactly ${payload.helper_count} helper(s).`, 'error');
+                return;
+            }
+            payload.helper_ids = selectedHelperIds;
+        } else if (payload.helper_count > 0 && payload.helper_assignment_mode === 'random') {
+            payload.helper_ids = [];
+        } else {
+            payload.helper_count = 0;
+            delete payload.helper_assignment_mode;
+            payload.helper_ids = [];
+        }
+
+        const url = editingTeamId ? `/api/v1/admin/teams/${editingTeamId}` : '/api/v1/admin/teams';
+        const method = editingTeamId ? 'PATCH' : 'POST';
+
+        const res = await window.Verde.apiFetch(url, {
+            method: method,
             body: JSON.stringify(payload),
         });
+
         if (res.ok) {
-            window.Verde.toast('Team created', 'success');
+            window.Verde.toast(editingTeamId ? 'Team updated' : 'Team created', 'success');
             modal.classList.add('hidden');
             e.target.reset();
             load();
@@ -179,8 +358,10 @@
                 res.body.errors.conflicts.map(c => `<li>${window.Verde.escapeHtml(c)}</li>`).join('') +
                 '</ul>';
             conflictBanner.classList.remove('hidden');
+        } else if (res.status === 422 && res.body?.errors?.helper_count) {
+            window.Verde.toast(res.body.errors.helper_count[0], 'error');
         } else {
-            window.Verde.toast(res.body?.message ?? 'Create failed', 'error');
+            window.Verde.toast(res.body?.message ?? 'Action failed', 'error');
         }
     });
 
@@ -188,6 +369,7 @@
         loadUsers('driver', 'driver-select'),
         loadUsers('scanner', 'scanner-select'),
         loadTrucks(),
+        loadHelpers(),
     ]);
     load();
 </script>
diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php
index 94173a6..f898aaf 100644
--- a/resources/views/admin/users.blade.php
+++ b/resources/views/admin/users.blade.php
@@ -1,6 +1,9 @@
 @extends('admin.layouts.app', ['pageTitle' => 'All Users'])
 
 @section('page')
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" crossorigin="">
+<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" crossorigin=""></script>
+
 <div class="mx-auto max-w-7xl">
     <header class="mb-6 flex items-end justify-between">
         <div>
@@ -49,14 +52,151 @@
     </div>
 </div>
 
+{{-- Group into Household modal --}}
+<div id="group-modal" class="hidden">
+    <div class="slide-over-mask" data-close></div>
+    <div class="slide-over-panel translate-x-0 p-6 overflow-y-auto" style="max-width: 600px; width: 90%;">
+        <div class="mb-4 flex items-center justify-between">
+            <h3 class="text-base font-semibold text-neutral-900">Group Resident into Household</h3>
+            <button data-close class="text-neutral-400 hover:text-neutral-600">
+                <svg class="h-5 w-5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M18 6L6 18M6 6l12 12"/></svg>
+            </button>
+        </div>
+        <p class="text-sm text-neutral-500 mb-4 font-medium">Resident: <span id="resident-name-display" class="font-bold text-neutral-900"></span></p>
+        <form id="group-form" class="space-y-4">
+            <div>
+                <label class="form-label">Grouping Mode</label>
+                <div class="flex gap-4 mt-2">
+                    <label class="inline-flex items-center cursor-pointer">
+                        <input type="radio" name="group_mode" value="existing" checked class="form-radio text-green-600 focus:ring-green-500">
+                        <span class="ml-2 text-sm text-neutral-700">Existing Household</span>
+                    </label>
+                    <label class="inline-flex items-center cursor-pointer">
+                        <input type="radio" name="group_mode" value="new" class="form-radio text-green-600 focus:ring-green-500">
+                        <span class="ml-2 text-sm text-neutral-700">New Household</span>
+                    </label>
+                </div>
+            </div>
+
+            <!-- Existing Household field -->
+            <div id="existing-household-field">
+                <label class="form-label">Select Household</label>
+                <select id="select-household-id" name="household_id" class="form-select w-full">
+                    <option value="">— Select Household —</option>
+                </select>
+            </div>
+
+            <!-- New Household fields (hidden by default) -->
+            <div id="new-household-fields" class="hidden space-y-4">
+                <div>
+                    <label class="form-label">Address Line</label>
+                    <input name="address_line" class="form-input" placeholder="e.g. Block 1 Lot 2, Street Name">
+                </div>
+                <div>
+                    <label class="form-label">Barangay</label>
+                    <select name="barangay_id" id="barangay-select" class="form-select w-full">
+                        <option value="">— Select Barangay —</option>
+                    </select>
+                </div>
+                <div>
+                    <label class="form-label">Household Size</label>
+                    <input type="number" name="household_size" value="1" min="1" max="50" class="form-input">
+                </div>
+                <div>
+                    <label class="form-label mb-1">Pin Location on Map</label>
+                    <div id="picker-map" class="w-full rounded-md border border-neutral-200 bg-neutral-50 h-[220px]" style="z-index: 1;"></div>
+                    <div class="mt-1 text-xs text-neutral-400">Click on the map to set the household pin coordinate.</div>
+                </div>
+                <input type="hidden" name="lat" id="picker-lat">
+                <input type="hidden" name="lng" id="picker-lng">
+            </div>
+
+            <div class="flex justify-end gap-2 pt-4 border-t border-neutral-100">
+                <button type="button" data-close class="btn-ghost">Cancel</button>
+                <button type="submit" class="btn-primary">Save Grouping</button>
+            </div>
+        </form>
+    </div>
+</div>
+
 <script type="module">
     const rows = document.getElementById('rows');
+    const groupModal = document.getElementById('group-modal');
+    const groupForm = document.getElementById('group-form');
+    const householdSelect = document.getElementById('select-household-id');
+    const barangaySelect = document.getElementById('barangay-select');
+
+    let groupMap = null;
+    let groupMarker = null;
+    let groupHouseholdsList = [];
+    let currentGroupingUserId = null;
 
     function statusBadge(s) {
         const m = { active: 'badge-active', pending: 'badge-pending', suspended: 'badge-rejected' };
         return `<span class="badge ${m[s] || 'badge-inactive'}">${s}</span>`;
     }
 
+    function initGroupMap() {
+        if (groupMap) return;
+        groupMap = L.map('picker-map').setView([12.8797, 121.7740], 6);
+        L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            attribution: '&copy; OpenStreetMap'
+        }).addTo(groupMap);
+
+        groupMap.on('click', (e) => {
+            const lat = e.latlng.lat;
+            const lng = e.latlng.lng;
+            document.getElementById('picker-lat').value = lat;
+            document.getElementById('picker-lng').value = lng;
+
+            if (groupMarker) {
+                groupMarker.setLatLng(e.latlng);
+            } else {
+                groupMarker = L.marker(e.latlng).addTo(groupMap);
+            }
+        });
+    }
+
+    document.querySelectorAll('input[name="group_mode"]').forEach(radio => {
+        radio.addEventListener('change', (e) => {
+            const isNew = e.target.value === 'new';
+            document.getElementById('existing-household-field').classList.toggle('hidden', isNew);
+            document.getElementById('new-household-fields').classList.toggle('hidden', !isNew);
+            if (isNew) {
+                initGroupMap();
+                setTimeout(() => {
+                    groupMap.invalidateSize();
+                }, 100);
+            }
+        });
+    });
+
+    async function loadHouseholds() {
+        const res = await window.Verde.apiFetch('/api/v1/admin/households?per_page=100');
+        if (!res.ok) return;
+        groupHouseholdsList = res.body.data ?? [];
+        householdSelect.innerHTML = '<option value="">— Select Household —</option>';
+        groupHouseholdsList.forEach(h => {
+            const opt = document.createElement('option');
+            opt.value = h.id;
+            opt.textContent = `${h.head ? h.head.full_name : 'Household'} (${h.address_line})`;
+            householdSelect.appendChild(opt);
+        });
+    }
+
+    async function loadBarangays() {
+        const res = await window.Verde.apiFetch('/api/v1/geo/barangays?per_page=100');
+        if (!res.ok) return;
+        const barangays = res.body.data ?? [];
+        barangaySelect.innerHTML = '<option value="">— Select Barangay —</option>';
+        barangays.forEach(b => {
+            const opt = document.createElement('option');
+            opt.value = b.id;
+            opt.textContent = b.name;
+            barangaySelect.appendChild(opt);
+        });
+    }
+
     async function load() {
         rows.innerHTML = `<tr><td colspan="6" class="py-10 text-center text-sm text-neutral-400">Loading…</td></tr>`;
         const params = new URLSearchParams();
@@ -79,30 +219,103 @@
             return;
         }
         rows.innerHTML = items.map(u => {
-            const actions = (u.role !== 'admin' && u.role !== 'super_admin')
-                ? (u.status === 'active'
-                    ? `<button data-action="suspend" data-id="${u.id}" class="btn-ghost px-3 py-1 text-xs">Suspend</button>`
-                    : `<button data-action="activate" data-id="${u.id}" class="btn-primary px-3 py-1 text-xs">Activate</button>`)
-                : '<span class="text-xs text-neutral-400">—</span>';
+            let actions = '';
+            if (u.role !== 'admin' && u.role !== 'super_admin') {
+                if (u.status === 'active') {
+                    actions += `<button data-action="suspend" data-id="${u.id}" class="btn-ghost px-3 py-1 text-xs">Suspend</button>`;
+                } else {
+                    actions += `<button data-action="activate" data-id="${u.id}" class="btn-primary px-3 py-1 text-xs">Activate</button>`;
+                }
+
+                if (u.role === 'resident' && !u.has_household) {
+                    actions += `<button data-action="group-household" data-id="${u.id}" data-name="${window.Verde.escapeHtml(u.full_name)}" class="btn-ghost text-green-600 hover:text-green-700 px-3 py-1 text-xs font-semibold">Group Household</button>`;
+                }
+            } else {
+                actions = '<span class="text-xs text-neutral-400">—</span>';
+            }
+
             return `<tr>
                 <td class="font-medium text-neutral-900">${window.Verde.escapeHtml(u.full_name || '—')}</td>
                 <td class="text-neutral-700">${window.Verde.escapeHtml(u.email)}</td>
                 <td class="font-mono text-xs text-neutral-600">${window.Verde.escapeHtml(u.phone ?? '')}</td>
                 <td><span class="badge badge-info">${u.role}</span></td>
                 <td>${statusBadge(u.status)}</td>
-                <td class="text-right">${actions}</td>
+                <td class="text-right space-x-1">${actions}</td>
             </tr>`;
         }).join('');
 
         rows.querySelectorAll('button[data-action]').forEach(btn => {
             btn.addEventListener('click', async () => {
-                const r = await window.Verde.apiFetch(`/api/v1/admin/users/${btn.dataset.id}/${btn.dataset.action}`, { method: 'POST' });
-                if (r.ok) { window.Verde.toast(`User ${btn.dataset.action}d`, 'success'); load(); }
+                const action = btn.dataset.action;
+                const id = btn.dataset.id;
+
+                if (action === 'group-household') {
+                    currentGroupingUserId = id;
+                    document.getElementById('resident-name-display').textContent = btn.dataset.name;
+                    groupModal.classList.remove('hidden');
+                    loadHouseholds();
+                    loadBarangays();
+                    return;
+                }
+
+                const r = await window.Verde.apiFetch(`/api/v1/admin/users/${id}/${action}`, { method: 'POST' });
+                if (r.ok) { window.Verde.toast(`User ${action}d`, 'success'); load(); }
                 else window.Verde.toast(r.body?.message ?? 'Failed', 'error');
             });
         });
     }
 
+    groupModal.querySelectorAll('[data-close]').forEach(el => el.addEventListener('click', () => {
+        groupModal.classList.add('hidden');
+        groupForm.reset();
+        document.getElementById('existing-household-field').classList.remove('hidden');
+        document.getElementById('new-household-fields').classList.add('hidden');
+        if (groupMarker) {
+            groupMarker.remove();
+            groupMarker = null;
+        }
+    }));
+
+    groupForm.addEventListener('submit', async (e) => {
+        e.preventDefault();
+        const fd = new FormData(e.target);
+        const mode = fd.get('group_mode');
+        const payload = {};
+
+        if (mode === 'existing') {
+            payload.household_id = parseInt(fd.get('household_id'), 10);
+            if (isNaN(payload.household_id)) {
+                window.Verde.toast('Please select a household', 'error');
+                return;
+            }
+        } else {
+            payload.address_line = fd.get('address_line');
+            payload.barangay_id = parseInt(fd.get('barangay_id'), 10);
+            payload.household_size = parseInt(fd.get('household_size'), 10);
+            payload.lat = parseFloat(fd.get('lat'));
+            payload.lng = parseFloat(fd.get('lng'));
+
+            if (!payload.address_line || isNaN(payload.barangay_id) || isNaN(payload.lat) || isNaN(payload.lng)) {
+                window.Verde.toast('Please fill in all household fields and pin the map location', 'error');
+                return;
+            }
+        }
+
+        const res = await window.Verde.apiFetch(`/api/v1/admin/users/${currentGroupingUserId}/group-into-household`, {
+            method: 'POST',
+            body: JSON.stringify(payload)
+        });
+
+        if (res.ok) {
+            window.Verde.toast('Resident grouped into household successfully', 'success');
+            groupModal.classList.add('hidden');
+            groupForm.reset();
+            load();
+        } else {
+            window.Verde.toast(res.body?.message ?? 'Failed to group resident', 'error');
+        }
+    });
+
     document.getElementById('filter-apply').addEventListener('click', load);
     document.getElementById('filter-role').addEventListener('change', load);
     document.getElementById('filter-status').addEventListener('change', load);
diff --git a/routes/api.php b/routes/api.php
index 6f1f264..77df388 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -30,6 +30,7 @@ use App\Http\Controllers\Api\V1\Auth\VerifyEmailController;
 use App\Http\Controllers\Api\V1\Auth\VerifyOtpController;
 use App\Http\Controllers\Api\V1\Driver\DriverLocationController;
 use App\Http\Controllers\Api\V1\Driver\DriverTripController;
+use App\Http\Controllers\Api\V1\Helper\HelperAssignmentController;
 use App\Http\Controllers\Api\V1\DropOff\DropOffPointController;
 use App\Http\Controllers\Api\V1\Geo\BarangayController;
 use App\Http\Controllers\Api\V1\Geo\CityMunicipalityController;
@@ -157,6 +158,7 @@ Route::prefix('admin/users')
         Route::post('/{user:uuid}/activate', [AdminUserController::class, 'activate'])->name('activate');
         Route::post('/{user:uuid}/approve-profile', [AdminUserController::class, 'approveProfile'])->name('approve-profile');
         Route::post('/{user:uuid}/reject-profile', [AdminUserController::class, 'rejectProfile'])->name('reject-profile');
+        Route::post('/{user:uuid}/group-into-household', [AdminUserController::class, 'groupIntoHousehold'])->name('group-into-household');
     });
 
 Route::prefix('households')
@@ -326,6 +328,7 @@ Route::prefix('scanner')
     ->name('api.v1.scanner.')
     ->middleware(['auth:sanctum', 'role:scanner,admin'])
     ->group(function () {
+        Route::get('/team-details', [ScannerController::class, 'teamDetails'])->name('team-details');
         Route::post('/scan', [ScannerController::class, 'scan'])->name('scan');
         Route::post('/scan/bulk', [ScannerController::class, 'bulk'])->name('scan.bulk');
     });
@@ -346,6 +349,16 @@ Route::prefix('driver/trips')
         Route::post('/{trip}/complete', [DriverTripController::class, 'complete'])->name('complete');
     });
 
+Route::prefix('helper')
+    ->name('api.v1.helper.')
+    ->middleware(['auth:sanctum', 'role:helper'])
+    ->group(function () {
+        Route::get('/assignment', [HelperAssignmentController::class, 'assignment'])->name('assignment');
+        Route::post('/assignment/accept', [HelperAssignmentController::class, 'accept'])->name('accept');
+        Route::post('/assignment/reject', [HelperAssignmentController::class, 'reject'])->name('reject');
+        Route::get('/history', [HelperAssignmentController::class, 'history'])->name('history');
+    });
+
 Route::middleware('auth:sanctum')->prefix('households')->name('api.v1.households.')->group(function () {
     Route::post('/{household}/reassign-drop-off', [HouseholdController::class, 'reassignDropOff'])
         ->name('reassign-drop-off');
diff --git a/tests/Feature/Api/V1/Admin/AdminHouseholdMemberTest.php b/tests/Feature/Api/V1/Admin/AdminHouseholdMemberTest.php
index ccfea61..6f05cc1 100644
--- a/tests/Feature/Api/V1/Admin/AdminHouseholdMemberTest.php
+++ b/tests/Feature/Api/V1/Admin/AdminHouseholdMemberTest.php
@@ -241,4 +241,120 @@ class AdminHouseholdMemberTest extends TestCase
 
         $response->assertStatus(422);
     }
+
+    public function test_admin_can_transfer_resident_from_another_household_and_clean_it_up(): void
+    {
+        Sanctum::actingAs($this->admin);
+
+        // 1. Create a resident user who heads their own household (default signup scenario)
+        $resident = User::factory()->create([
+            'role' => User::ROLE_RESIDENT,
+            'status' => User::STATUS_ACTIVE,
+        ]);
+
+        $oldHousehold = Household::create([
+            'tenant_id' => $this->defaultTenant->id,
+            'head_user_id' => $resident->id,
+            'barangay_id' => $this->barangay->id,
+            'address_line' => '456 Previous St',
+            'coordinates' => new Point(14.5, 120.5, 4326),
+            'household_size' => 1,
+            'verification_status' => Household::VERIFICATION_APPROVED,
+        ]);
+
+        $oldMember = HouseholdMember::create([
+            'household_id' => $oldHousehold->id,
+            'user_id' => $resident->id,
+            'relationship' => HouseholdMember::RELATIONSHIP_HEAD,
+            'full_name' => $resident->full_name,
+        ]);
+
+        // 2. Transfer them as a child to the new household
+        $payload = [
+            'relationship' => 'child',
+            'user_id' => $resident->id,
+        ];
+
+        $response = $this->postJson("/api/v1/admin/households/{$this->household->uuid}/members", $payload);
+
+        $response->assertStatus(201);
+
+        // 3. Assert they are now a member of the target household
+        $this->assertDatabaseHas('household_members', [
+            'household_id' => $this->household->id,
+            'user_id' => $resident->id,
+            'relationship' => 'child',
+        ]);
+
+        // 4. Assert old membership record is deleted
+        $this->assertSoftDeleted('household_members', [
+            'id' => $oldMember->id,
+        ]);
+
+        // 5. Assert old empty household is deleted
+        $this->assertSoftDeleted('households', [
+            'id' => $oldHousehold->id,
+        ]);
+    }
+
+    public function test_admin_can_transfer_resident_leaving_others_active(): void
+    {
+        Sanctum::actingAs($this->admin);
+
+        // 1. Create old household with head and spouse
+        $head = User::factory()->create(['role' => User::ROLE_RESIDENT]);
+        $spouse = User::factory()->create(['role' => User::ROLE_RESIDENT]);
+
+        $oldHousehold = Household::create([
+            'tenant_id' => $this->defaultTenant->id,
+            'head_user_id' => $head->id,
+            'barangay_id' => $this->barangay->id,
+            'address_line' => '789 Shared St',
+            'coordinates' => new Point(14.5, 120.5, 4326),
+            'household_size' => 2,
+            'verification_status' => Household::VERIFICATION_APPROVED,
+        ]);
+
+        $headMember = HouseholdMember::create([
+            'household_id' => $oldHousehold->id,
+            'user_id' => $head->id,
+            'relationship' => HouseholdMember::RELATIONSHIP_HEAD,
+            'full_name' => $head->full_name,
+        ]);
+
+        $spouseMember = HouseholdMember::create([
+            'household_id' => $oldHousehold->id,
+            'user_id' => $spouse->id,
+            'relationship' => HouseholdMember::RELATIONSHIP_SPOUSE,
+            'full_name' => $spouse->full_name,
+        ]);
+
+        // 2. Transfer spouse to target household
+        $payload = [
+            'relationship' => 'sibling',
+            'user_id' => $spouse->id,
+        ];
+
+        $response = $this->postJson("/api/v1/admin/households/{$this->household->uuid}/members", $payload);
+
+        $response->assertStatus(201);
+
+        // 3. Assert spouse is added to target household
+        $this->assertDatabaseHas('household_members', [
+            'household_id' => $this->household->id,
+            'user_id' => $spouse->id,
+            'relationship' => 'sibling',
+        ]);
+
+        // 4. Assert old household is NOT deleted (since head is still there)
+        $this->assertDatabaseHas('households', [
+            'id' => $oldHousehold->id,
+            'deleted_at' => null,
+        ]);
+
+        // 5. Assert old spouse member is soft deleted
+        $this->assertSoftDeleted('household_members', [
+            'id' => $spouseMember->id,
+        ]);
+    }
 }
diff --git a/tests/Feature/Api/V1/Admin/AdminUserCrudTest.php b/tests/Feature/Api/V1/Admin/AdminUserCrudTest.php
index cd4c45a..7f9c882 100644
--- a/tests/Feature/Api/V1/Admin/AdminUserCrudTest.php
+++ b/tests/Feature/Api/V1/Admin/AdminUserCrudTest.php
@@ -84,7 +84,10 @@ class AdminUserCrudTest extends TestCase
     public function test_admin_can_suspend_and_activate_user(): void
     {
         Sanctum::actingAs($this->admin);
-        $user = User::factory()->create(['status' => User::STATUS_ACTIVE]);
+        $user = User::factory()->create([
+            'role' => User::ROLE_DRIVER,
+            'status' => User::STATUS_ACTIVE,
+        ]);
 
         $this->postJson("/api/v1/admin/users/{$user->uuid}/suspend")
             ->assertOk()
@@ -167,4 +170,147 @@ class AdminUserCrudTest extends TestCase
     {
         $this->getJson('/api/v1/admin/users')->assertStatus(401);
     }
+
+    public function test_resident_activation_requires_super_admin_and_coordinates(): void
+    {
+        $resident = User::factory()->create([
+            'role' => User::ROLE_RESIDENT,
+            'status' => User::STATUS_PENDING,
+        ]);
+
+        Sanctum::actingAs($this->admin);
+        $this->postJson("/api/v1/admin/users/{$resident->uuid}/activate")
+            ->assertStatus(403);
+
+        $superAdmin = User::factory()->create([
+            'role' => User::ROLE_SUPER_ADMIN,
+            'status' => User::STATUS_ACTIVE,
+        ]);
+
+        Sanctum::actingAs($superAdmin);
+        $this->postJson("/api/v1/admin/users/{$resident->uuid}/activate")
+            ->assertStatus(422)
+            ->assertJsonFragment(['message' => 'Resident household must have coordinates pinned before activation']);
+
+        $household = \App\Models\Household::factory()->create([
+            'head_user_id' => $resident->id,
+            'coordinates' => new \MatanYadaev\EloquentSpatial\Objects\Point(14.5995, 120.9842, 4326),
+        ]);
+        \App\Models\HouseholdMember::create([
+            'household_id' => $household->id,
+            'user_id' => $resident->id,
+            'relationship' => \App\Models\HouseholdMember::RELATIONSHIP_HEAD,
+            'full_name' => $resident->full_name,
+        ]);
+
+        $this->postJson("/api/v1/admin/users/{$resident->uuid}/activate")
+            ->assertOk()
+            ->assertJsonPath('data.status', User::STATUS_ACTIVE);
+    }
+
+    public function test_admin_can_group_resident_into_existing_household(): void
+    {
+        Sanctum::actingAs($this->admin);
+
+        $resident = User::factory()->create([
+            'role' => User::ROLE_RESIDENT,
+            'status' => User::STATUS_PENDING,
+        ]);
+
+        $household = \App\Models\Household::factory()->create();
+
+        $response = $this->postJson("/api/v1/admin/users/{$resident->uuid}/group-into-household", [
+            'household_id' => $household->id,
+        ]);
+
+        $response->assertOk()
+            ->assertJsonPath('data.household.id', $household->uuid);
+
+        $this->assertDatabaseHas('household_members', [
+            'household_id' => $household->id,
+            'user_id' => $resident->id,
+            'relationship' => \App\Models\HouseholdMember::RELATIONSHIP_OTHER,
+        ]);
+    }
+
+    public function test_admin_can_group_resident_into_new_household(): void
+    {
+        Sanctum::actingAs($this->admin);
+        $this->seed(\Database\Seeders\SamplePsgcSeeder::class);
+        $barangay = \App\Models\Barangay::firstOrFail();
+
+        $resident = User::factory()->create([
+            'role' => User::ROLE_RESIDENT,
+            'status' => User::STATUS_PENDING,
+        ]);
+
+        $response = $this->postJson("/api/v1/admin/users/{$resident->uuid}/group-into-household", [
+            'address_line' => '123 New Pin Street',
+            'barangay_id' => $barangay->id,
+            'household_size' => 3,
+            'lat' => 14.5995,
+            'lng' => 120.9842,
+        ]);
+
+        $response->assertOk()
+            ->assertJsonPath('data.household.address_line', '123 New Pin Street')
+            ->assertJsonPath('data.household.household_size', 3);
+
+        $this->assertDatabaseHas('households', [
+            'head_user_id' => $resident->id,
+            'address_line' => '123 New Pin Street',
+            'household_size' => 3,
+        ]);
+
+        $this->assertDatabaseHas('household_members', [
+            'user_id' => $resident->id,
+            'relationship' => \App\Models\HouseholdMember::RELATIONSHIP_HEAD,
+        ]);
+    }
+
+    public function test_admin_can_group_resident_with_existing_household_and_clean_it_up(): void
+    {
+        Sanctum::actingAs($this->admin);
+
+        $resident = User::factory()->create([
+            'role' => User::ROLE_RESIDENT,
+            'status' => User::STATUS_ACTIVE,
+        ]);
+
+        $oldHousehold = \App\Models\Household::factory()->create([
+            'head_user_id' => $resident->id,
+        ]);
+
+        $oldMember = \App\Models\HouseholdMember::create([
+            'household_id' => $oldHousehold->id,
+            'user_id' => $resident->id,
+            'relationship' => \App\Models\HouseholdMember::RELATIONSHIP_HEAD,
+            'full_name' => $resident->full_name,
+        ]);
+
+        $newHousehold = \App\Models\Household::factory()->create();
+
+        $response = $this->postJson("/api/v1/admin/users/{$resident->uuid}/group-into-household", [
+            'household_id' => $newHousehold->id,
+        ]);
+
+        $response->assertOk();
+
+        // Check new membership
+        $this->assertDatabaseHas('household_members', [
+            'household_id' => $newHousehold->id,
+            'user_id' => $resident->id,
+            'relationship' => \App\Models\HouseholdMember::RELATIONSHIP_OTHER,
+        ]);
+
+        // Check old membership deleted
+        $this->assertSoftDeleted('household_members', [
+            'id' => $oldMember->id,
+        ]);
+
+        // Check old household deleted
+        $this->assertSoftDeleted('households', [
+            'id' => $oldHousehold->id,
+        ]);
+    }
 }
diff --git a/tests/Feature/Api/V1/Auth/RegisterTest.php b/tests/Feature/Api/V1/Auth/RegisterTest.php
index ee39829..69f3c8d 100644
--- a/tests/Feature/Api/V1/Auth/RegisterTest.php
+++ b/tests/Feature/Api/V1/Auth/RegisterTest.php
@@ -15,13 +15,15 @@ class RegisterTest extends TestCase
     use RefreshDatabase;
 
     private FakeSmsService $fakeSms;
+    private \App\Models\Barangay $barangay;
 
     protected function setUp(): void
     {
         parent::setUp();
-        $this->seed(RoleSeeder::class);
+        $this->seed([RoleSeeder::class, \Database\Seeders\SamplePsgcSeeder::class]);
         $this->fakeSms = new FakeSmsService;
         $this->app->instance(SmsService::class, $this->fakeSms);
+        $this->barangay = \App\Models\Barangay::firstOrFail();
     }
 
     public function test_resident_can_register(): void
@@ -34,6 +36,10 @@ class RegisterTest extends TestCase
             'password' => 'Password123',
             'password_confirmation' => 'Password123',
             'role' => User::ROLE_RESIDENT,
+            'address_line' => '123 Street',
+            'barangay_id' => $this->barangay->id,
+            'lat' => 14.5995,
+            'lng' => 120.9842,
         ];
 
         $response = $this->postJson('/api/v1/auth/register', $payload);
@@ -73,6 +79,10 @@ class RegisterTest extends TestCase
             'password' => 'Password123',
             'password_confirmation' => 'Password123',
             'role' => User::ROLE_RESIDENT,
+            'address_line' => '123 Street',
+            'barangay_id' => $this->barangay->id,
+            'lat' => 14.5995,
+            'lng' => 120.9842,
         ]);
 
         $response->assertStatus(422)
@@ -106,6 +116,10 @@ class RegisterTest extends TestCase
             'password' => 'short',
             'password_confirmation' => 'short',
             'role' => User::ROLE_RESIDENT,
+            'address_line' => '123 Street',
+            'barangay_id' => $this->barangay->id,
+            'lat' => 14.5995,
+            'lng' => 120.9842,
         ]);
 
         $response->assertStatus(422)
diff --git a/tests/Feature/Api/V1/Helper/HelperAssignmentTest.php b/tests/Feature/Api/V1/Helper/HelperAssignmentTest.php
new file mode 100644
index 0000000..13c2c15
--- /dev/null
+++ b/tests/Feature/Api/V1/Helper/HelperAssignmentTest.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Helper;
+
+use App\Models\CollectionTeam;
+use App\Models\TeamMember;
+use App\Models\User;
+use Database\Seeders\RoleSeeder;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class HelperAssignmentTest extends TestCase
+{
+    use RefreshDatabase;
+
+    private User $helper;
+    private CollectionTeam $team;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->seed(RoleSeeder::class);
+
+        $this->helper = User::factory()->create([
+            'role' => User::ROLE_HELPER,
+            'status' => User::STATUS_ACTIVE,
+        ]);
+
+        $this->team = CollectionTeam::create([
+            'name' => 'QC Team Alpha',
+            'status' => CollectionTeam::STATUS_ACTIVE,
+        ]);
+    }
+
+    public function test_helper_can_get_current_assignment(): void
+    {
+        Sanctum::actingAs($this->helper);
+
+        // No assignment initially
+        $response = $this->getJson('/api/v1/helper/assignment');
+        $response->assertOk()
+            ->assertJsonPath('data', null);
+
+        // Assign helper
+        TeamMember::create([
+            'team_id' => $this->team->id,
+            'user_id' => $this->helper->id,
+            'role_in_team' => TeamMember::ROLE_HELPER,
+            'assigned_from' => now()->toDateString(),
+            'status' => TeamMember::STATUS_PENDING,
+        ]);
+
+        $response = $this->getJson('/api/v1/helper/assignment');
+        $response->assertOk()
+            ->assertJsonPath('data.status', TeamMember::STATUS_PENDING)
+            ->assertJsonPath('data.team.name', $this->team->name);
+    }
+
+    public function test_helper_can_accept_assignment(): void
+    {
+        Sanctum::actingAs($this->helper);
+
+        TeamMember::create([
+            'team_id' => $this->team->id,
+            'user_id' => $this->helper->id,
+            'role_in_team' => TeamMember::ROLE_HELPER,
+            'assigned_from' => now()->toDateString(),
+            'status' => TeamMember::STATUS_PENDING,
+        ]);
+
+        $response = $this->postJson('/api/v1/helper/assignment/accept');
+        $response->assertOk()
+            ->assertJsonPath('data.status', TeamMember::STATUS_ACCEPTED);
+
+        $this->assertDatabaseHas('team_members', [
+            'user_id' => $this->helper->id,
+            'status' => TeamMember::STATUS_ACCEPTED,
+        ]);
+    }
+
+    public function test_helper_can_reject_assignment(): void
+    {
+        Sanctum::actingAs($this->helper);
+
+        TeamMember::create([
+            'team_id' => $this->team->id,
+            'user_id' => $this->helper->id,
+            'role_in_team' => TeamMember::ROLE_HELPER,
+            'assigned_from' => now()->toDateString(),
+            'status' => TeamMember::STATUS_PENDING,
+        ]);
+
+        $response = $this->postJson('/api/v1/helper/assignment/reject');
+        $response->assertOk()
+            ->assertJsonPath('data.status', TeamMember::STATUS_REJECTED);
+
+        $this->assertDatabaseHas('team_members', [
+            'user_id' => $this->helper->id,
+            'status' => TeamMember::STATUS_REJECTED,
+        ]);
+    }
+
+    public function test_helper_can_get_assignment_history(): void
+    {
+        Sanctum::actingAs($this->helper);
+
+        // Create 2 past assignments
+        TeamMember::create([
+            'team_id' => $this->team->id,
+            'user_id' => $this->helper->id,
+            'role_in_team' => TeamMember::ROLE_HELPER,
+            'assigned_from' => now()->subDays(2)->toDateString(),
+            'assigned_until' => now()->subDays(2)->toDateString(),
+            'status' => TeamMember::STATUS_ACCEPTED,
+        ]);
+
+        TeamMember::create([
+            'team_id' => $this->team->id,
+            'user_id' => $this->helper->id,
+            'role_in_team' => TeamMember::ROLE_HELPER,
+            'assigned_from' => now()->subDays(1)->toDateString(),
+            'assigned_until' => now()->subDays(1)->toDateString(),
+            'status' => TeamMember::STATUS_REJECTED,
+        ]);
+
+        $response = $this->getJson('/api/v1/helper/history');
+        $response->assertOk()
+            ->assertJsonCount(2, 'data');
+    }
+
+    public function test_non_helper_blocked_from_helper_endpoints(): void
+    {
+        $driver = User::factory()->create([
+            'role' => User::ROLE_DRIVER,
+            'status' => User::STATUS_ACTIVE,
+        ]);
+
+        Sanctum::actingAs($driver);
+
+        $this->getJson('/api/v1/helper/assignment')->assertStatus(403);
+    }
+}
diff --git a/tests/Feature/Api/V1/Qr/QrBatchTest.php b/tests/Feature/Api/V1/Qr/QrBatchTest.php
index c480f86..88de2f3 100644
--- a/tests/Feature/Api/V1/Qr/QrBatchTest.php
+++ b/tests/Feature/Api/V1/Qr/QrBatchTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Feature\Api\V1\Qr;
 
+use App\Models\Household;
 use App\Models\QrCode;
 use App\Models\QrCodeBatch;
 use App\Models\User;
@@ -30,10 +31,12 @@ class QrBatchTest extends TestCase
     public function test_admin_can_generate_batch(): void
     {
         Sanctum::actingAs($this->admin);
+        $household = Household::factory()->create();
 
         $response = $this->postJson('/api/v1/admin/qr-batches', [
             'quantity' => 24,
             'purpose' => QrCodeBatch::PURPOSE_FREE,
+            'household_id' => $household->uuid,
         ]);
 
         $response->assertCreated()
diff --git a/tests/Feature/Api/V1/Team/TeamCrudTest.php b/tests/Feature/Api/V1/Team/TeamCrudTest.php
index 327155f..d6dbb56 100644
--- a/tests/Feature/Api/V1/Team/TeamCrudTest.php
+++ b/tests/Feature/Api/V1/Team/TeamCrudTest.php
@@ -104,6 +104,62 @@ class TeamCrudTest extends TestCase
         $this->assertSame(2, $team->helpers()->count());
     }
 
+    public function test_admin_can_create_team_with_random_helper_assignment(): void
+    {
+        Sanctum::actingAs($this->admin);
+
+        // Create 3 active helper users
+        User::factory()->count(3)->create(['role' => User::ROLE_HELPER, 'status' => User::STATUS_ACTIVE]);
+
+        $response = $this->postJson('/api/v1/admin/teams', [
+            'name' => 'Random Team',
+            'helper_count' => 2,
+            'helper_assignment_mode' => 'random',
+        ]);
+
+        $response->assertCreated();
+        $team = CollectionTeam::where('name', 'Random Team')->first();
+        $this->assertSame(2, $team->helpers()->count());
+    }
+
+    public function test_admin_cannot_create_team_with_random_helper_assignment_if_insufficient_available_helpers(): void
+    {
+        Sanctum::actingAs($this->admin);
+
+        // Only 1 helper available
+        User::factory()->create(['role' => User::ROLE_HELPER, 'status' => User::STATUS_ACTIVE]);
+
+        $response = $this->postJson('/api/v1/admin/teams', [
+            'name' => 'Unsatisfied Random Team',
+            'helper_count' => 2,
+            'helper_assignment_mode' => 'random',
+        ]);
+
+        $response->assertStatus(422)
+            ->assertJsonValidationErrors(['helper_count']);
+    }
+
+    public function test_admin_can_create_team_with_manual_helper_assignment(): void
+    {
+        Sanctum::actingAs($this->admin);
+
+        $helper1 = User::factory()->create(['role' => User::ROLE_HELPER, 'status' => User::STATUS_ACTIVE]);
+        $helper2 = User::factory()->create(['role' => User::ROLE_HELPER, 'status' => User::STATUS_ACTIVE]);
+
+        $response = $this->postJson('/api/v1/admin/teams', [
+            'name' => 'Manual Team',
+            'helper_count' => 2,
+            'helper_assignment_mode' => 'manual',
+            'helper_ids' => [$helper1->id, $helper2->id],
+        ]);
+
+        $response->assertCreated();
+        $team = CollectionTeam::where('name', 'Manual Team')->first();
+        $assignedHelperIds = $team->helpers()->pluck('user_id')->toArray();
+        $this->assertContains($helper1->id, $assignedHelperIds);
+        $this->assertContains($helper2->id, $assignedHelperIds);
+    }
+
     public function test_resident_blocked(): void
     {
         $resident = User::factory()->create(['role' => User::ROLE_RESIDENT, 'status' => User::STATUS_ACTIVE]);