diff --git a/src/controllers/commentsController.ts b/src/controllers/commentsController.ts
new file mode 100644
index 0000000..d1aca1d
--- /dev/null
+++ b/src/controllers/commentsController.ts
@@ -0,0 +1,30 @@
+import Elysia, { t } from "elysia";
+import authMiddleware from "../middlewares/auth";
+import getComments from "../services/comments/getComments";
+import { createComment } from "../services/comments/createComment";
+
+export const commentsController = new Elysia({ prefix: "comments" })
+  .use(authMiddleware)
+  .get(
+    "/:sessionId",
+    async ({ params: { sessionId }, auth: { userId } }) =>
+      await getComments(sessionId, userId),
+    {
+      params: t.Object({
+        sessionId: t.String(),
+      }),
+    }
+  )
+  .post(
+    "/:sessionId",
+    async ({ params: { sessionId }, auth: { userId }, body: { text } }) =>
+      await createComment(sessionId, userId, text),
+    {
+      params: t.Object({
+        sessionId: t.String(),
+      }),
+      body: t.Object({
+        text: t.String(),
+      }),
+    }
+  );
diff --git a/src/db/schema/comments.ts b/src/db/schema/comments.ts
new file mode 100644
index 0000000..1d3c47e
--- /dev/null
+++ b/src/db/schema/comments.ts
@@ -0,0 +1,28 @@
+import { pgTable, serial, text, timestamp, uuid } from "drizzle-orm/pg-core";
+import { usersTable } from "./users";
+import { sessionsTable } from "./sessions";
+import { relations } from "drizzle-orm";
+
+export const commentsTable = pgTable("comments", {
+  id: serial("id").primaryKey(),
+  text: text("text").notNull(),
+  createdAt: timestamp("created_at").notNull().defaultNow(),
+  updatedAt: timestamp("updated_at").notNull().defaultNow(),
+  ownerId: uuid("owner_id")
+    .notNull()
+    .references(() => usersTable.id),
+  sessionId: uuid("session_id")
+    .notNull()
+    .references(() => sessionsTable.id),
+});
+
+export const commentsRelations = relations(commentsTable, ({ one }) => ({
+  owner: one(usersTable, {
+    fields: [commentsTable.ownerId],
+    references: [usersTable.id],
+  }),
+  session: one(sessionsTable, {
+    fields: [commentsTable.sessionId],
+    references: [sessionsTable.id],
+  }),
+}));
diff --git a/src/db/schema/index.ts b/src/db/schema/index.ts
index b147edc..84efe89 100644
--- a/src/db/schema/index.ts
+++ b/src/db/schema/index.ts
@@ -6,3 +6,4 @@ export * from "./sessions";
 export * from "./clients";
 export * from "./apps";
 export * from "./actions";
+export * from "./comments";
diff --git a/src/services/comments/createComment.ts b/src/services/comments/createComment.ts
new file mode 100644
index 0000000..c852ca1
--- /dev/null
+++ b/src/services/comments/createComment.ts
@@ -0,0 +1,24 @@
+import { error } from "elysia";
+import db from "../../db";
+import { commentsTable } from "../../db/schema";
+
+export async function createComment(
+  sessionId: string,
+  userId: string,
+  text: string
+) {
+  try {
+    const comment = await db
+      .insert(commentsTable)
+      .values({
+        sessionId,
+        ownerId: userId,
+        text,
+      })
+      .returning();
+    return comment;
+  } catch (err) {
+    console.log((err as Error).message);
+    return error(500, "Internal Server Error");
+  }
+}
diff --git a/src/services/comments/getComments.ts b/src/services/comments/getComments.ts
new file mode 100644
index 0000000..1bd1a06
--- /dev/null
+++ b/src/services/comments/getComments.ts
@@ -0,0 +1,30 @@
+import { error } from "elysia";
+import { and, desc, eq } from "drizzle-orm";
+import db from "../../db";
+import { commentsTable } from "../../db/schema";
+
+export async function getComments(sessionId: string, userId: string) {
+  try {
+    const comments = await db.query.commentsTable.findMany({
+      where: and(
+        eq(commentsTable.sessionId, sessionId),
+        eq(commentsTable.ownerId, userId)
+      ),
+      with: {
+        owner: {
+          columns: {
+            fullname: true,
+            id: true,
+          },
+        },
+      },
+      orderBy: desc(commentsTable.createdAt),
+    });
+    return comments;
+  } catch (err) {
+    console.log((err as Error).message);
+    return error(500, "Internal Server Error");
+  }
+}
+
+export default getComments;
diff --git a/src/services/servers/get.ts b/src/services/servers/get.ts
index 6beba0e..65c3562 100644
--- a/src/services/servers/get.ts
+++ b/src/services/servers/get.ts
@@ -41,6 +41,13 @@ export default async function getServers(
                   app: {
                     columns: {
                       name: true,
+                      id: true,
+                    },
+                  },
+                  server: true,
+                  owner: {
+                    columns: {
+                      fullname: true,
                     },
                   },
                 },