diff --git a/.idea/misc.xml b/.idea/misc.xml
index a6e1098..ce095e3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
diff --git a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
new file mode 100644
index 0000000..6949c9a
--- /dev/null
+++ b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
@@ -0,0 +1,114 @@
+package com.devspace.taskbeats
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Button
+import android.widget.Spinner
+import android.widget.TextView
+import androidx.core.view.isVisible
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.textfield.TextInputEditText
+
+class CreateOrUpdateTaskBottomSheet(
+    private val categoryList: List<CategoryUiData>,
+    private val task: TaskUiData? = null,
+    private val onCreateClicked: (TaskUiData) -> Unit,
+    private val onUpdateClicked: (TaskUiData) -> Unit,
+    private val onDeleteClicked: (TaskUiData) -> Unit
+) : BottomSheetDialogFragment() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view = inflater.inflate(R.layout.create_or_update_task_bottom_sheet, container, false)
+        val btnCreateOrUpdate = view.findViewById<Button>(R.id.btn_task_create_or_update)
+        val btnDelete = view.findViewById<Button>(R.id.btn_task_delete)
+        val tvTitle = view.findViewById<TextView>(R.id.tv_title)
+        val tieTaskName = view.findViewById<TextInputEditText>(R.id.tie_task_name)
+        val catSpin = view.findViewById<Spinner>(R.id.category_list)
+        var taskCategory: String? = null
+        val categoryStr: List<String> = categoryList.map { it.name }
+        ArrayAdapter(
+            requireActivity().baseContext,
+            android.R.layout.simple_spinner_item,
+            categoryStr.toList()
+        ).also { adapter ->
+            adapter.setDropDownViewResource(android.R.layout.simple_spinner_item)
+            catSpin.adapter = adapter
+        }
+        catSpin.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?,
+                view: View?,
+                position: Int,
+                id: Long
+            ) {
+                taskCategory = categoryStr.get(position)
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+
+            }
+        }
+
+
+
+        btnCreateOrUpdate.setOnClickListener {
+            val name = tieTaskName.text.toString().trim()
+            if (taskCategory != null && name.isNotEmpty()) {
+                if (task == null) {
+                    onCreateClicked.invoke(
+                        TaskUiData(
+                            id = 0,
+                            name = name,
+                            category = requireNotNull(taskCategory)
+                        )
+                    )
+                    dismiss()
+                } else {
+                    onUpdateClicked.invoke(
+                        TaskUiData(
+                            id = task.id,
+                            name = name,
+                            category = requireNotNull(taskCategory)
+                        )
+                    )
+                    dismiss()
+                }
+
+
+            } else {
+                Snackbar.make(btnCreateOrUpdate, "Please select a category", Snackbar.LENGTH_LONG)
+                    .show()
+            }
+        }
+        if (task == null) {
+            btnDelete.isVisible = false
+            tvTitle.setText(R.string.create_task_title)
+            btnCreateOrUpdate.setText(R.string.create)
+        } else {
+            tvTitle.setText(R.string.update_task_title)
+            btnCreateOrUpdate.setText(R.string.update)
+            tieTaskName.setText(task.name)
+            btnDelete.isVisible = true
+            btnDelete.setOnClickListener {
+                if (task != null) {
+                    onDeleteClicked.invoke(task)
+                    dismiss()
+                } else {
+                    Log.d("CreateOrUpdateTaskBottomSheet", "Task not found")
+                }
+            }
+            val currentCategory = categoryList.first { it.name == task.category }
+            catSpin.setSelection(categoryList.indexOf(currentCategory))
+        }
+        return view
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/CreateTaskBottomSheet.kt b/app/src/main/java/com/devspace/taskbeats/CreateTaskBottomSheet.kt
deleted file mode 100644
index 0224dc4..0000000
--- a/app/src/main/java/com/devspace/taskbeats/CreateTaskBottomSheet.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.devspace.taskbeats
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.Button
-import android.widget.Spinner
-import android.widget.TextView
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.google.android.material.snackbar.Snackbar
-
-class CreateTaskBottomSheet(
-    private val categoryList: List<CategoryUiData>,
-    private val onCreateClicked: (TaskUiData) -> Unit
-) : BottomSheetDialogFragment() {
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val view = inflater.inflate(R.layout.create_task, container, false)
-        val btnCreate = view.findViewById<Button>(R.id.btn_task_create)
-        val tieTaskName = view.findViewById<TextView>(R.id.tie_task_name)
-        val catSpin = view.findViewById<Spinner>(R.id.category_list)
-        var taskCategory: String? = null
-        val categoryStr: List<String> = categoryList.map { it.name }
-        ArrayAdapter(
-            requireActivity().baseContext,
-            android.R.layout.simple_spinner_item,
-            categoryStr.toList()
-        ).also { adapter ->
-            adapter.setDropDownViewResource(android.R.layout.simple_spinner_item)
-            catSpin.adapter = adapter
-        }
-        catSpin.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long
-            ) {
-                taskCategory = categoryStr.get(position)
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-
-            }
-        }
-        btnCreate.setOnClickListener {
-            if (taskCategory != null) {
-                val name = tieTaskName.text.toString()
-                onCreateClicked.invoke(
-                    TaskUiData(
-                        id = 11,
-                        name = name,
-                        category = requireNotNull(taskCategory)
-                    )
-                )
-            } else {
-                Snackbar.make(btnCreate, "Please select a category", Snackbar.LENGTH_LONG).show()
-            }
-        }
-        return view
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index f23a227..89c7e3e 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -1,5 +1,5 @@
 package com.devspace.taskbeats
