diff --git a/db.json b/db.json
index b7b09cf..7eab90a 100644
--- a/db.json
+++ b/db.json
@@ -1,30 +1,34 @@
 {
-    "tasks":
-    [
-        { 
-            "id": 1, 
-            "title": "Buy groceries", 
-            "completed": false 
-        },
-        { 
-            "id": 2, 
-            "title": "Finish React project", 
-            "completed": false 
-        },
-        { 
-            "id": 3, 
-            "title": "Call the bank", 
-            "completed": true 
-        },
-        { 
-            "id": 4, 
-            "title": "Walk the dog", 
-            "completed": false 
-        },
-        { 
-            "id": 5, 
-            "title": "Read a book", 
-            "completed": true 
-        }
-    ]
+  "tasks": [
+    {
+      "id": "1",
+      "title": "Buy groceries",
+      "completed": false
+    },
+    {
+      "id": "2",
+      "title": "Finish React project",
+      "completed": false
+    },
+    {
+      "id": "3",
+      "title": "Call the bank",
+      "completed": false
+    },
+    {
+      "id": "4",
+      "title": "Walk the dog",
+      "completed": false
+    },
+    {
+      "id": "5",
+      "title": "Read a book",
+      "completed": false
+    },
+    {
+      "id": "0526",
+      "title": "Exercise",
+      "completed": false
+    }
+  ]
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index d365b3d..52e8957 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "technical-lesson-react-hooks-task-manager",
+  "name": "react-hooks-task-manager-lab",
   "version": "0.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "technical-lesson-react-hooks-task-manager",
+      "name": "react-hooks-task-manager-lab",
       "version": "0.0.0",
       "dependencies": {
         "@vitejs/plugin-react": "^4.3.4",
diff --git a/src/components/App.jsx b/src/components/App.jsx
index 9394aab..48693a5 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -4,14 +4,14 @@ import TaskForm from "./TaskForm";
 import SearchBar from "./SearchBar";
 
 function App() {
-  const [tasks, setTasks] = useState([]);
+  const { tasks, setTasks } = useContext(TaskContext);
 
   useEffect(() => {
     fetch('http://localhost:6001/tasks')
-    .then(r=>r.json())
-    .then(data=>setTasks(data))
-    
-  }, []);
+      .then(r => r.json())
+      .then(data => setTasks(data))
+
+  }, [setTasks]);
 
   return (
     <div>
diff --git a/src/components/SearchBar.jsx b/src/components/SearchBar.jsx
index ef44c20..cf17a96 100644
--- a/src/components/SearchBar.jsx
+++ b/src/components/SearchBar.jsx
@@ -1,24 +1,28 @@
-import React, { useRef, useState, useContext } from "react";
+import React, { useRef, useState, useContext, useEffect } from "react";
 import TaskList from "./TaskList";
 import { TaskContext } from "../context/TaskContext";
 
 function SearchBar() {
   const [query, setQuery] = useState("");
-
+  const searchRef = useRef(null);
   function handleSearch(e) {
     setQuery(e.target.value);
   }
 
+  useEffect(() => {
+    searchRef.current.focus();
+  }, []);
 
   return (
     <div>
       <input
+        ref={searchRef}
         type="text"
         placeholder="Search tasks..."
         value={query}
         onChange={handleSearch}
       />
-      <TaskList query={query}/>
+      <TaskList query={query} />
     </div>
   );
 }
diff --git a/src/components/TaskForm.jsx b/src/components/TaskForm.jsx
index ab2b6f9..0d54216 100644
--- a/src/components/TaskForm.jsx
+++ b/src/components/TaskForm.jsx
@@ -3,17 +3,21 @@ import { TaskContext } from "../context/TaskContext";
 
 function TaskForm() {
   const [taskName, setTaskName] = useState("");
+  const inputId = useId();
+  const { addTask } = useContext(TaskContext);
 
   function handleSubmit(e) {
     e.preventDefault();
     if (taskName.trim() === "") return;
+    addTask(taskName);
     setTaskName("");
   }
 
   return (
     <form onSubmit={handleSubmit}>
-      <label>New Task:</label>
+      <label htmlFor={inputId} >New Task:</label>
       <input
+        id={inputId}
         type="text"
         value={taskName}
         onChange={(e) => setTaskName(e.target.value)}
diff --git a/src/components/TaskList.jsx b/src/components/TaskList.jsx
index 0bf6249..5b43a2b 100644
--- a/src/components/TaskList.jsx
+++ b/src/components/TaskList.jsx
@@ -1,9 +1,10 @@
-import React, { useContext,useState } from "react";
+import React, { useContext, useState } from "react";
 import { TaskContext } from "../context/TaskContext";
 
-function TaskList({query}) {
-    const [tasks, setTasks] = useState([]);
-    const filteredTasks = tasks.filter(task =>
+function TaskList({ query }) {
+  const { tasks, toggleComplete } = useContext(TaskContext);
+
+  const filteredTasks = tasks.filter(task =>
     task.title.toLowerCase().includes(query.toLowerCase())
   );
 
@@ -14,7 +15,7 @@ function TaskList({query}) {
           <span style={{ textDecoration: task.completed ? "line-through" : "none" }}>
             {task.title}
           </span>
-          <button data-testid={task.id}>
+          <button onClick={() => toggleComplete(task.id, task.completed)} data-testid={task.id}>
             {task.completed ? "Undo" : "Complete"}
           </button>
         </li>
diff --git a/src/context/TaskContext.jsx b/src/context/TaskContext.jsx
index 6781cdd..c7ac048 100644
--- a/src/context/TaskContext.jsx
+++ b/src/context/TaskContext.jsx
@@ -3,4 +3,38 @@ import React, { createContext, useState } from "react";
 export const TaskContext = createContext();
 
 export function TaskProvider({ children }) {
+    const [tasks, setTasks] = useState([]);
+
+    function toggleComplete(id, currentStatus) {
+        fetch(`http://localhost:6001/tasks/${id}`, {
+            method: "PATCH",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ completed: !currentStatus })
+        })
+            .then(r => r.json())
+            .then(updatedTask => {
+                setTasks(prev => prev.map(task => (task.id === id ? updatedTask : task)))
+            });
+    }
+
+    function addTask(taskTitle) {
+        fetch("http://localhost:6001/tasks", {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+                title: taskTitle,
+                completed: false
+            })
+        })
+            .then(r => r.json())
+            .then(savedTask => {
+                setTasks(prevTasks => [...prevTasks, savedTask])
+            })
+    }
+
+    return (
+        < TaskContext.Provider value={{ tasks, setTasks, toggleComplete, addTask }} >
+            {children}
+        </TaskContext.Provider>
+    )
 }
diff --git a/src/main.jsx b/src/main.jsx
index cb48fb7..5f73088 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -4,7 +4,7 @@ import './index.css'
 import App from './components/App.jsx'
 import { TaskProvider } from './context/TaskContext.jsx'
 createRoot(document.getElementById('root')).render(
-  <StrictMode>
-      <App />
-  </StrictMode>,
+  <TaskProvider>
+    <App />
+  </TaskProvider>,
 )