diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index df9bbc456..c468d427f 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -8,8 +8,12 @@ const router = express.Router();
 //==============================================================================
 
 
-router.get('/', (req, res) => {
-  res.send('Read all of the comments ever');
+router.get('/', (req, res, next) => {
+  Comment.find({}).then((comments) => {
+    res.status(200).json(comments);
+  }).catch(error => {
+    next(error);
+  });
 });
 
 router.get('/:comment_id', (req, res, next) => {
diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index ad21e54ec..db986db0c 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -13,6 +13,60 @@ const Comment = require('../../../../models/comment');
 const Action = require('../../../../models/action');
 const User = require('../../../../models/user');
 
+
+describe('Get /:comment_id', () => {
+  const comments = [{
+    id: 'abc',
+    body: 'comment 10',
+    asset_id: 'asset',
+    author_id: '123'
+  },{
+    id: 'def',
+    body: 'comment 20',
+    asset_id: 'asset',
+    author_id: '456'
+  },{
+    id: 'hij',
+    body: 'comment 30',
+    asset_id: '456'
+  }]
+
+  const users = [{
+    id: '123',
+    display_name: 'John',
+  },{
+    id: '456',
+    display_name: 'Paul',
+  }]
+
+  const actions = [{
+    action_type: 'flag',
+    item_id: 'abc'
+  },{
+    action_type: 'like',
+    item_id: 'hij'
+  }]
+
+  beforeEach(() => {
+    return Comment.create(comments).then(() => {
+      return User.create(users)
+    }).then(() => {
+      return Action.create(actions)
+    })
+  })
+
+  it('should return all the comments', function(done){
+    chai.request(app)
+      .get('/api/v1/comments')
+      .end(function(err, res){
+        expect(err).to.be.null;
+        expect(res).to.have.status(200);
+        if (err) return done(err);
+        done();
+      });
+  })
+})
+
 describe('Post /comments', () => {
   const users = [{
     id: '123',