diff --git a/backend-server/src/index.ts b/backend-server/src/index.ts
index a5f456c..0532900 100644
--- a/backend-server/src/index.ts
+++ b/backend-server/src/index.ts
@@ -271,8 +271,8 @@ app.post("/api/delivery/create", async(req,res)=>{
 })
 
 //TODO: Check create and read from frontend
+//TODO: Add another Field to DeliverySchema called "isCompleted: boolean" - remove the table from DB FIRST
 //TODO: FIx the file structure
-//TODO: delivery Create
 //TODO: delivery Update
 //TODO: delivery Delete
 
diff --git a/src/app/components/pages/client-service/client-service.component.html b/src/app/components/pages/client-service/client-service.component.html
index 5b9042f..fcec6ac 100644
--- a/src/app/components/pages/client-service/client-service.component.html
+++ b/src/app/components/pages/client-service/client-service.component.html
@@ -38,4 +38,6 @@
             <button type="submit" [disabled]="clientForm.invalid">Add</button>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
+<!-- TODO: ADD Remarks Input -->
+ <!-- TODO: Add Option Selection Pattrn in Status and type Input -->
\ No newline at end of file
diff --git a/src/app/components/pages/client-service/client-service.component.scss b/src/app/components/pages/client-service/client-service.component.scss
index e69de29..9331b72 100644
--- a/src/app/components/pages/client-service/client-service.component.scss
+++ b/src/app/components/pages/client-service/client-service.component.scss
@@ -0,0 +1,2 @@
+// TODO: Style the Input fields
+// TODO: Style the Table
\ No newline at end of file
diff --git a/src/app/components/pages/client-service/client-service.component.ts b/src/app/components/pages/client-service/client-service.component.ts
index a819658..8008a80 100644
--- a/src/app/components/pages/client-service/client-service.component.ts
+++ b/src/app/components/pages/client-service/client-service.component.ts
@@ -5,6 +5,13 @@ import { DeliveryModel } from './client-service.model';
 import { Subscription } from 'rxjs';
 import { FormsModule } from '@angular/forms';
 
+// ###############################################
+// TODO: Client-Service
+// Hide the Full Task if the isCompleted Field is true
+// Add button for update
+
+
+
 @Component({
   selector: 'app-client-service',
   standalone: true,
diff --git a/src/app/components/pages/client-service/client-service.service.ts b/src/app/components/pages/client-service/client-service.service.ts
index 3b3c7aa..113b102 100644
--- a/src/app/components/pages/client-service/client-service.service.ts
+++ b/src/app/components/pages/client-service/client-service.service.ts
@@ -7,6 +7,8 @@ import { Observable } from "rxjs";
     providedIn: 'root'
   })
 
+//TODO: change the URI of the Delivery API after Full development
+
 export class ClientDeliveryService {
 
     constructor(private httpClient: HttpClient){}
diff --git a/src/app/components/pages/dashboard/dashboard-data.ts b/src/app/components/pages/dashboard/dashboard-data.ts
index 02836e5..730c315 100644
--- a/src/app/components/pages/dashboard/dashboard-data.ts
+++ b/src/app/components/pages/dashboard/dashboard-data.ts
@@ -114,7 +114,7 @@ export const service_links: navLink[] =[
   export const shift_tasks = [
     {
       "name" : "Client Delivery",
-      "url" : "http://localhost:12180/delivery"
+      "url" : "http://localhost:12180/delivery" //TODO: Fix the localhost Name after full client delivery development
     },
     {
       "name": "Monitoring Screenshots list",