diff --git a/src/commons/application/actions/__tests__/SessionActions.test.ts b/src/commons/application/actions/__tests__/SessionActions.test.ts
index b8d11c0c8d..d5dbcb1936 100644
--- a/src/commons/application/actions/__tests__/SessionActions.test.ts
+++ b/src/commons/application/actions/__tests__/SessionActions.test.ts
@@ -620,10 +620,14 @@ test('updateGrading generates correct action object', async () => {
             id: 100
           },
           gradedAt: '2019-08-16T13:26:32+00:00'
-        }
+        },
+        autogradingResults: [],
+        autoGradingStatus: 'N/A'
       }
     ],
+    enable_llm_grading: false,
     assessment: {
+      llm_assessment_prompt: null,
       coverPicture: 'https://i.imgur.com/dR7zBPI.jpeg',
       id: 1,
       number: '5',
diff --git a/src/commons/application/reducers/__tests__/SessionReducer.test.ts b/src/commons/application/reducers/__tests__/SessionReducer.test.ts
index ff9001f136..6802046726 100644
--- a/src/commons/application/reducers/__tests__/SessionReducer.test.ts
+++ b/src/commons/application/reducers/__tests__/SessionReducer.test.ts
@@ -402,8 +402,11 @@ test('UPDATE_ASSESSMENT_OVERVIEWS works correctly in updating assessment overvie
 
 // Test data for UPDATE_GRADING
 const gradingTest1: GradingQuery = {
+  enable_llm_grading: false,
   answers: [
     {
+      autogradingResults: [],
+      autoGradingStatus: 'N/A',
       question: await vi.importMock('../../../../features/grading/GradingTypes'),
       student: {
         name: 'test student',
@@ -418,6 +421,7 @@ const gradingTest1: GradingQuery = {
     }
   ],
   assessment: {
+    llm_assessment_prompt: null,
     coverPicture: 'test string',
     id: 1,
     number: 'M1A',
@@ -430,8 +434,11 @@ const gradingTest1: GradingQuery = {
 };
 
 const gradingTest2: GradingQuery = {
+  enable_llm_grading: false,
   answers: [
     {
+      autogradingResults: [],
+      autoGradingStatus: 'N/A',
       question: await vi.importMock('../../../../features/grading/GradingTypes'),
       student: {
         name: 'another test student',
@@ -446,6 +453,7 @@ const gradingTest2: GradingQuery = {
     }
   ],
   assessment: {
+    llm_assessment_prompt: null,
     coverPicture: 'another test string',
     id: 2,
     number: 'P2',
diff --git a/src/commons/application/types/SessionTypes.ts b/src/commons/application/types/SessionTypes.ts
index 401466989f..ad70840098 100644
--- a/src/commons/application/types/SessionTypes.ts
+++ b/src/commons/application/types/SessionTypes.ts
@@ -39,6 +39,11 @@ export type SessionState = {
   readonly enableAchievements?: boolean;
   readonly enableSourcecast?: boolean;
   readonly enableStories?: boolean;
+  readonly enableLlmGrading?: boolean;
+  readonly llmApiKey?: string;
+  readonly llmModel?: string;
+  readonly llmApiUrl?: string;
+  readonly llmCourseLevelPrompt?: string;
   readonly enableOverallLeaderboard?: boolean;
   readonly enableContestLeaderboard?: boolean;
   readonly topLeaderboardDisplay?: number;
@@ -109,6 +114,7 @@ export type CourseConfiguration = {
   enableAchievements: boolean;
   enableSourcecast: boolean;
   enableStories: boolean;
+  enableLlmGrading?: boolean;
   enableOverallLeaderboard: boolean;
   enableContestLeaderboard: boolean;
   topLeaderboardDisplay: number;
@@ -117,6 +123,10 @@ export type CourseConfiguration = {
   sourceVariant: Variant;
   moduleHelpText: string;
   assetsPrefix: string;
+  llmApiKey?: string;
+  llmModel?: string;
+  llmApiUrl?: string;
+  llmCourseLevelPrompt?: string;
 };
 
 export type AdminPanelCourseRegistration = {
diff --git a/src/commons/assessment/AssessmentTypes.ts b/src/commons/assessment/AssessmentTypes.ts
index bbd7b13644..ddcc916c72 100644
--- a/src/commons/assessment/AssessmentTypes.ts
+++ b/src/commons/assessment/AssessmentTypes.ts
@@ -121,6 +121,7 @@ export interface IProgrammingQuestion extends BaseQuestion {
   prepend: string;
   postpend: string;
   solutionTemplate: string;
+  llm_prompt?: string | null;
   testcases: Testcase[];
   testcasesPrivate?: Testcase[]; // For mission control
   type: 'programming';
@@ -280,6 +281,7 @@ export const programmingTemplate = (): IProgrammingQuestion => {
     prepend: '',
     solutionTemplate: '//This is a mock solution template',
     postpend: '',
+    llm_prompt: null,
     testcases: [],
     testcasesPrivate: [],
     type: 'programming',
diff --git a/src/commons/dropdown/DropdownCreateCourse.tsx b/src/commons/dropdown/DropdownCreateCourse.tsx
index 2d37ce7eb9..b61d8bedfb 100644
--- a/src/commons/dropdown/DropdownCreateCourse.tsx
+++ b/src/commons/dropdown/DropdownCreateCourse.tsx
@@ -40,9 +40,11 @@ const DropdownCreateCourse: React.FC<Props> = props => {
     enableAchievements: true,
     enableSourcecast: true,
     enableStories: false,
+    enableLlmGrading: false,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
-    moduleHelpText: ''
+    moduleHelpText: '',
+    llmApiKey: ''
   });
 
   const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] =
@@ -222,7 +224,8 @@ const DropdownCreateCourse: React.FC<Props> = props => {
                 })
               }
             />
-
+          </div>
+          <div>
             <Switch
               checked={courseConfig.enableStories}
               inline
@@ -234,6 +237,18 @@ const DropdownCreateCourse: React.FC<Props> = props => {
                 })
               }
             />
+
+            <Switch
+              checked={courseConfig.enableLlmGrading}
+              inline
+              label="Enable LLM Grading"
+              onChange={e =>
+                setCourseConfig({
+                  ...courseConfig,
+                  enableLlmGrading: (e.target as HTMLInputElement).checked
+                })
+              }
+            />
           </div>
         </div>
         <div>
@@ -273,6 +288,24 @@ const DropdownCreateCourse: React.FC<Props> = props => {
               fill
             />
           </FormGroup>
+          <FormGroup
+            helperText="To enable LLM grading, both the 'Enable LLM Grading' switch and a valid API key must be provided."
+            label={'LLM API Key'}
+            labelInfo="(optional)"
+            labelFor="llmApiKey"
+          >
+            <InputGroup
+              id="llmApiKey"
+              type="password"
+              value={courseConfig.llmApiKey}
+              onChange={e =>
+                setCourseConfig({
+                  ...courseConfig,
+                  llmApiKey: e.target.value
+                })
+              }
+            />
+          </FormGroup>
         </div>
         <div className="create-course-button-container">
           <Button text="Create Course" onClick={submitHandler} />
diff --git a/src/commons/mocks/BackendMocks.ts b/src/commons/mocks/BackendMocks.ts
index d50a365835..cba44a0afb 100644
--- a/src/commons/mocks/BackendMocks.ts
+++ b/src/commons/mocks/BackendMocks.ts
@@ -343,7 +343,11 @@ export function* mockBackendSaga(): SagaIterator {
       return gradingQuestion;
     });
     yield put(
-      actions.updateGrading(submissionId, { answers: newGrading, assessment: grading.assessment })
+      actions.updateGrading(submissionId, {
+        answers: newGrading,
+        assessment: grading.assessment,
+        enable_llm_grading: false
+      })
     );
     yield call(showSuccessMessage, 'Submitted!', 1000);
   };
diff --git a/src/commons/mocks/GradingMocks.ts b/src/commons/mocks/GradingMocks.ts
index 5817ff8b93..5c03828ed8 100644
--- a/src/commons/mocks/GradingMocks.ts
+++ b/src/commons/mocks/GradingMocks.ts
@@ -128,6 +128,8 @@ export const mockTestcases: Testcase[] = [
 
 export const mockGradingAnswer: GradingAnswer = [
   {
+    autogradingResults: [],
+    autoGradingStatus: 'N/A',
     question: {
       answer: `function remainder(n, d) {
   return (n - d) < 0 ? n : remainder(n - d, d);
@@ -244,6 +246,8 @@ _italics_
     }
   },
   {
+    autogradingResults: [],
+    autoGradingStatus: 'N/A',
     question: {
       prepend: '',
       postpend: '',
@@ -336,6 +340,8 @@ New message from **Avenger**!
     }
   },
   {
+    autogradingResults: [],
+    autoGradingStatus: 'N/A',
     question: {
       // C is the answer
       prepend: '',
@@ -415,6 +421,7 @@ New message from **Avenger**!
 
 export const mockGradingAssessment: GradingAssessment = {
   coverPicture: 'https://i.imgur.com/dR7zBPI.jpeg',
+  llm_assessment_prompt: null,
   id: 1,
   number: '10',
   reading:
@@ -434,7 +441,8 @@ Starring: Source Academy`,
 
 export const mockGradingQuery: GradingQuery = {
   answers: mockGradingAnswer,
-  assessment: mockGradingAssessment
+  assessment: mockGradingAssessment,
+  enable_llm_grading: false
 };
 
 /**
diff --git a/src/commons/sagas/BackendSaga.ts b/src/commons/sagas/BackendSaga.ts
index a3be267e85..9e45231bf3 100644
--- a/src/commons/sagas/BackendSaga.ts
+++ b/src/commons/sagas/BackendSaga.ts
@@ -637,7 +637,11 @@ function* sendGrade(
   });
 
   yield put(
-    actions.updateGrading(submissionId, { answers: newGrading, assessment: grading.assessment })
+    actions.updateGrading(submissionId, {
+      answers: newGrading,
+      assessment: grading.assessment,
+      enable_llm_grading: false
+    })
   );
 }
 
diff --git a/src/commons/sagas/RequestsSaga.ts b/src/commons/sagas/RequestsSaga.ts
index 245d155cf0..2e5218c761 100644
--- a/src/commons/sagas/RequestsSaga.ts
+++ b/src/commons/sagas/RequestsSaga.ts
@@ -1044,6 +1044,7 @@ export const getGrading = async (
         solutionTemplate: question.solutionTemplate,
         prepend: question.prepend || '',
         postpend: question.postpend || '',
+        llm_prompt: question.llm_prompt || null,
         testcases: question.testcases || [],
         type: question.type as QuestionType,
         maxXp: question.maxXp
@@ -1054,7 +1055,8 @@ export const getGrading = async (
         xp: grade.xp,
         xpAdjustment: grade.xpAdjustment,
         comments: grade.comments
-      }
+      },
+      ai_comments: gradingQuestion.ai_comments?.response?.split('|||') || []
     } as GradingQuestion;
 
     if (gradingQuestion.grade.grader !== null) {
@@ -1064,7 +1066,11 @@ export const getGrading = async (
     return result;
   });
 
-  return { answers: grading, assessment: gradingResult.assessment };
+  return {
+    enable_llm_grading: gradingResult.enable_llm_grading,
+    answers: grading,
+    assessment: gradingResult.assessment
+  };
 };
 
 /**
@@ -1548,6 +1554,46 @@ export const removeAssessmentConfig = async (
   return resp;
 };
 
+/**
+ * POST /courses/{courseId}/admin/generate-comments/{submissionId}/{questionId}
+ */
+export const postGenerateComments = async (
+  tokens: Tokens,
+  submission_id: number,
+  question_id: number
+): Promise<{ comments: string[] } | null> => {
+  const resp = await request(
+    `${courseId()}/admin/generate-comments/${submission_id}/${question_id}`,
+    'POST',
+    {
+      ...tokens
+    }
+  );
+  if (!resp || !resp.ok) {
+    return null;
+  }
+
+  return await resp.json();
+};
+
+export const saveFinalComment = async (
+  tokens: Tokens,
+  submission_id: number,
+  question_id: number,
+  comment: string
+): Promise<Response | null> => {
+  const resp = await request(
+    `${courseId()}/admin/save-final-comment/${submission_id}/${question_id}`,
+    'POST',
+    {
+      body: { comment: comment },
+      ...tokens
+    }
+  );
+
+  return resp;
+};
+
 /**
  * GET /courses/{courseId}/admin/users
  */
diff --git a/src/features/grading/GradingTypes.ts b/src/features/grading/GradingTypes.ts
index 04c1364c19..b5bf94dcd9 100644
--- a/src/features/grading/GradingTypes.ts
+++ b/src/features/grading/GradingTypes.ts
@@ -94,11 +94,13 @@ export type GradingAssessment = {
   summaryLong: string;
   summaryShort: string;
   title: string;
+  llm_assessment_prompt: string | null;
 };
 
 export type GradingQuery = {
   answers: GradingAnswer;
   assessment: GradingAssessment;
+  enable_llm_grading: boolean | null;
 };
 
 export type GradingSubmissionTableProps = {
@@ -189,6 +191,9 @@ export type GradingQuestion = {
     };
     gradedAt?: string;
   };
+  autogradingResults: AutogradingResult[];
+  autoGradingStatus: string;
+  ai_comments?: string[];
 };
 
 /**
diff --git a/src/pages/academy/adminPanel/AdminPanel.tsx b/src/pages/academy/adminPanel/AdminPanel.tsx
index 2170f773b3..e35f4c7d48 100644
--- a/src/pages/academy/adminPanel/AdminPanel.tsx
+++ b/src/pages/academy/adminPanel/AdminPanel.tsx
@@ -30,7 +30,12 @@ const defaultCourseConfig: UpdateCourseConfiguration = {
   topContestLeaderboardDisplay: 10,
   enableSourcecast: true,
   enableStories: false,
-  moduleHelpText: ''
+  enableLlmGrading: false,
+  moduleHelpText: '',
+  llmApiKey: '',
+  llmModel: '',
+  llmApiUrl: '',
+  llmCourseLevelPrompt: ''
 };
 
 const AdminPanel: React.FC = () => {
@@ -67,7 +72,12 @@ const AdminPanel: React.FC = () => {
       topContestLeaderboardDisplay: session.topContestLeaderboardDisplay,
       enableSourcecast: session.enableSourcecast,
       enableStories: session.enableStories,
-      moduleHelpText: session.moduleHelpText
+      enableLlmGrading: session.enableLlmGrading,
+      moduleHelpText: session.moduleHelpText,
+      llmApiKey: session.llmApiKey,
+      llmModel: session.llmModel,
+      llmApiUrl: session.llmApiUrl,
+      llmCourseLevelPrompt: session.llmCourseLevelPrompt
     });
   }, [
     session.courseName,
@@ -80,8 +90,13 @@ const AdminPanel: React.FC = () => {
     session.enableGame,
     session.enableSourcecast,
     session.enableStories,
+    session.enableLlmGrading,
     session.moduleHelpText,
-    session.viewable
+    session.viewable,
+    session.llmApiKey,
+    session.llmModel,
+    session.llmApiUrl,
+    session.llmCourseLevelPrompt
   ]);
 
   const tableRef = useRef<ImperativeAssessmentConfigPanel>(null);
diff --git a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
index 822445b50f..1028bed958 100644
--- a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
+++ b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
@@ -3,12 +3,16 @@ import {
   FormGroup,
   H2,
   H3,
+  Icon,
   InputGroup,
+  Popover,
+  Position,
   Switch,
   Tab,
   Tabs,
   TextArea
 } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
 import React from 'react';
 import { useResponsive } from 'src/commons/utils/Hooks';
 
@@ -42,7 +46,12 @@ const CourseConfigPanel: React.FC<Props> = props => {
     topContestLeaderboardDisplay,
     enableSourcecast,
     enableStories,
-    moduleHelpText
+    enableLlmGrading,
+    moduleHelpText,
+    llmApiKey,
+    llmModel,
+    llmApiUrl,
+    llmCourseLevelPrompt
   } = props.courseConfiguration;
 
   const writePanel = (
@@ -171,6 +180,122 @@ const CourseConfigPanel: React.FC<Props> = props => {
               }
             />
           </FormGroup>
+
+          {enableLlmGrading && (
+            <div className="llm-grading-config">
+              <Divider style={{ marginTop: '20px', marginBottom: '20px' }} />
+              <h3>LLM Grading Configuration</h3>
+              <FormGroup
+                helperText="Please enter the LLM Model Name."
+                inline={true}
+                label="LLM Model Name"
+                labelFor="llmModel"
+              >
+                <InputGroup
+                  id="llmModel"
+                  defaultValue={llmModel}
+                  placeholder="e.g gpt-5-mini, gpt-4o"
+                  onChange={e =>
+                    props.setCourseConfiguration({
+                      ...props.courseConfiguration,
+                      llmModel: e.target.value
+                    })
+                  }
+                />
+              </FormGroup>
+              <FormGroup
+                helperText="Please enter the LLM API's Provider URL."
+                inline={true}
+                label="LLM Provider URL"
+                labelFor="llmApiUrl"
+              >
+                <InputGroup
+                  id="llmApiUrl"
+                  defaultValue={llmApiUrl}
+                  placeholder="e.g https://api.openai.com/v1/chat/completions"
+                  onChange={e =>
+                    props.setCourseConfiguration({
+                      ...props.courseConfiguration,
+                      llmApiUrl: e.target.value
+                    })
+                  }
+                />
+              </FormGroup>
+              <FormGroup
+                helperText="Please enter the LLM API Key."
+                inline={true}
+                label="LLM API Key"
+                labelFor="llmApiKey"
+              >
+                <InputGroup
+                  id="llmApiKey"
+                  type="password"
+                  defaultValue={llmApiKey}
+                  onChange={e =>
+                    props.setCourseConfiguration({
+                      ...props.courseConfiguration,
+                      llmApiKey: e.target.value
+                    })
+                  }
+                />
+              </FormGroup>
+              <FormGroup
+                helperText={
+                  <span>
+                    Please enter the LLM prompt for this course. This is treated as the System
+                    Prompt.
+                    <Popover
+                      content={
+                        <div style={{ maxWidth: '48rem' }}>
+                          <p>
+                            This prompt is prepended to every single LLM Grading prompt as part of
+                            the System Prompt
+                          </p>
+
+                          <p>
+                            <b>Note: </b> You must specify the return format of the comments so that
+                            comments can be parsed correctly. An example is given below:
+                          </p>
+
+                          <code>
+                            Your output must include only the comment suggestions, separated
+                            exclusively by triple pipes ("|||") with no spaces before or after the
+                            pipes, and without any additional formatting, bullet points, or extra
+                            text.
+                            <br />
+                            <br />
+                            For example: "This is a good answer.|||This is a bad answer.|||This is a
+                            great answer.
+                          </code>
+                        </div>
+                      }
+                      interactionKind="hover"
+                      position={Position.TOP}
+                    >
+                      <Icon icon={IconNames.HELP} className="llm-course-prompt-icon" />
+                    </Popover>
+                  </span>
+                }
+                inline={true}
+                label="LLM Course Prompt"
+                labelFor="llmCoursePrompt"
+              >
+                <TextArea
+                  id="llmCourseLevelPrompt"
+                  className="llm-prompt-input-textarea"
+                  fill={true}
+                  placeholder="You are looking at a modified version of Javascript"
+                  value={llmCourseLevelPrompt}
+                  onChange={e =>
+                    props.setCourseConfiguration({
+                      ...props.courseConfiguration,
+                      llmCourseLevelPrompt: e.target.value
+                    })
+                  }
+                />
+              </FormGroup>
+            </div>
+          )}
         </div>
         {!isMobileBreakpoint && <Divider />}
         <div className="booleans">
@@ -224,6 +349,16 @@ const CourseConfigPanel: React.FC<Props> = props => {
               })
             }
           />
+          <Switch
+            checked={enableLlmGrading}
+            label="Enable LLM Grading"
+            onChange={e =>
+              props.setCourseConfiguration({
+                ...props.courseConfiguration,
+                enableLlmGrading: (e.target as HTMLInputElement).checked
+              })
+            }
+          />
           <Switch
             checked={enableOverallLeaderboard}
             label="Enable Overall Leaderboard"
diff --git a/src/pages/academy/grading/subcomponents/GradingCommentSelector.tsx b/src/pages/academy/grading/subcomponents/GradingCommentSelector.tsx
new file mode 100644
index 0000000000..57d66698bb
--- /dev/null
+++ b/src/pages/academy/grading/subcomponents/GradingCommentSelector.tsx
@@ -0,0 +1,43 @@
+import { H5, NonIdealState, Spinner } from '@blueprintjs/core';
+import React from 'react';
+
+type Props = {
+  comments: string[];
+  isLoading: boolean;
+  onSelect: (comment: string) => void;
+};
+
+const GradingCommentSelector: React.FC<Props> = props => {
+  return (
+    <div className="grading-comment-selector">
+      <H5 className="grading-comment-selector-title">LLM Comment Suggestions:</H5>
+
+      {props.isLoading ? (
+        <NonIdealState icon={<Spinner />} />
+      ) : (
+        <div>
+          {' '}
+          {props.comments.length > 0 ? (
+            props.comments.map((el, index) => {
+              return (
+                <button
+                  key={index}
+                  className="grading-comment-selector-item"
+                  onClick={() => {
+                    props.onSelect(el);
+                  }}
+                >
+                  {el}
+                </button>
+              );
+            })
+          ) : (
+            <span>No Comments Generated</span>
+          )}{' '}
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default GradingCommentSelector;
diff --git a/src/pages/academy/grading/subcomponents/GradingEditor.tsx b/src/pages/academy/grading/subcomponents/GradingEditor.tsx
index 3b834b0845..680ce2b818 100644
--- a/src/pages/academy/grading/subcomponents/GradingEditor.tsx
+++ b/src/pages/academy/grading/subcomponents/GradingEditor.tsx
@@ -1,7 +1,9 @@
 import {
   Button,
+  Dialog,
   Divider,
   H3,
+  H5,
   Icon,
   IconName,
   Intent,
@@ -13,11 +15,15 @@ import { IconNames } from '@blueprintjs/icons';
 import React, { useEffect, useMemo, useState } from 'react';
 import ReactMde, { ReactMdeProps } from 'react-mde';
 import { useDispatch } from 'react-redux';
+import { AutogradingResult } from 'src/commons/assessment/AssessmentTypes';
+import { useTokens } from 'src/commons/utils/Hooks';
 
 import SessionActions from '../../../../commons/application/actions/SessionActions';
 import ControlButton from '../../../../commons/ControlButton';
 import Markdown from '../../../../commons/Markdown';
 import { Prompt } from '../../../../commons/ReactRouterPrompt';
+import { postGenerateComments } from '../../../../commons/sagas/RequestsSaga';
+import { saveFinalComment } from '../../../../commons/sagas/RequestsSaga';
 import { getPrettyDate } from '../../../../commons/utils/DateHelper';
 import { showSimpleConfirmDialog } from '../../../../commons/utils/DialogHelper';
 import {
@@ -25,6 +31,7 @@ import {
   showWarningMessage
 } from '../../../../commons/utils/notifications/NotificationsHelper';
 import { convertParamToInt } from '../../../../commons/utils/ParamParseHelper';
+import GradingCommentSelector from './GradingCommentSelector';
 
 type GradingSaveFunction = (
   submissionId: number,
@@ -42,15 +49,25 @@ type Props = {
   maxXp: number;
   studentNames: string[];
   studentUsernames: string[];
+  is_llm: boolean;
   comments: string;
+  llm_course_level_prompt: string | null;
+  llm_assessment_prompt: string | null;
+  llm_question_prompt: string | null;
+  autoGradingStatus: string;
+  autoGradingResults: AutogradingResult[];
+  questionContent: string;
+  studentAnswer: string | null;
   graderName?: string;
   gradedAt?: string;
+  ai_comments?: string[];
 };
 
 const gradingEditorButtonClass = 'grading-editor-button';
 
 const GradingEditor: React.FC<Props> = props => {
   const dispatch = useDispatch();
+  const tokens = useTokens();
   const { handleGradingSave, handleGradingSaveAndContinue, handleReautogradeAnswer } = useMemo(
     () =>
       ({
@@ -101,11 +118,35 @@ const GradingEditor: React.FC<Props> = props => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.submissionId, props.questionId]);
 
+  const getCommentSuggestions = async () => {
+    const resp = await postGenerateComments(tokens, props.submissionId, props.questionId);
+    return resp;
+  };
+
+  const onSelectGeneratedComments = (comment: string) => {
+    if (!selectedSuggestions.includes(comment)) {
+      setSelectedSuggestions([comment, ...selectedSuggestions]);
+    }
+
+    setEditorValue(editorValue + comment);
+  };
+
+  const postSaveFinalComment = async (comment: string) => {
+    const resp = await saveFinalComment(tokens, props.submissionId, props.questionId, comment);
+    return resp;
+  };
+
+  const [suggestions, setSuggestions] = useState<string[]>([]);
+  const [selectedSuggestions, setSelectedSuggestions] = useState<string[]>([]);
+  const [hasClickedGenerate, setHasClickedGenerate] = useState<boolean>(false);
+  const [isViewLLMPromptOpen, setIsViewLLMPromptOpen] = useState<boolean>(false);
+
   const makeInitialState = () => {
     setXpAdjustmentInput(props.xpAdjustment.toString());
     setEditorValue(props.comments);
     setSelectedTab('write');
     setCurrentlySaving(false);
+    setSuggestions(props.ai_comments || []);
   };
 
   /**
@@ -126,9 +167,10 @@ const GradingEditor: React.FC<Props> = props => {
    */
   const validateXpBeforeSave =
     (handleSaving: GradingSaveFunction): (() => void) =>
-    () => {
+    async () => {
       const newXpAdjustmentInput = convertParamToInt(xpAdjustmentInput || undefined) || undefined;
       const xp = props.initialXp + (newXpAdjustmentInput || 0);
+      await postSaveFinalComment(editorValue);
       if (xp < 0 || xp > props.maxXp) {
         showWarningMessage(
           `XP ${xp.toString()} is out of bounds. Maximum xp is ${props.maxXp.toString()}.`
@@ -216,6 +258,30 @@ const GradingEditor: React.FC<Props> = props => {
       />
     );
 
+  const copyComposedPromptToClipboard = () => {
+    navigator.clipboard.writeText(
+      `${props.llm_course_level_prompt || ''}\n
+${props.llm_assessment_prompt || ''}\n
+${props.llm_question_prompt || ''}\n
+**Question:** \n
+\`\`\`\n
+${props.questionContent}\n
+\`\`\`\n\n
+**Model Solution:** \n
+\`\`\`\n
+${props.solution || 'N/A'}\n
+\`\`\`\n\n
+**Autograding Status:** ${props.autoGradingStatus}\n
+**Autograding Results:** ${props.autoGradingResults ? JSON.stringify(props.autoGradingResults) : 'N/A'}\n
+The student answer will be given below as part of the User Prompt.\n
+**Student Answer:** \n
+\`\`\`\n
+${props.studentAnswer}\n
+\`\`\``
+    );
+    showSuccessMessage('Composed prompt copied to clipboard!', 2000);
+  };
+
   // Render
   const hasUnsavedChanges = checkHasUnsavedChanges();
   const isNewQuestion = checkIsNewQuestion();
@@ -304,6 +370,99 @@ const GradingEditor: React.FC<Props> = props => {
         </div>
       </div>
 
+      {props.is_llm && (
+        <>
+          <Dialog
+            title="Full Composed LLM Prompt"
+            icon={IconNames.WRENCH}
+            isOpen={isViewLLMPromptOpen}
+            onClose={() => setIsViewLLMPromptOpen(false)}
+          >
+            <div className="llm-prompt-dialog">
+              <div className="forenote-section">
+                <span className="forenote">
+                  <b>Note:</b> The titles here are provided merely to distinguish the different
+                  sections. They are not included in the final prompt.
+                </span>
+                <Button
+                  onClick={() => {
+                    copyComposedPromptToClipboard();
+                  }}
+                >
+                  <Icon icon={IconNames.Clipboard} />
+                </Button>
+              </div>
+              <H3>System Prompt</H3>
+              <Divider />
+              <H5>Course Level Prompt</H5>
+              {props.llm_course_level_prompt || ''}
+              <br />
+              <H5>Assessment Level Prompt</H5>
+              {props.llm_assessment_prompt || ''}
+              <br />
+              <H5>Question Level Prompt</H5>
+              {props.llm_question_prompt || ''}
+              <H5>Generic Info From Question</H5>
+              **Question:** <br />
+              ```
+              <br />
+              {props.questionContent}
+              <br />
+              ```
+              <br />
+              <br />
+              **Model Solution:** <br />
+              ``` <br />
+              {props.solution || 'N/A'}
+              <br />
+              ```
+              <br />
+              <br />
+              **Autograding Status:** {props.autoGradingStatus} <br />
+              **Autograding Results:**{' '}
+              {props.autoGradingResults ? JSON.stringify(props.autoGradingResults) : 'N/A'} <br />
+              The student answer will be given below as part of the User Prompt.
+              <H3>User Prompt</H3>
+              <Divider />
+              **Student Answer:** <br />
+              ``` <br />
+              {props.studentAnswer}
+              <br />
+              ``` <br />
+            </div>
+          </Dialog>
+          <div style={{ marginBottom: '10px' }}>
+            <GradingCommentSelector
+              onSelect={onSelectGeneratedComments}
+              isLoading={hasClickedGenerate}
+              comments={suggestions}
+            />
+            <div style={{ display: 'flex', justifyContent: 'center' }}>
+              <Button
+                style={{ marginRight: '1rem' }}
+                onClick={async () => {
+                  setIsViewLLMPromptOpen(true);
+                }}
+              >
+                View Prompt
+              </Button>
+
+              <Button
+                intent="primary"
+                onClick={async () => {
+                  setHasClickedGenerate(true);
+                  const resp = await getCommentSuggestions();
+                  setHasClickedGenerate(false);
+                  setSuggestions(resp ? resp.comments : []);
+                }}
+              >
+                Generate Comments
+              </Button>
+            </div>
+          </div>
+        </>
+      )}
+
       <div className="react-mde-parent">
         <ReactMde
           value={editorValue}
diff --git a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
index b9a11c13db..8ef8ada612 100644
--- a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
+++ b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
@@ -76,6 +76,8 @@ const GradingWorkspace: React.FC<Props> = props => {
 
   const grading = useTypedSelector(state => state.session.gradings[props.submissionId]);
   const courseId = useTypedSelector(state => state.session.courseId);
+  const llm_grading = useTypedSelector(state => state.session.enableLlmGrading);
+  const llm_course_level_prompt = useTypedSelector(state => state.session.llmCourseLevelPrompt);
   const {
     autogradingResults,
     isFolderModeEnabled,
@@ -302,8 +304,10 @@ const GradingWorkspace: React.FC<Props> = props => {
         /* Render an editor with the xp given to the current question. */
         body: (
           <GradingEditor
+            ai_comments={grading!.answers[questionId].ai_comments || []}
             solution={grading!.answers[questionId].question.solution}
             questionId={grading!.answers[questionId].question.id}
+            questionContent={grading!.answers[questionId].question.content}
             submissionId={props.submissionId}
             initialXp={grading!.answers[questionId].grade.xp}
             xpAdjustment={grading!.answers[questionId].grade.xpAdjustment}
@@ -312,17 +316,32 @@ const GradingWorkspace: React.FC<Props> = props => {
               grading!.answers[questionId].student.name,
               grading!.answers[questionId].team
             )}
+            studentAnswer={
+              grading!.answers[questionId].question.type === 'programming'
+                ? grading!.answers[questionId].question.answer
+                : 'N/A'
+            }
             studentUsernames={
               grading!.answers[questionId].student.username
                 ? [grading!.answers[questionId].student.username]
                 : grading!.answers[questionId].team!.map(member => member.username)
             }
+            is_llm={!!llm_grading && grading!.answers[questionId].question.type == 'programming'}
+            llm_course_level_prompt={llm_course_level_prompt || ''}
+            llm_assessment_prompt={grading!.assessment.llm_assessment_prompt}
+            llm_question_prompt={
+              (grading!.answers[questionId].question.type === 'programming' &&
+                grading!.answers[questionId].question.llm_prompt) ||
+              ''
+            }
             comments={grading!.answers[questionId].grade.comments ?? ''}
             graderName={
               grading!.answers[questionId].grade.grader
                 ? grading!.answers[questionId].grade.grader!.name
                 : undefined
             }
+            autoGradingStatus={grading!.answers[questionId].autoGradingStatus || 'N/A'}
+            autoGradingResults={grading!.answers[questionId].autogradingResults}
             gradedAt={
               grading!.answers[questionId].grade.gradedAt
                 ? grading!.answers[questionId].grade.gradedAt!
diff --git a/src/pages/localStorage.ts b/src/pages/localStorage.ts
index 56b1b30a4f..9e219ec356 100644
--- a/src/pages/localStorage.ts
+++ b/src/pages/localStorage.ts
@@ -75,6 +75,9 @@ export const saveState = (state: OverallState) => {
         topContestLeaderboardDisplay: state.session.topContestLeaderboardDisplay,
         enableSourcecast: state.session.enableSourcecast,
         enableStories: state.session.enableStories,
+        enableLlmGrading: state.session.enableLlmGrading,
+        llmApiKey: state.session.llmApiKey,
+        llmCourseLevelPrompt: state.session.llmCourseLevelPrompt,
         moduleHelpText: state.session.moduleHelpText,
         assetsPrefix: state.session.assetsPrefix,
         assessmentConfigurations: state.session.assessmentConfigurations,
diff --git a/src/styles/_academy.scss b/src/styles/_academy.scss
index 6cdbcb3557..a550631c1a 100644
--- a/src/styles/_academy.scss
+++ b/src/styles/_academy.scss
@@ -258,6 +258,28 @@
   }
 }
 
+.llm-prompt-dialog {
+  white-space: pre-wrap; // To allow for "\n" newlines
+  padding: 1rem;
+  h3 {
+    margin-top: 1rem;
+  }
+  h5 {
+    margin-top: 0.5rem;
+  }
+  .forenote {
+    display: block;
+    font-size: small;
+    color: gray;
+  }
+
+  .forenote-section {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+}
+
 .betcha-dialog,
 .assessment-reset {
   span.warning {
@@ -345,6 +367,10 @@
         height: 100px;
       }
 
+      .llm-prompt-input-textarea {
+        height: 300px;
+      }
+
       .input-markdown {
         padding: 10px;
         height: 100px;
@@ -364,11 +390,33 @@
       }
     }
 
+    .llm-grading-config {
+      .bp6-form-group {
+        display: flex;
+        justify-content: space-between;
+        .bp6-label {
+          margin-right: 10px;
+          width: 180px;
+        }
+        .bp6-form-content {
+          width: 100%;
+        }
+      }
+
+      .llm-course-prompt-icon {
+        margin-left: 5px;
+        vertical-align: text-bottom;
+        cursor: help;
+      }
+    }
+
     .booleans {
       display: flex;
       flex-direction: column;
-      justify-content: space-evenly;
       align-items: flex-start;
+      label {
+        margin-top: 1.5rem;
+      }
     }
   }
 }
diff --git a/src/styles/_workspace.scss b/src/styles/_workspace.scss
old mode 100755
new mode 100644
index 08c7e4da9d..1bd9da8369
--- a/src/styles/_workspace.scss
+++ b/src/styles/_workspace.scss
@@ -340,6 +340,36 @@ $code-color-notification: #f9f0d7;
         }
       }
 
+      .grading-comment-selector {
+        text-align: center;
+        display: flex !important;
+        justify-content: center;
+        flex-direction: column;
+        font-size: 0.875rem;
+        border-radius: 4px;
+        background-color: $cadet-color-1;
+        margin-top: 4px;
+        margin-bottom: 4px;
+        padding: 8px;
+      }
+
+      .grading-comment-selector-title {
+        margin-bottom: 12px;
+      }
+
+      .grading-comment-selector-item {
+        margin: 3px;
+        padding: 7px;
+        background-color: $cadet-color-2;
+        border: 1px solid $cadet-color-3;
+        width: 100%;
+        cursor: pointer;
+
+        &:hover {
+          background-color: $cadet-color-3;
+        }
+      }
+
       .react-mde-parent {
         margin-bottom: 12px;
       }