@@ -314,6 +314,7 @@ const TaskAddModal = () => {
   const [isPending, startTransition] = useTransition();
   const [description, setDescription] = useState("");
   const [selectedDifficulty, setSelectedDifficulty] = useState<string>("");
+  const [deadline, setDeadline] = useState<string>(""); // NEW: Deadline state
   const user = useUserStore((state) => state.user);
   const [supabase, setSupabase] = useState<any>(null);
 
@@ -338,6 +339,7 @@ const TaskAddModal = () => {
     setDescription("");
     setMainAssignee("");
     setSidekicks([]);
+    setDeadline(""); // NEW: Reset deadline
     onClose();
   };
 
@@ -382,6 +384,13 @@ const TaskAddModal = () => {
       const calculatedPoints = getPointsFromDifficulty(selectedDifficulty);
       formData.set("points", calculatedPoints.toString());
 
+      // NEW: Add deadline to formData if set
+      if (deadline) {
+        // Convert to ISO string for database
+        const deadlineISO = new Date(deadline).toISOString();
+        formData.append("deadline", deadlineISO);
+      }
+
       const image = formData.get("image");
       if (image && image instanceof File) {
         formData.append("image", image);
@@ -476,6 +485,7 @@ const TaskAddModal = () => {
                 readOnly
               />
             </div>
+            
             <div className="space-y-2">
               <Label className="text-sm font-medium">Priority</Label>
               <Select name="priority">
@@ -575,6 +585,28 @@ const TaskAddModal = () => {
             </div>
           </div>
 
+          {/* NEW: Deadline Field - Full width for better UX */}
+          <div className="space-y-2">
+            <Label htmlFor="deadline" className="text-sm font-medium">
+              Deadline{" "}
+              <span className="ml-2 text-xs font-normal text-gray-500">
+                (Optional - Set a specific date and time)
+              </span>
+            </Label>
+            <Input
+              id="deadline"
+              name="deadline"
+              type="datetime-local"
+              value={deadline}
+              onChange={(e) => setDeadline(e.target.value)}
+              className="bg-light-900 dark:bg-dark-200 dark:text-light-900 focus:border-customBlue-500 border border-gray-300"
+              placeholder="Select deadline"
+            />
+            <p className="text-xs text-gray-500 dark:text-gray-400">
+              Set a hard deadline with specific time for this task
+            </p>
+          </div>
+
           <div className="grid grid-cols-1 gap-6 md:grid-cols-2">
             <div className="space-y-2">
               <Label className="text-sm font-medium">
 
@@ -4,13 +4,25 @@ import { revalidatePath } from "next/cache";
 import { Task } from "@/types/home/codev";
 import { createClientServerComponent } from "@/utils/supabase/server";
 
+// =============================================================================
+// TYPE DEFINITIONS
+// =============================================================================
+
 interface CodevMember {
   id: string;
   first_name: string;
   last_name: string;
   image_url?: string | null;
 }
 
+// =============================================================================
+// TASK OPERATIONS
+// =============================================================================
+
+/**
+ * Updates a task's column assignment (for drag-and-drop)
+ * Line 18-37
+ */
 export const updateTaskColumnId = async (
   taskId: string,
   newColumnId: string,
@@ -35,6 +47,11 @@ export const updateTaskColumnId = async (
   }
 };
 
+/**
+ * Fetches available team members for task assignment
+ * Prioritizes team leader, then sorts members alphabetically
+ * Line 39-107
+ */
 export const fetchAvailableMembers = async (
   projectId: string,
 ): Promise<CodevMember[]> => {
@@ -95,12 +112,19 @@ export const fetchAvailableMembers = async (
   return members.sort((a, b) => a.first_name.localeCompare(b.first_name));
 };
 
+/**
+ * Creates a new task with all fields including deadline
+ * ENHANCED: Added deadline field support
+ * created_at is auto-generated by database default
+ * Line 109-178
+ */
 export const createNewTask = async (
   formData: FormData,
 ): Promise<{ success: boolean; error?: string }> => {
   const supabase = await createClientServerComponent();
 
   try {
+    // Extract all form fields
     const title = formData.get("title")?.toString();
     const description = formData.get("description")?.toString();
     const priority = formData.get("priority")?.toString();
@@ -117,11 +141,23 @@ export const createNewTask = async (
       .filter(Boolean);
     const skill_category_id = formData.get("skill_category_id")?.toString();
     const created_by = formData.get("created_by")?.toString();
-
+    
+    // ENHANCED: Extract deadline field (nullable)
+    const rawDeadline = formData.get("deadline")?.toString();
+    const deadline = rawDeadline && rawDeadline !== "" && rawDeadline !== "null" 
+      ? new Date(rawDeadline).toISOString() 
+      : null;
+
+    // Validate required fields
     if (!title || !kanban_column_id || !skill_category_id) {
-      return { success: false, error: "Required fields are missing (title, column, and skill category)" };
+      return { 
+        success: false, 
+        error: "Required fields are missing (title, column, and skill category)" 
+      };
     }
 
+    // Insert task with deadline support
+    // Note: created_at is auto-generated by database default (now())
     const { error } = await supabase.from("tasks").insert([
       {
         title,
@@ -136,6 +172,7 @@ export const createNewTask = async (
         sidekick_ids,
         skill_category_id,
         created_by,
+        deadline, // ENHANCED: Include deadline field
       },
     ]);
 
@@ -173,20 +210,34 @@ export const createNewTask = async (
   }
 };
 
+/**
+ * Updates an existing task with all fields including deadline
+ * ENHANCED: Added deadline field support
+ * Line 180-252
+ */
 export const updateTask = async (
   formData: FormData,
   taskId: string,
 ): Promise<{ success: boolean; error?: string }> => {
   const supabase = await createClientServerComponent();
 
   try {
-    // Handle BOTH UUID fields properly
+    // Handle UUID fields properly (codev_id, skill_category_id)
     const rawCodevId = formData.get("codev_id")?.toString();
     const codev_id = rawCodevId === "" || rawCodevId === "null" ? null : rawCodevId;
 
     const rawSkillCategoryId = formData.get("skill_category_id")?.toString();
-    const skill_category_id = rawSkillCategoryId === "" || rawSkillCategoryId === "null" ? null : rawSkillCategoryId;
+    const skill_category_id = rawSkillCategoryId === "" || rawSkillCategoryId === "null" 
+      ? null 
+      : rawSkillCategoryId;
+
+    // ENHANCED: Handle deadline field properly
+    const rawDeadline = formData.get("deadline")?.toString();
+    const deadline = rawDeadline && rawDeadline !== "" && rawDeadline !== "null"
+      ? new Date(rawDeadline).toISOString()
+      : null;
 
+    // Prepare update data
     const updateData = {
       title: formData.get("title")?.toString(),
       description: formData.get("description")?.toString(),
@@ -200,9 +251,11 @@ export const updateTask = async (
         : [],
       skill_category_id: skill_category_id,
       codev_id: codev_id,
+      deadline: deadline, // ENHANCED: Include deadline in updates
       updated_at: new Date().toISOString(),
     };
 
+    // Validate task exists before updating
     const { data: existingTask, error: fetchError } = await supabase
       .from("tasks")
       .select("*")
@@ -214,6 +267,7 @@ export const updateTask = async (
       return { success: false, error: "Could not find task to update" };
     }
 
+    // Perform update
     const { error: updateError } = await supabase
       .from("tasks")
       .update({
@@ -237,6 +291,10 @@ export const updateTask = async (
   }
 };
 
+/**
+ * Deletes a task and revalidates the kanban board path
+ * Line 254-295
+ */
 export const deleteTask = async (
   taskId: string,
 ): Promise<{ success: boolean; error?: string }> => {
@@ -288,6 +346,14 @@ export const deleteTask = async (
   }
 };
 
+// =============================================================================
+// COLUMN OPERATIONS
+// =============================================================================
+
+/**
+ * Creates a new kanban column with auto-incremented position
+ * Line 297-333
+ */
 export const createNewColumn = async (
   columnName: string,
   boardId: string,
@@ -332,6 +398,10 @@ export const createNewColumn = async (
   }
 };
 
+/**
+ * Updates column position (for drag-and-drop column reordering)
+ * Line 335-361
+ */
 export const updateColumnPosition = async (
   columnId: string,
   newPosition: number,
@@ -361,6 +431,10 @@ export const updateColumnPosition = async (
   }
 };
 
+/**
+ * Deletes a kanban column
+ * Line 363-382
+ */
 export const deleteColumn = async (
   columnId: string,
 ): Promise<{ success: boolean; error?: string }> => {
@@ -384,6 +458,10 @@ export const deleteColumn = async (
   }
 };
 
+/**
+ * Updates column name
+ * Line 384-408
+ */
 export const updateColumnName = async (
   columnId: string,
   newName: string,
@@ -412,14 +490,24 @@ export const updateColumnName = async (
   }
 };
 
+// =============================================================================
+// POINTS & LEVELING SYSTEM
+// =============================================================================
+
+/**
+ * Internal function to update developer levels based on points
+ * Calculates level for each skill category based on accumulated points
+ * Line 410-458
+ */
 const updateDeveloperLevels = async (codevId?: string) => {
   if (!codevId) return;
 
   const supabase = await createClientServerComponent();
 
   const { data: pointsData, error: pointsError } = await supabase
     .from("codev_points")
-    .select("skill_category_id, points");
+    .select("skill_category_id, points")
+    .eq("codev_id", codevId);
 
   if (pointsError) {
     console.error("Error fetching points:", pointsError);
@@ -458,7 +546,15 @@ const updateDeveloperLevels = async (codevId?: string) => {
   }
 };
 
-// RESOLVED: Comprehensive completeTask implementation with RPC fallback
+/**
+ * Completes a task with comprehensive point distribution
+ * - Archives task instead of deleting for data preservation
+ * - Awards 100% points to primary assignee
+ * - Awards 50% points to sidekicks
+ * - Updates developer levels for all participants
+ * - Falls back to manual implementation if RPC function unavailable
+ * Line 460-631
+ */
 export const completeTask = async (
   task: Task,
 ): Promise<{ success: boolean; error?: string }> => {
@@ -637,6 +733,15 @@ export const completeTask = async (
   }
 };
 
+// =============================================================================
+// BATCH OPERATIONS
+// =============================================================================
+
+/**
+ * Batch updates multiple tasks' column assignments
+ * Used for optimizing drag-and-drop performance
+ * Line 633-657
+ */
 export async function batchUpdateTasks(
   updates: Array<{ taskId: string; newColumnId: string }>,
 ) {
@@ -666,6 +771,14 @@ export async function batchUpdateTasks(
   }
 }
 
+// =============================================================================
+// TASK SPECIFIC OPERATIONS
+// =============================================================================
+
+/**
+ * Updates a task's PR link
+ * Line 659-700
+ */
 export async function updateTaskPRLink(taskId: string, prLink: string) {
   const supabase = await createClientServerComponent();
   try {
@@ -716,6 +829,10 @@ export async function updateTaskPRLink(taskId: string, prLink: string) {
   }
 }
 
+/**
+ * Unarchives a previously archived task
+ * Line 702-743
+ */
 export async function unarchiveTask(taskId: string) {
   const supabase = await createClientServerComponent();
   try {
 
@@ -302,6 +302,7 @@ export interface Task {
   difficulty?: string;
   type?: string;
   due_date?: string;
+  deadline?: string; 
   kanban_column_id?: string; // UUID
   codev_id?: string; // UUID (primary assignee)
   created_by?: string; // UUID