diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c7c9e1f3..186fd248 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -194,6 +194,8 @@
         <activity android:name=".view.FallDetection.FallDetectionActivity" />
         <activity android:name=".view.FallDetection.FallAlertActivity" />
         <activity android:name="deakin.gopher.guardian.view.caretaker.notifications.confirmincident.CallAmbulanceActivity" />
+        <activity android:name=".view.general.DashboardActivity"/>
+        <activity android:name=".view.general.DoctorPortalActivity" />
 
 
         <service
@@ -207,6 +209,9 @@
         <meta-data
             android:name="preloaded_fonts"
             android:resource="@array/preloaded_fonts" />
+
+        <activity android:name=".view.general.DashboardActivity"/>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/deakin/gopher/guardian/model/login/RoleName.kt b/app/src/main/java/deakin/gopher/guardian/model/login/RoleName.kt
index 924e33fd..da6e0a9d 100644
--- a/app/src/main/java/deakin/gopher/guardian/model/login/RoleName.kt
+++ b/app/src/main/java/deakin/gopher/guardian/model/login/RoleName.kt
@@ -15,4 +15,13 @@ sealed class RoleName(val name: String) : Serializable {
     data object Nurse : RoleName(R.string.nurse_role_name.toString()) {
         private fun readResolve(): Any = Nurse
     }
+
+    data object Doctor : RoleName(R.string.doctor_role_name.toString()) {
+        private fun readResolve(): Any = Doctor
+    }
+
+
+
+
+
 }
diff --git a/app/src/main/java/deakin/gopher/guardian/services/NavigationService.kt b/app/src/main/java/deakin/gopher/guardian/services/NavigationService.kt
index bd22a8ce..0fcf46e8 100644
--- a/app/src/main/java/deakin/gopher/guardian/services/NavigationService.kt
+++ b/app/src/main/java/deakin/gopher/guardian/services/NavigationService.kt
@@ -7,11 +7,13 @@ import deakin.gopher.guardian.view.general.Homepage4admin
 import deakin.gopher.guardian.view.general.Homepage4caretaker
 import deakin.gopher.guardian.view.general.Homepage4nurse
 import deakin.gopher.guardian.view.general.LoginActivity
-import deakin.gopher.guardian.view.general.PinCodeActivity
 import deakin.gopher.guardian.view.general.RegisterActivity
 import deakin.gopher.guardian.view.general.Setting
 import deakin.gopher.guardian.view.general.TaskAddActivity
 import deakin.gopher.guardian.view.general.TasksListActivity
+import deakin.gopher.guardian.view.general.DashboardActivity
+import deakin.gopher.guardian.view.general.DoctorPortalActivity
+
 
 class NavigationService(val activity: Activity) {
     fun toHomeScreenForRole(roleName: RoleName) {
@@ -33,6 +35,16 @@ class NavigationService(val activity: Activity) {
                     ),
                 )
             }
