diff --git a/app/controllers/assignments.php b/app/controllers/assignments.php
new file mode 100644
index 0000000000000000000000000000000000000000..942219b3be0b9d6c6ff04b6cf84f1e5487b565ed
--- /dev/null
+++ b/app/controllers/assignments.php
@@ -0,0 +1,32 @@
+<?php
+
+class Assignments extends Controller{
+    public function index(){
+        $data['judul'] = 'Assignment';
+        $data['style'] = "/public/css/dashboard.css";
+        $data['style'] = "/public/css/userlist.css";
+        $data['user_id'] = $_SESSION['user_id'];
+        if (isset($_SESSION['username'])) {
+            $this->view('header/index', $data);
+            $this->view('navbar/index', $data);
+            $this->view('assignments/index', $data);
+        } else {
+            header('Location: /login');
+        }
+    }
+
+    public function submit(){
+        $data['judul'] = 'Submit';
+        $data['style'] = "/public/css/addDocument.css";
+        $data['user_id'] = $_SESSION['user_id'];
+        if (isset($_SESSION['username'])) {
+            $this->view('header/index', $data);
+            $this->view('navbar/index', $data);
+            $this->view('assignments/submit', $data);
+        } else {
+            header('Location: /login');
+        }
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/app/models/application.php b/app/models/application.php
index e7fd88f541ea8d6a82921ba3e434245cb6791911..f6b833e5438b4d9ea8537edfd9011c04783c958f 100644
--- a/app/models/application.php
+++ b/app/models/application.php
@@ -24,15 +24,16 @@ class Application{
             if(is_array($response->return)){
                 for($i = 0; $i < count($response->return); $i++){
 
+                    $user_id_student = $response->return[$i]->user_id_student;
                     $user_id_scholarship = $response->return[$i]->user_id_scholarship;
                     $scholarship_id = $response->return[$i]->scholarship_id;
                     $status = $response->return[$i]->status;
 
-                    $query = "SELECT title, description, coverage, ? as status FROM scholarship WHERE user_id = ? AND scholarship_id = ?";
+                    $query = "SELECT ? as user_id_student, user_id as user_id_scholarship, scholarship_id, title, description, coverage, ? as status FROM scholarship WHERE user_id = ? AND scholarship_id = ?";
 
                     $stmt = $this->db->setSTMT($query);
 
-                    mysqli_stmt_bind_param($stmt, "sii", $status, $user_id_scholarship, $scholarship_id);
+                    mysqli_stmt_bind_param($stmt, "isii", $user_id_student, $status, $user_id_scholarship, $scholarship_id);
 
                     mysqli_stmt_execute($stmt);
 
@@ -45,14 +46,16 @@ class Application{
                 }
             }else{
                 $returnElement = $response->return;
+
+                $user_id_student = $returnElement->user_id_student;
                 $user_id_scholarship = $returnElement->user_id_scholarship;
                 $scholarship_id = $returnElement->scholarship_id;
                 $status = $returnElement->status;
 
-                $query = "SELECT title, description, coverage, ? as status FROM scholarship WHERE user_id = ? AND scholarship_id = ?";
+                $query = "SELECT ? as user_id_student, user_id as user_id_scholarship, scholarship_id, title, description, coverage, ? as status FROM scholarship WHERE user_id = ? AND scholarship_id = ?";
                 $stmt = $this->db->setSTMT($query);
 
-                mysqli_stmt_bind_param($stmt, "sii", $status, $user_id_scholarship, $scholarship_id);
+                mysqli_stmt_bind_param($stmt, "isii", $user_id_student, $status, $user_id_scholarship, $scholarship_id);
                 mysqli_stmt_execute($stmt);
 
                 $result = mysqli_stmt_get_result($stmt);
diff --git a/app/views/assignments/index.php b/app/views/assignments/index.php
new file mode 100644
index 0000000000000000000000000000000000000000..387398fb8d0e480d13df8a7165b46d5e75a3ea89
--- /dev/null
+++ b/app/views/assignments/index.php
@@ -0,0 +1,15 @@
+<div class="user-list">
+
+    <div class="container" id="content">
+
+        <!-- Iterate Here -->
+        <div class="box">
+            <h2 class="name">Title</h2>
+            <div class="attribute">Description:</div>
+            <button class="btn btn-primary" onclick="">Submit</button>
+            <!-- To-Do: Pindah ke Halaman Submit untuk Upload -->
+        </div> 
+
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/app/views/assignments/submit.php b/app/views/assignments/submit.php
new file mode 100644
index 0000000000000000000000000000000000000000..adf0acc8fe79de1da293cb6bf493da342fa75269
--- /dev/null
+++ b/app/views/assignments/submit.php
@@ -0,0 +1,15 @@
+<div class="add-document">
+    <h1>Assignment Submission</h1>
+    <div class="form">
+        <form action="javascript:;" onsubmit="return submitForm()" enctype="multipart/form-data">
+            <div class="input-container">
+                <label for="file">Upload File</label>
+                <input type="file" name="document" id="file" required accept=".mp4, .pdf"/>
+            </div>
+            <div class="button-container">
+                <a href="/dashboard" class="cancel-btn">Cancel</a>
+                <button type="submit" class="save-btn">Tambah Dokumen</button>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/js/applications.js b/public/js/applications.js
index c4c8cd5ed6f040de20e355c580b1e52ff96a127d..e1dac0d00eb386dff7a7943e0d41702e4c66bfaf 100644
--- a/public/js/applications.js
+++ b/public/js/applications.js
@@ -20,7 +20,9 @@ const getApplications = () => {
                         <td class="comment">${element.description}</td>
                         <td class="comment">$${element.coverage.toLocaleString("id-ID")}</td>
                         <td class="comment">${element.status}</td>
+                        ${element.status == 'accepted' ? '<td class="comment"><button class="button-style" onclick="">View Assignments</button></td>' : ''}
                     </tr>`
+                    // To-Do: Create a Function to move to /assignments. Pass along the user_id_student, user_id_scholarship, and scholarship_id
                     scholarshipsTableBody.innerHTML += row;
                 });
             }else{