-//Onde parei? Terminei aula 11 e parei nos 13:30 da aula 12 - que é click na lista de tarefas. ele vai debugar o código agora.
+//Onde parei? Terminei aula 16, devo iniciar a 17
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
@@ -12,7 +12,7 @@ import kotlinx.coroutines.launch
 class MainActivity : AppCompatActivity() {
     private var categoriess = listOf<CategoryUiData>()
     private var taskss = listOf<TaskUiData>()
-    private val taskAdapter by lazy{
+    private val taskAdapter by lazy {
         TaskListAdapter()
     }
     private val categoryAdapter = CategoryListAdapter()
@@ -46,6 +46,10 @@ class MainActivity : AppCompatActivity() {
             showCreateUpdateTaskBottomSheet()
         }
 
+        taskAdapter.setOnClickListener { task ->
+            showCreateUpdateTaskBottomSheet(task)
+        }
+
         categoryAdapter.setOnClickListener { selected ->
             if (selected.name == "+") {
                 val createCategoryBottomSheet = CreateCategoryBottomSheet { categoryName ->
@@ -85,9 +89,7 @@ class MainActivity : AppCompatActivity() {
             getCategoriesFromDataBase()
         }
         rvTask.adapter = taskAdapter
-        taskAdapter.setOnClickListener {
-            showCreateUpdateTaskBottomSheet()
-        }
+
 
         //categoryAdapter.submitList(categories)
         GlobalScope.launch(Dispatchers.IO) {
@@ -173,20 +175,54 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun showCreateUpdateTaskBottomSheet() {
-        val createTaskBottomSheet = CreateTaskBottomSheet(categoriess)
-        { taskToBeCreated ->
-            val taskEntityToBeInsert = TaskEntity(
-                id = taskToBeCreated.id, //cuidado com essa porra
-                name = taskToBeCreated.name,
-                category = taskToBeCreated.category
-            )
-            insertTask(taskEntityToBeInsert)
+    private fun updateTask(taskEntity: TaskEntity) {
+        GlobalScope.launch(Dispatchers.IO) {
+            taskDao.update(taskEntity)
+            getTasksFromDataBase()
         }
+    }
+
+    private fun deleteTask(taskEntity: TaskEntity) {
+        GlobalScope.launch(Dispatchers.IO) {
+            taskDao.delete(taskEntity)
+            getTasksFromDataBase()
+        }
+    }
+
+    private fun showCreateUpdateTaskBottomSheet(taskUiData: TaskUiData? = null) {
+        val createTaskBottomSheet = CreateOrUpdateTaskBottomSheet(
+            task = taskUiData,
+            categoryList = categoriess,
+            onCreateClicked = { taskToBeCreated ->
+                val taskEntityToBeInsert = TaskEntity(
+                    name = taskToBeCreated.name,
+                    category = taskToBeCreated.category
+                )
+                insertTask(taskEntityToBeInsert)
+            },
+            onUpdateClicked = { taskToBeUpdated ->
+                val taskEntityToBeUpdate = TaskEntity(
+                    id = taskToBeUpdated.id, //cuidado com essa porra
+                    name = taskToBeUpdated.name,
+                    category = taskToBeUpdated.category
+                )
+
+                updateTask(taskEntityToBeUpdate)
+            },
+            onDeleteClicked = { taskToBeDeleted ->
+                val taskEntityToBeDeleted = TaskEntity(
+                    id = taskToBeDeleted.id,
+                    name = taskToBeDeleted.name,
+                    category = taskToBeDeleted.category
+                )
+                deleteTask(taskEntityToBeDeleted)
+            }
+        )
         createTaskBottomSheet.show(supportFragmentManager, "createTaskBottomSheet")
     }
 }
 
+//
 val categories: List<CategoryUiData> = listOf(
     //Lista vazia pra testar se o dado foi pro DB mesmo.
     CategoryUiData(
@@ -239,57 +275,57 @@ val categories: List<CategoryUiData> = listOf(
 val tasks = listOf(
     TaskUiData(
         0,
-        "Ler 10 páginas do livro atual",
+        "01 - Ler 10 páginas do livro atual",
         "STUDY",
     ),
     TaskUiData(
-        1,
-        "45 min de treino na academia",
+        0,
+        "02 - 45 min de treino na academia",
         "HEALTH",
     ),
     TaskUiData(
-        2,
-        "Correr 5km",
+        0,
+        "03 - Correr 5km",
         "HEALTH",
     ),
     TaskUiData(
-        3,
-        "Meditar por 10 min",
+        0,
+        "04 - Meditar por 10 min",
         "WELLNESS",
     ),
     TaskUiData(
-        4,
-        "Silêncio total por 5 min",
+        0,
+        "05 - Silêncio total por 5 min",
         "WELLNESS",
     ),
     TaskUiData(
-        5,
-        "Descer o livo",
+        0,
+        "06 - Descer o livo",
         "HOME",
     ),
     TaskUiData(
-        6,
-        "Tirar caixas da garagem",
+        0,
+        "07 - Tirar caixas da garagem",
         "HOME",
     ),
     TaskUiData(
-        7,
-        "Lavar o carro",
+        0,
+        "08 - Lavar o carro",
         "HOME",
     ),
     TaskUiData(
-        8,
-        "Gravar aulas DevSpace",
+        0,
+        "09 - Gravar aulas DevSpace",
         "WORK",
     ),
     TaskUiData(
-        9,
-        "Criar planejamento de vídeos da semana",
+        0,
+        "10 - Criar planejamento de vídeos da semana",
         "WORK",
     ),
     TaskUiData(
-        10,
-        "Soltar reels da semana",
+        0,
+        "11 - Soltar reels da semana",
         "WORK",
     ),
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskDao.kt b/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
index 45fb4b8..0699b3a 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
@@ -1,13 +1,15 @@
 package com.devspace.taskbeats
 
 import androidx.room.Dao
+import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.Update
 
 @Dao
 interface TaskDao {
-    @Query("Select * From taskentity")
+    @Query("Select * From taskentity ORDER BY id ASC")
     fun getAll(): List<TaskEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -15,4 +17,10 @@ interface TaskDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insert(taskEntity: TaskEntity)
+
+    @Update
+    fun update(taskEntity: TaskEntity)
+
+    @Delete
+    fun delete(taskEntity: TaskEntity)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt b/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
index 8148809..e555fba 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
@@ -3,12 +3,18 @@ package com.devspace.taskbeats
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
+import androidx.room.Index
 import androidx.room.PrimaryKey
 
-@Entity
+@Entity(
+    tableName = "taskentity",
+    indices = [
+        Index(value = ["name", "category"], unique = true)
+    ]
+)
 data class TaskEntity(
     @PrimaryKey(autoGenerate = true)
-    val id: Long,
+    val id: Long = 0,
     @ColumnInfo
     val name: String,
     @ColumnInfo
diff --git a/app/src/main/res/layout/create_task.xml b/app/src/main/res/layout/create_or_update_task_bottom_sheet.xml
similarity index 63%
rename from app/src/main/res/layout/create_task.xml
rename to app/src/main/res/layout/create_or_update_task_bottom_sheet.xml
index 72d5ee4..4afb1f9 100644
--- a/app/src/main/res/layout/create_task.xml
+++ b/app/src/main/res/layout/create_or_update_task_bottom_sheet.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:padding="16dp">
 
     <TextView
         android:id="@+id/tv_title"
@@ -11,7 +12,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
-        android:text="Create Task"
+        android:text="@string/create_task_title"
         android:textSize="24sp"
         android:textStyle="bold" />
 
@@ -39,14 +40,30 @@
             android:minHeight="48dp" />
     </com.google.android.material.textfield.TextInputLayout>
 
-    <Button
-        android:id="@+id/btn_task_create"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="8dp"
-        android:text="Create" />
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:padding="16dp"
+        android:weightSum="2">
+
+        <Button
+            android:id="@+id/btn_task_delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_weight="1"
+            android:text="@string/delete" />
+
+        <Button
+            android:id="@+id/btn_task_create_or_update"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_weight="1"
+            android:text="@string/create" />
+    </LinearLayout>
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_task.xml b/app/src/main/res/layout/item_task.xml
index 5f0dd17..c592b7a 100644
--- a/app/src/main/res/layout/item_task.xml
+++ b/app/src/main/res/layout/item_task.xml
@@ -9,7 +9,6 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:clickable="true"
         android:focusable="true"
         android:foreground="?android:selectableItemBackground"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fc32751..9020565 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,9 @@
 <resources>
-    <string name="app_name">TaskBeats</string>
+    <string name="app_name">TaskBeat</string>
     <string name="home_title">Task Beat</string>
+    <string name="create_task_title">Create task</string>
+    <string name="create">Create</string>
+    <string name="delete">Delete</string>
+    <string name="update_task_title">Update task</string>
+    <string name="update">Update</string>
 </resources>
\ No newline at end of file