diff --git a/post.php b/post.php
index 40a878d0..6ec69559 100644
--- a/post.php
+++ b/post.php
@@ -71,6 +71,8 @@ require_once "post/tax.php";
 
 require_once "post/ticket.php";
 
+require_once "post/tasks.php";
+
 require_once "post/transfer.php";
 
 require_once "post/trip.php";
@@ -85,5 +87,3 @@ require_once "post/ai.php";
 
 require_once "post/misc.php";
 
-
-?>
diff --git a/post/tasks.php b/post/tasks.php
new file mode 100644
index 00000000..4346d405
--- /dev/null
+++ b/post/tasks.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * ITFlow - GET/POST request handler for tasks
+ */
+
+if (isset($_POST['add_task'])) {
+
+    validateTechRole();
+
+    $ticket_id = intval($_POST['ticket_id']);
+    $name = sanitizeInput($_POST['name']);
+    $description = sanitizeInput($_POST['description']);
+
+    // Get Client ID from tickets using the ticket_id
+    $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id");
+    $row = mysqli_fetch_array($sql);
+    $client_id = intval($row['ticket_client_id']);
+
+    
+    mysqli_query($mysqli, "INSERT INTO tasks SET task_name = '$name', task_description = '$description', task_ticket_id = $ticket_id");
+
+    $task_id = mysqli_insert_id($mysqli);
+
+    // Logging
+    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task', log_action = 'Create', log_description = '$session_name created task $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $task_id");
+
+    $_SESSION['alert_message'] = "You created Task <strong>$name</strong>";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+}
+
+
+if (isset($_GET['delete_task'])) {
+
+    validateTechRole();
+
+    $task_id = intval($_GET['delete_task']);
+
+    // Get Client ID, task name from tasks and tickets using the task_id
+    $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id");
+    $row = mysqli_fetch_array($sql);
+    $client_id = intval($row['ticket_client_id']);
+    $task_name = sanitizeInput($row['task_name']);
+
+    mysqli_query($mysqli, "DELETE FROM tasks WHERE task_id = $task_id");
+
+    // Logging
+    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task', log_action = 'Delete', log_description = '$session_name deleted task $task_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $task_id");
+
+    $_SESSION['alert_type'] = "error";
+    $_SESSION['alert_message'] = "You created Task <strong>$task_name</strong>";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+}
\ No newline at end of file
diff --git a/task_add_modal.php b/task_add_modal.php
new file mode 100644
index 00000000..4f0b3317
--- /dev/null
+++ b/task_add_modal.php
@@ -0,0 +1,45 @@
+<div class="modal" id="addTaskModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-tasks mr-2"></i>Creating a task: <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong> - <?php echo $client_name; ?></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <label>Name <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" placeholder="Name the task" required autofocus>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Description</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="description" placeholder="Description of the task">
+                        </div>
+                    </div>
+                
+                </div>
+
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="add_task" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+
+            </form>
+
+        </div>
+    </div>
+</div>
diff --git a/task_edit_modal.php b/task_edit_modal.php
new file mode 100644
index 00000000..96a6a711
--- /dev/null
+++ b/task_edit_modal.php
@@ -0,0 +1,45 @@
+<div class="modal" id="editTaskModal<?php echo $task_id; ?>" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-tasks mr-2"></i>Editing task: <strong><?php echo $task_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="task_id" value="<?php echo $task_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <label>Name <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" placeholder="Name the task" value="<?php echo $task_name; ?>" required autofocus>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Description</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="description" placeholder="Description of the task" value="<?php echo $task_description; ?>">
+                        </div>
+                    </div>
+                
+                </div>
+
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="edit_task" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+
+            </form>
+
+        </div>
+    </div>
+</div>
diff --git a/ticket.php b/ticket.php
index 2b030fd7..da8f92ab 100644
--- a/ticket.php
+++ b/ticket.php
@@ -237,6 +237,10 @@ if (isset($_GET['ticket_id'])) {
             AND ticket_attachment_ticket_id = $ticket_id"
         );
 
+
+        // Get Tasks
+        $sql_tasks = mysqli_query( $mysqli, "SELECT * FROM tasks WHERE task_ticket_id = $ticket_id ORDER BY task_created_at ASC");
+
 ?>
 
         <!-- Breadcrumbs-->
@@ -264,6 +268,9 @@ if (isset($_GET['ticket_id'])) {
                                 <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">
                                     <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                 </a>
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addTaskModal">
+                                    <i class="fas fa-fw fa-tasks mr-2"></i>Create Task
+                                </a>
                                 <a class="dropdown-item" href="#" data-toggle="modal" data-target="#mergeTicketModal<?php echo $ticket_id; ?>">
                                     <i class="fas fa-fw fa-clone mr-2"></i>Merge
                                 </a>
@@ -933,6 +940,33 @@ if (isset($_GET['ticket_id'])) {
                     <?php } ?>
                 </div>
 
+
+                <!-- Tasks card -->
+                <?php if (mysqli_num_rows($sql_tasks) > 0) { ?>
+                    <div class="card card-body card-outline card-dark mb-3">
+                        <h5 class="text-secondary"><i class="fa fa-fw fa-tasks mr-2"></i>Tasks</h5>
+
+                        <?php
+                        // Get Watchers
+                        while ($row = mysqli_fetch_array($sql_tasks)) {
+                            $task_id = intval($row['task_id']);
+                            $task_name = nullable_htmlentities($row['task_name']);
+                            $task_description = nullable_htmlentities($row['task_description']);
+                            ?>
+                            <div class='mt-1'>
+                                <i class="fa fa-fw fa-checkmark text-secondary mr-2"></i><?php echo $task_name; ?>
+                                <?php if ($ticket_status !== "Closed") { ?>
+                                    <a class="confirm-link float-right" href="post.php?delete_task=<?php echo $task_id; ?>">
+                                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
+                                    </a>
+                                <?php } ?>
+                            </div>
+
+                        <?php } ?>
+                    </div>
+                <?php } ?>
+                <!-- End Tasks card -->
+
             </div> <!-- End col-3 -->
 
         </div> <!-- End row -->
@@ -956,6 +990,8 @@ if (isset($_GET['ticket_id'])) {
 
         require_once "ticket_merge_modal.php";
 
+        require_once "task_add_modal.php";
+
         if ($config_module_enable_accounting) {
             require_once "ticket_edit_billable_modal.php";
             require_once "ticket_invoice_add_modal.php";