+            RoleName.Doctor -> {
+                activity.startActivity(
+                    Intent(
+                        activity.applicationContext,
+                        DoctorPortalActivity::class.java,
+                    ),
+                )
+            }
+
+
 
             RoleName.Admin -> {
                 activity.startActivity(
@@ -100,7 +112,8 @@ class NavigationService(val activity: Activity) {
     }
 
     fun toPinCodeActivity(roleName: RoleName) {
-        val intent = Intent(activity.applicationContext, PinCodeActivity::class.java)
+        val intent = Intent(activity.applicationContext, DashboardActivity::class.java)
+
         intent.putExtra("role", roleName)
         activity.startActivity(intent)
     }
diff --git a/app/src/main/java/deakin/gopher/guardian/util/SecurityUtils.kt b/app/src/main/java/deakin/gopher/guardian/util/SecurityUtils.kt
new file mode 100644
index 00000000..f708d25e
--- /dev/null
+++ b/app/src/main/java/deakin/gopher/guardian/util/SecurityUtils.kt
@@ -0,0 +1,11 @@
+package deakin.gopher.guardian.utils
+
+import java.security.MessageDigest
+
+object SecurityUtils {
+    fun hashPassword(password: String): String {
+        val digest = MessageDigest.getInstance("SHA-256")
+        val bytes = digest.digest(password.toByteArray())
+        return bytes.joinToString("") { "%02x".format(it) }
+    }
+}
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/DashboardActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/DashboardActivity.kt
new file mode 100644
index 00000000..1313c8c0
--- /dev/null
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/DashboardActivity.kt
@@ -0,0 +1,76 @@
+package deakin.gopher.guardian.view.general
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.widget.*
+import androidx.appcompat.app.AppCompatActivity
+import deakin.gopher.guardian.R
+
+// Define the data class for tasks
+data class Task(val id: Int, val name: String, val status: String)
+
+class DashboardActivity : AppCompatActivity() {
+
+    // Sample static tasks list
+    private val tasks = mutableListOf(
+        Task(1, "Check patient vitals", "Pending"),
+        Task(2, "Assist with mobility", "In Progress"),
+        Task(3, "Administer medication", "Completed")
+    )
+
+    // Declare views
+    private lateinit var taskSummary: TextView
+    private lateinit var viewTasksBtn: Button
+    private lateinit var sortSpinner: Spinner
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_dashboard)
+
+        // Initialize views
+        taskSummary = findViewById(R.id.taskSummary)
+        viewTasksBtn = findViewById(R.id.buttonViewTasks)
+        sortSpinner = findViewById(R.id.sortSpinner)
+
+        // Spinner setup
+        val sortOptions = arrayOf("None", "Status", "Task Name")
+        val spinnerAdapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, sortOptions)
+        spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        sortSpinner.adapter = spinnerAdapter
+
+        // Spinner change listener
+        sortSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
+                val selected = sortOptions[position]
+                val sortedTasks = when (selected) {
+                    "Status" -> tasks.sortedBy { it.status }
+                    "Task Name" -> tasks.sortedBy { it.name }
+                    else -> tasks
+                }
+
+                updateTaskSummary(sortedTasks)
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>) {}
+        }
+
+        // Show initial summary
+        updateTaskSummary(tasks)
+
+        // View all tasks button navigation
+        viewTasksBtn.setOnClickListener {
+            startActivity(Intent(this, TasksListActivity::class.java))
+        }
+    }
+
+    // Helper method to update summary
+    private fun updateTaskSummary(sortedTasks: List<Task>) {
+        val total = sortedTasks.size
+        val pending = sortedTasks.count { it.status == "Pending" }
+        val inProgress = sortedTasks.count { it.status == "In Progress" }
+        val completed = sortedTasks.count { it.status == "Completed" }
+
+        taskSummary.text = "Total Tasks: $total\nPending: $pending | In Progress: $inProgress | Completed: $completed"
+    }
+}
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/DoctorPortalActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/DoctorPortalActivity.kt
new file mode 100644
index 00000000..5abc1e64
--- /dev/null
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/DoctorPortalActivity.kt
@@ -0,0 +1,16 @@
+package deakin.gopher.guardian.view.general
+
+import android.os.Bundle
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import deakin.gopher.guardian.R
+
+class DoctorPortalActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_doctor_portal)
+
+        val welcomeTextView: TextView = findViewById(R.id.doctorWelcomeText)
+        welcomeTextView.text = "Welcome Doctor!"
+    }
+}
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/LoginActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/LoginActivity.kt
index ee4cecff..3d4d621e 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/LoginActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/LoginActivity.kt
@@ -37,6 +37,10 @@ import deakin.gopher.guardian.view.show
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import deakin.gopher.guardian.utils.SecurityUtils
+import android.util.Log
+
+
 
 class LoginActivity : BaseActivity() {
     private var userRole: RoleName = RoleName.Caretaker
@@ -63,6 +67,7 @@ class LoginActivity : BaseActivity() {
                     R.id.admin_radioButton -> RoleName.Admin
                     R.id.caretaker_radioButton -> RoleName.Caretaker
                     R.id.nurse_radioButton -> RoleName.Nurse
+                    R.id.doctor_radioButton -> RoleName.Doctor
                     else -> RoleName.Caretaker
                 }
         }
