diff --git a/src/app/templates/project.html b/src/app/templates/project.html
index 51843f4..cabeb1e 100644
--- a/src/app/templates/project.html
+++ b/src/app/templates/project.html
@@ -32,11 +32,14 @@ $def with (nav, project, tasks, permissions)
                             <input type="file" name="myfile" />
                             <br/>
                             <input type="hidden" name="taskid" value="$task[0]"/>
-                            $if task[6] == "waiting for delivery":
-                                <input type="submit" name="submit"/>
-
-                            $if permissions[2]:
-                                <button type="submit" name="deliver" value="1">Deliver</button>
+                            $if session.userid != project[2]:
+                                $if task[6] == "waiting for delivery" or task[6] == "declined":
+                                    <input type="submit" name="submit"/>
+                                $if permissions[2]:
+                                    <button type="submit" name="deliver" value="1">Deliver</button>
+                            $if session.userid == project[2] and task[6] == "delivered":
+                                    <button type="submit" name="acceped" value="1">Accept Delivery</button>
+                                    <button type="submit" name="declined" value="1">Decline Delivery</button>
                         </form>
                 </li>
         </ul>
diff --git a/src/app/views/project.py b/src/app/views/project.py
index d607340..2e8a24a 100644
--- a/src/app/views/project.py
+++ b/src/app/views/project.py
@@ -37,19 +37,20 @@ class Project:
         return render.project(nav, project, tasks,permissions)
 
     def POST(self):
+        print("HELLO")
         # Get session
         session = web.ctx.session
 
-        data = web.input(myfile={}, deliver=None)
+        data = web.input(myfile={}, deliver=None, accepted=None, declined=None)
 
         fileitem = data['myfile']
 
         permissions = models.project.get_user_permissions(str(session.userid), data.projectid)
         tasks = models.project.get_tasks_by_project_id(data.projectid)
 
-        print(data.deliver)
+        print(data)
         # Test if the file was uploaded
-        if fileitem.filename and tasks[int(data.taskid) == "waiting for delivery"]:
+        if fileitem.filename and tasks[int(data.taskid) == "waiting for delivery" or tasks[int(data.taskid) == "declined"]:
             if not permissions[1]:
                 print("Permission denied")
                 raise web.seeother(('/project?projectid=' + data.projectid))
@@ -57,7 +58,7 @@ class Project:
             data = web.input(projectid=0)
 
             fn = fileitem.filename
-            print(data)
+            print("DATA", data)
             # Create the project directory if it doesnt exist
             path = 'static/project' + data.projectid
             if not os.path.isdir(path):
@@ -77,6 +78,11 @@ class Project:
         elif data.deliver:
             models.project.update_task_status(data.taskid, "delivered")
             print(data.taskid)
+        elif data.accepted:
+            print("accept")
+            models.project.update_task_status(data.taskid, "accepted")
+        elif data.declined:
+            models.project.update_task_status(data.taskid, "declined")
         else:
             message = 'No file was uploaded'