diff --git a/task-manager/src/index.js b/task-manager/src/index.js
index db4cdfa..7738a69 100644
--- a/task-manager/src/index.js
+++ b/task-manager/src/index.js
@@ -50,6 +50,28 @@ app.post('/tasks', (req, res) => {
   })
 })
 
+app.get('/tasks', (req, res) => {
+  Task.find({}).then((tasks) => {
+    res.send(tasks)
+  }).catch((e) => {
+    res.status(500).send()
+  })
+})
+
+app.get('/tasks/:id', (req, res) => {
+  const _id = req.params.id
+
+  Task.findById(_id).then((task) => {
+    if (!task) {
+      return res.status(404).send()
+    }
+
+    res.send(task)
+  }).catch((e) => {
+    res.status(500).send()
+  })
+})
+
 app.listen(port, () => {
   console.log('Server is up on port ' + port)
 })