diff --git a/src/main/java/ie/cit/cad/data/dao/JdbcTodoRepository.java b/src/main/java/ie/cit/cad/data/dao/JdbcTodoRepository.java
index 90bd9d6..4d80a2f 100644
--- a/src/main/java/ie/cit/cad/data/dao/JdbcTodoRepository.java
+++ b/src/main/java/ie/cit/cad/data/dao/JdbcTodoRepository.java
@@ -24,19 +24,23 @@ public List<Todo> getAll() {
 	}
 
 	public Todo findById(String id) {
-		return null;
+		return jdbcTemplate.queryForObject(
+				"SELECT ID, TEXT, DONE FROM TODO WHERE ID=?",
+				new TodoRowMapper(), id);
 	}
 
 	public void add(Todo todo) {
-
+		jdbcTemplate.update("INSERT INTO TODO VALUES(?,?,?)", todo.getId(),
+				todo.getText(), todo.isDone());
 	}
 
 	public void delete(String id) {
-
+		jdbcTemplate.update("DELETE FROM TODO WHERE ID=?", id);
 	}
 
 	public void update(Todo todo) {
-
+		jdbcTemplate.update("UPDATE TODO SET TEXT=?, DONE=? WHERE ID=?",
+				todo.getText(), todo.isDone(), todo.getId());
 	}
 }
 
diff --git a/src/main/java/ie/cit/cad/web/TodoController.java b/src/main/java/ie/cit/cad/web/TodoController.java
index 8b3bb55..00deee7 100644
--- a/src/main/java/ie/cit/cad/web/TodoController.java
+++ b/src/main/java/ie/cit/cad/web/TodoController.java
@@ -44,6 +44,6 @@ public String update(@RequestParam("todoId") String id, Model model) {
 	public String delete(@RequestParam("todoId") String id, Model model) {
 		repo.delete(id);
 		model.addAttribute("todos", repo.getAll());
-		return "todo";
+		return "todos";
 	}
 }
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/todos.jsp b/src/main/webapp/WEB-INF/views/todos.jsp
index e0f3b66..a92e234 100644
--- a/src/main/webapp/WEB-INF/views/todos.jsp
+++ b/src/main/webapp/WEB-INF/views/todos.jsp
@@ -6,15 +6,15 @@
 	<h1>Todo Application (Spring MVC)</h1>
 	<h2>Todo list:</h2>
 	<c:forEach items="${todos}" var="todo" varStatus="row">
-	${row.count} - ${todo.text} - ${todo.done}
+	${todo.id} - ${todo.text} - ${todo.done}
 		<form method="post">
 			<input name="_method" value="delete" type="hidden">
-			<input name="todoId" value="${row.count}" type="hidden">
+			<input name="todoId" value="${todo.id}" type="hidden">
 			<input type="submit" value="Delete">
 		</form>
 		<form method="post">
 			<input name="_method" value="put" type="hidden">
-			<input name="todoId" value="${row.count}" type="hidden">
+			<input name="todoId" value="${todo.id}" type="hidden">
 			<input type="submit" value="Update">
 		</form>
 	</c:forEach>