@@ -77,6 +82,9 @@ class LoginActivity : BaseActivity() {
             progressBar.show()
             val emailInput = mEmail.text.toString().trim { it <= ' ' }
             val passwordInput = mPassword.text.toString().trim { it <= ' ' }
+            val hashedPasswordInput = SecurityUtils.hashPassword(passwordInput)
+            Log.d("HashedPassword", "Hashed value: $hashedPasswordInput")
+
 
             val loginValidationError = validateInputs(emailInput)
 
@@ -90,7 +98,8 @@ class LoginActivity : BaseActivity() {
                 return@setOnClickListener
             }
 
-            val call = ApiClient.apiService.login(emailInput, passwordInput)
+            val call = ApiClient.apiService.login(emailInput, hashedPasswordInput)
+
 
             call.enqueue(
                 object : Callback<AuthResponse> {
@@ -104,7 +113,8 @@ class LoginActivity : BaseActivity() {
                             val user = response.body()!!.user
                             val token = response.body()!!.token
                             SessionManager.createLoginSession(user, token)
-                            NavigationService(this@LoginActivity).toPinCodeActivity(userRole)
+                            NavigationService(this@LoginActivity).toHomeScreenForRole(userRole)
+
                         } else {
                             // Handle error
                             val errorResponse =
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/PinCodeActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/PinCodeActivity.kt
deleted file mode 100644
index 896219e0..00000000
--- a/app/src/main/java/deakin/gopher/guardian/view/general/PinCodeActivity.kt
+++ /dev/null
@@ -1,174 +0,0 @@
-package deakin.gopher.guardian.view.general
-
-import android.os.Bundle
-import android.os.CountDownTimer
-import android.view.View
-import android.widget.Button
-import android.widget.EditText
-import android.widget.ProgressBar
-import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.LinearLayoutCompat
-import com.google.gson.Gson
-import deakin.gopher.guardian.R
-import deakin.gopher.guardian.model.ApiErrorResponse
-import deakin.gopher.guardian.model.BaseModel
-import deakin.gopher.guardian.model.login.RoleName
-import deakin.gopher.guardian.model.login.SessionManager
-import deakin.gopher.guardian.services.NavigationService
-import deakin.gopher.guardian.services.api.ApiClient
-import deakin.gopher.guardian.view.hide
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class PinCodeActivity : AppCompatActivity() {
-    private lateinit var userRole: RoleName
-    private val userEmail = SessionManager.getCurrentUser().email
-
-    private lateinit var progressBar: ProgressBar
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.login_enter_pin)
-        userRole = intent.getSerializableExtra("role") as RoleName
-
-        val pinDigit1 = findViewById<EditText>(R.id.pin_digit_1)
-        val pinDigit2 = findViewById<EditText>(R.id.pin_digit_2)
-        val pinDigit3 = findViewById<EditText>(R.id.pin_digit_3)
-        val pinDigit4 = findViewById<EditText>(R.id.pin_digit_4)
-        val pinDigit5 = findViewById<EditText>(R.id.pin_digit_5)
-        val pinDigit6 = findViewById<EditText>(R.id.pin_digit_6)
-        val submitButton = findViewById<Button>(R.id.loginBtn)
-        val resendButton = findViewById<Button>(R.id.resendText)
-        progressBar = findViewById<ProgressBar>(R.id.progressBar)
-
-        submitButton.setOnClickListener {
-            val pin =
-                pinDigit1.text.toString() +
-                    pinDigit2.text.toString() +
-                    pinDigit3.text.toString() +
-                    pinDigit4.text.toString() +
-                    pinDigit5.text.toString() +
-                    pinDigit6.text.toString()
-            if (pin.length == 6) {
-                validatePin(pin)
-            } else {
-                showMessage("Please enter a 6-digit PIN")
-            }
-        }
-
-        resendButton.setOnClickListener {
-            sendPin()
-            startResendCooldown()
-        }
-        resendButton.performClick()
-    }
-
-    private fun sendPin() {
-        val call = ApiClient.apiService.sendPin(userEmail)
-        call.enqueue(
-            object : Callback<BaseModel> {
-                override fun onResponse(
-                    call: Call<BaseModel>,
-                    response: Response<BaseModel>,
-                ) {
-                    progressBar.hide()
-                    if (response.isSuccessful && response.body() != null) {
-                        showMessage(response.body()!!.apiMessage ?: "Pin sent tou your email")
-                    } else {
-                        // Handle error
-                        val errorResponse =
-                            Gson().fromJson(
-                                response.errorBody()?.string(),
-                                ApiErrorResponse::class.java,
-                            )
-                        showMessage(errorResponse.apiError ?: response.message())
-                    }
-                }
-
-                override fun onFailure(
-                    call: Call<BaseModel>,
-                    t: Throwable,
-                ) {
-                    // Handle failure
-                    progressBar.hide()
-                    showMessage("Error sending PIN: ${t.message}")
-                }
-            },
-        )
-    }
-
-    private fun validatePin(pin: String) {
-        val call = ApiClient.apiService.verifyPin(userEmail, pin)
-        call.enqueue(
-            object : Callback<BaseModel> {
-                override fun onResponse(
-                    call: Call<BaseModel>,
-                    response: Response<BaseModel>,
-                ) {
-                    progressBar.hide()
-                    if (response.isSuccessful && response.body() != null) {
-                        showMessage(response.body()!!.apiMessage ?: "Pin verified successfully")
-                        NavigationService(this@PinCodeActivity).toHomeScreenForRole(userRole)
-                        finish()
-                    } else {
-                        // Handle error
-                        val errorResponse =
-                            Gson().fromJson(
-                                response.errorBody()?.string(),
-                                ApiErrorResponse::class.java,
-                            )
-                        showMessage(errorResponse.apiError ?: response.message())
-                    }
-                }
-
-                override fun onFailure(
-                    call: Call<BaseModel>,
-                    t: Throwable,
-                ) {
-                    // Handle failure
-                    progressBar.hide()
-                    showMessage("Error validating PIN: ${t.message}")
-                }
-            },
-        )
-    }
-
-    private fun showMessage(message: String) {
-        Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
-    }
-
-    private fun startResendCooldown() {
-        val countdownTimerContainer = findViewById<LinearLayoutCompat>(R.id.containerCountdown)
-        val countdownTimer = findViewById<TextView>(R.id.countdownTimer)
-        val resendButton = findViewById<Button>(R.id.resendText)
-
-        // Disable the resend button
-        resendButton.isEnabled = false
-        resendButton.setTextColor(resources.getColor(R.color.gray2))
-        countdownTimerContainer.visibility = View.VISIBLE
-
-        // Countdown for 1 minute 30 seconds (90,000ms)
-        object : CountDownTimer(90000, 1000) {
-            override fun onTick(millisUntilFinished: Long) {
-                val secondsLeft = millisUntilFinished / 1000
-                val countdownText =
-                    resources.getQuantityString(
-                        R.plurals.resend_countdown_seconds,
-                        secondsLeft.toInt(),
-                        secondsLeft,
-                    )
-                countdownTimer.text = countdownText
-            }
-
-            override fun onFinish() {
-                // Enable the resend button
-                resendButton.isEnabled = true
-                resendButton.setTextColor(resources.getColor(R.color.TG_blue))
-                countdownTimerContainer.visibility = View.GONE
-            }
-        }.start()
-    }
-}
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/RegisterActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/RegisterActivity.kt
index 41fcbeaa..5f21f35c 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/RegisterActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/RegisterActivity.kt
@@ -21,6 +21,7 @@ import deakin.gopher.guardian.services.api.ApiClient
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import deakin.gopher.guardian.utils.SecurityUtils
 
 class RegisterActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -63,7 +64,9 @@ class RegisterActivity : BaseActivity() {
             progressBar.visibility = View.VISIBLE
 
             val emailAddress = EmailAddress(emailInput)
-            val password = Password(passwordInput)
+            val hashedPassword = SecurityUtils.hashPassword(passwordInput)
+            val password = Password(hashedPassword)
+
             val role = findViewById<MaterialButton>(roleInput).text.toString().lowercase()
 
             val request =
diff --git a/app/src/main/res/layout/activity_dashboard.xml b/app/src/main/res/layout/activity_dashboard.xml
new file mode 100644
index 00000000..edd3c279
--- /dev/null
+++ b/app/src/main/res/layout/activity_dashboard.xml
@@ -0,0 +1,75 @@
+<!-- activity_dashboard.xml -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:padding="24dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#FFFFFF">
+
+    <!-- Dashboard Title -->
+    <TextView
+        android:text="My Dashboard"
+        android:textSize="24sp"
+        android:textColor="#333333"
+        android:textStyle="bold"
+        android:layout_width="match_parent"
+        android:gravity="center"
+        android:layout_height="wrap_content"
+        android:paddingBottom="20dp"/>
+
+    <!-- Task Summary Card -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="#F5F5F5"
+        android:padding="16dp"
+        android:elevation="4dp"
+        android:layout_marginBottom="20dp"
+        android:layout_marginTop="10dp"
+        android:backgroundTint="#FFFFFF"
+        android:clipToPadding="false"
+        android:clipChildren="false">
+
+        <TextView
+            android:text="Today's Tasks"
+            android:textSize="20sp"
+            android:textColor="#444444"
+            android:textStyle="bold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/taskSummary"
+            android:text="Loading tasks..."
+            android:textSize="16sp"
+            android:textColor="#666666"
+            android:paddingTop="8dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </LinearLayout>
+
+    <Spinner
+        android:id="@+id/sortSpinner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp" />
+
+
+    <!-- Button to Navigate to Tasks List -->
+
+    <Button
+        android:id="@+id/buttonViewTasks"
+        android:text="View All Tasks"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAllCaps="false"
+        android:textSize="16sp"
+        android:padding="12dp"
+        android:textColor="#FFFFFF"
+        android:backgroundTint="#007BFF"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="16dp"
+        android:elevation="2dp"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_doctor_portal.xml b/app/src/main/res/layout/activity_doctor_portal.xml
new file mode 100644
index 00000000..80d39bce
--- /dev/null
+++ b/app/src/main/res/layout/activity_doctor_portal.xml
@@ -0,0 +1,30 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:padding="16dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:text="Welcome, Doctor!"
+        android:textSize="24sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="16dp" />
+
+    <ListView
+        android:id="@+id/patientListView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/doctorWelcomeText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Welcome, Doctor"
+        android:textSize="20sp"
+        android:layout_marginTop="16dp"
+        android:layout_gravity="center" />
+
+
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index dd980b72..27f505ae 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -122,8 +122,19 @@
                         android:fontFamily="@font/poppins_bold"
                         android:minHeight="48dp"
                         android:text="@string/nurse_role_name" />
+
+                    <RadioButton
+                        android:id="@+id/doctor_radioButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="@font/poppins_bold"
+                        android:minHeight="48dp"
+                        android:text="Doctor" />
+
                 </RadioGroup>
 
+
+
             </LinearLayout>
 
             <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5fbf3add..e2b9032f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
     <string name="welcome_caretaker">Welcome, Caretaker</string>
     <string name="welcome_admin">Welcome, Administrator</string>
     <string name="welcome_nurse">Welcome, Nurse</string>
+    <string name="doctor_role_name">Doctor</string>
 
 
     <!-- Below are all strings previously hardcoded added here using the quick function -->