diff --git a/db/tasks.go b/db/tasks.go
index 2e7df69..76618b8 100644
--- a/db/tasks.go
+++ b/db/tasks.go
@@ -118,12 +118,12 @@ func GetTaskByID(id int) (types.Context, error) {
 	var tasks []types.Task
 	var task types.Task
 
-	getTasksql := "select id, title, content, priority from task where id=?"
+	getTasksql := "select t.id, t.title, t.content, t.priority, c.name from task t left outer join category c  where c.id = t.cat_id and t.id=?"
 
 	rows := database.query(getTasksql, id)
 	defer rows.Close()
 	if rows.Next() {
-		err := rows.Scan(&task.Id, &task.Title, &task.Content, &task.Priority)
+		err := rows.Scan(&task.Id, &task.Title, &task.Content, &task.Priority, &task.Category)
 		if err != nil {
 			log.Println(err)
 			//send email to respective people
diff --git a/templates/edit.html b/templates/edit.html
index c2be11f..10fc37d 100644
--- a/templates/edit.html
+++ b/templates/edit.html
@@ -3,24 +3,31 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title" id="newNoteLabel"><span class="glyphicon glyphicon-pencil"></span>  Edit Task</h4>
-      </div>
-      {{range .Tasks}}
+      </div>     
+      {{ $categories := .Categories }}
+      {{range $index, $task := .Tasks}}
       <div class="modal-body">
         <form action="/update/" method="POST">
           <div class="form-group">
-            <input type="text" name="title" value="{{.Title}}" class="form-control" id="add-note-title" placeholder="Title" style="border:none;border-bottom:1px solid gray; box-shadow:none;">
+            <input type="text" name="title" value="{{ $task.Title}}" class="form-control" id="add-note-title" placeholder="Title" style="border:none;border-bottom:1px solid gray; box-shadow:none;">
           </div>
           <div class="form-group">
 						<textarea class="form-control" name="content" id="add-note-content" placeholder="Content" 
-            rows="10" style="border:none;border-bottom:1px solid gray; box-shadow:none;">{{.Content}}</textarea>
+            rows="10" style="border:none;border-bottom:1px solid gray; box-shadow:none;">{{ $task.Content}}</textarea>
 
             <input type="text" name="id" value="{{.Id}}" class="hidden" />
             Priority: 
                 <input type="radio" name="priority" value="3" {{if eq .Priority "3"}} checked="checked" {{end}} /> High
                 <input type="radio" name="priority" value="2" {{if eq .Priority "2"}} checked="checked" {{end}} /> Medium
                 <input type="radio" name="priority" value="1" {{if eq .Priority "1"}} checked="checked" {{end}} /> Low 
-              </select>
           </div>
+           Category:
+            <select name="category">
+                <option>---</option>
+                {{range $cat :=   $categories}}
+                    <option value="{{$cat}}" {{if eq $cat $task.Category}} selected="true"  {{end}}> {{$cat}} </option> 
+                {{end}}
+            </select>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
diff --git a/types/types.go b/types/types.go
index f3c4a88..65ea8a7 100644
--- a/types/types.go
+++ b/types/types.go
@@ -11,6 +11,7 @@ type Task struct {
 	Content  string
 	Created  string
 	Priority string
+	Category string
 }
 
 //Context is the struct passed to templates
diff --git a/views/addViews.go b/views/addViews.go
index efc8247..f59bbd9 100644
--- a/views/addViews.go
+++ b/views/addViews.go
@@ -133,3 +133,26 @@ func AddCategoryFunc(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 }
+
+//EditTaskFunc is used to edit tasks, handles "/edit/" URL
+func EditTaskFunc(w http.ResponseWriter, r *http.Request) {
+	if r.Method == "GET" {
+		id, err := strconv.Atoi(r.URL.Path[len("/edit/"):])
+		if err != nil {
+			log.Println(err)
+			http.Redirect(w, r, "/", http.StatusBadRequest)
+		} else {
+			task, err := db.GetTaskByID(id)
+			categories := db.GetCategories()
+			task.Categories = categories
+
+			if err != nil {
+				task.Message = "Error fetching Tasks"
+			}
+			editTemplate.Execute(w, task)
+		}
+	} else {
+		message = "Method not allowed"
+		http.Redirect(w, r, "/", http.StatusFound)
+	}
+}