diff --git a/src/index.tsx b/src/index.tsx
index 93b6516..f631b00 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -122,6 +122,16 @@ export enum ClientUploadStatusEnum {
   UploadEnabled = "UPLOAD_ENABLED",
 }
 
+export type CommentGql = {
+  __typename?: "CommentGQL";
+  createdAt?: Maybe<Scalars["DateTime"]["output"]>;
+  id: Scalars["Int"]["output"];
+  message: Scalars["String"]["output"];
+  replies: Array<CommentGql>;
+  updatedAt?: Maybe<Scalars["DateTime"]["output"]>;
+  user: UserGql;
+};
+
 export type CountLeaderboardGql = {
   __typename?: "CountLeaderboardGQL";
   entries: Array<UserShotCountEntry>;
@@ -2226,10 +2236,13 @@ export type MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailed
 export type Mutation = {
   __typename?: "Mutation";
   addAnnotationToShot: AddShotAnnotationReturn;
+  commentOnVideo: Scalars["Boolean"]["output"];
   createBucketSet: BucketSetGql;
   createUploadStream: CreateUploadStreamReturn;
+  deleteComment: Scalars["Boolean"]["output"];
   deleteTags: Scalars["Boolean"]["output"];
   deleteVideo: Scalars["Boolean"]["output"];
+  editComment: Scalars["Boolean"]["output"];
   editProfileImageUri: UserGql;
   editShot: EditShotReturn;
   editUploadStream: Scalars["Boolean"]["output"];
@@ -2253,6 +2266,12 @@ export type MutationAddAnnotationToShotArgs = {
   shotId: Scalars["Int"]["input"];
 };
 
+export type MutationCommentOnVideoArgs = {
+  message: Scalars["String"]["input"];
+  parentCommentId?: InputMaybe<Scalars["Int"]["input"]>;
+  videoId: Scalars["Int"]["input"];
+};
+
 export type MutationCreateBucketSetArgs = {
   params: CreateBucketSetInput;
 };
@@ -2261,6 +2280,11 @@ export type MutationCreateUploadStreamArgs = {
   videoMetadata: VideoMetadataInput;
 };
 
+export type MutationDeleteCommentArgs = {
+  commentId: Scalars["Int"]["input"];
+  videoId: Scalars["Int"]["input"];
+};
+
 export type MutationDeleteTagsArgs = {
   tagsToDelete: Array<VideoTagInput>;
   videoId: Scalars["Int"]["input"];
@@ -2270,6 +2294,12 @@ export type MutationDeleteVideoArgs = {
   videoId: Scalars["Int"]["input"];
 };
 
+export type MutationEditCommentArgs = {
+  commentId: Scalars["Int"]["input"];
+  newMessage: Scalars["String"]["input"];
+  videoId: Scalars["Int"]["input"];
+};
+
 export type MutationEditProfileImageUriArgs = {
   profileImageUri: Scalars["String"]["input"];
 };
@@ -3008,6 +3038,7 @@ export type VideoGql = {
   __typename?: "VideoGQL";
   averageDifficulty?: Maybe<Scalars["Float"]["output"]>;
   averageTimeBetweenShots?: Maybe<Scalars["Float"]["output"]>;
+  comments: Array<CommentGql>;
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   currentHomography?: Maybe<HomographyInfoGql>;
   currentProcessing?: Maybe<VideoProcessingGql>;
diff --git a/src/schema.gql b/src/schema.gql
index 58f45b6..89157ec 100644
--- a/src/schema.gql
+++ b/src/schema.gql
@@ -480,6 +480,7 @@ type VideoGQL {
   homographyHistory: [HomographyInfoGQL!]!
   currentProcessing: VideoProcessingGQL
   reactions: [ReactionGQL!]!
+  comments: [CommentGQL!]!
 }
 
 type UploadStreamGQL {
@@ -621,6 +622,15 @@ type ReactionGQL {
   updatedAt: DateTime
 }
 
+type CommentGQL {
+  id: Int!
+  user: UserGQL!
+  message: String!
+  replies: [CommentGQL!]!
+  createdAt: DateTime
+  updatedAt: DateTime
+}
+
 enum ReactionEnum {
   LIKE
   HEART
@@ -818,6 +828,13 @@ type Mutation {
   deleteVideo(videoId: Int!): Boolean!
   deleteTags(videoId: Int!, tagsToDelete: [VideoTagInput!]!): Boolean!
   reactToVideo(videoId: Int!, reaction: ReactionEnum): Boolean!
+  commentOnVideo(
+    videoId: Int!
+    message: String!
+    parentCommentId: Int
+  ): Boolean!
+  editComment(videoId: Int!, commentId: Int!, newMessage: String!): Boolean!
+  deleteComment(videoId: Int!, commentId: Int!): Boolean!
 }
 
 input CreateBucketSetInput {
@@ -852,7 +869,7 @@ type AddShotAnnotationReturn {
 }
 
 union SuccessfulAddAddShotAnnotationErrors =
-    SuccessfulAdd
+  | SuccessfulAdd
   | AddShotAnnotationErrors
 
 type SuccessfulAdd {
@@ -864,7 +881,7 @@ type AddShotAnnotationErrors {
 }
 
 union DoesNotOwnShotErrOtherErrorNeedsNote =
-    DoesNotOwnShotErr
+  | DoesNotOwnShotErr
   | OtherErrorNeedsNote
 
 type OtherErrorNeedsNote {
@@ -886,7 +903,7 @@ type GetProfileUploadLinkReturn {
 }
 
 union UploadLinkGetProfileUploadLinkErrors =
-    UploadLink
+  | UploadLink
   | GetProfileUploadLinkErrors
 
 type UploadLink {
@@ -955,7 +972,7 @@ type GetUploadLinkErrors {
 }
 
 union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr =
-    MustHaveSetForUploadLinkErr
+  | MustHaveSetForUploadLinkErr
   | SegmentAlreadyUploadedErr
   | ProcessingFailedErr
   | NoInitForChunkedUploadErr