diff --git a/task-manager/src/index.js b/task-manager/src/index.js
index 4028a1c..db4cdfa 100644
--- a/task-manager/src/index.js
+++ b/task-manager/src/index.js
@@ -18,6 +18,28 @@ app.post('/users', (req, res) => {
   })
 })
 
+app.get('/users', (req, res) => {
+  User.find({}).then((users) => {
+    res.send(users)
+  }).catch((e) => {
+    res.status(500).send()
+  })
+})
+
+app.get('/users/:id', (req, res) => {
+  const _id = req.params.id
+
+  User.findById(_id).then((user) => {
+    if (!user) {
+      return res.status(404).send()
+    }
+
+    res.send(user)
+  }).catch((e) => {
+    res.status(500).send()
+  })
+})
+
 app.post('/tasks', (req, res) => {
   const task = new Task(req.body)