diff --git a/public/learning-course/Kitbot.webp b/public/learning-course/Kitbot.webp
new file mode 100644
index 0000000..a585ab0
Binary files /dev/null and b/public/learning-course/Kitbot.webp differ
diff --git a/public/learning-course/wpilblogo.webp b/public/learning-course/wpilblogo.webp
new file mode 100644
index 0000000..8e0095b
Binary files /dev/null and b/public/learning-course/wpilblogo.webp differ
diff --git a/public/website-feature-guide/slide1.png b/public/website-feature-guide/slide1.png
new file mode 100644
index 0000000..a16d760
Binary files /dev/null and b/public/website-feature-guide/slide1.png differ
diff --git a/public/website-feature-guide/slide2.png b/public/website-feature-guide/slide2.png
new file mode 100644
index 0000000..fcefff5
Binary files /dev/null and b/public/website-feature-guide/slide2.png differ
diff --git a/src/components/CourseSection.astro b/src/components/CourseSection.astro
new file mode 100644
index 0000000..24fa364
--- /dev/null
+++ b/src/components/CourseSection.astro
@@ -0,0 +1,167 @@
+---
+import ContentFigure from './ContentFigure.astro';
+
+interface Props {
+    title: string;
+    href: string;
+    image?: string;
+    imageAlt?: string;
+    imageSide?: 'left' | 'right';
+    underConstruction?: boolean;
+}
+
+const {
+    title,
+    href,
+    image,
+    imageAlt = title,
+    imageSide = 'right',
+    underConstruction = false,
+} = Astro.props;
+
+const hasImage = Boolean(image);
+---
+
+<section
+    class:list={[
+        'course-section',
+        hasImage && `image-${imageSide}`,
+        !hasImage && 'no-image',
+    ]}
+>
+    {
+        hasImage && imageSide === 'left' && (
+            <div class="course-section-image">
+                <ContentFigure src={image!} alt={imageAlt} />
+            </div>
+        )
+    }
+
+    <div class="course-section-content">
+        <h3 class="course-section-title">
+            <a href={href}>{title}</a>
+            {
+                underConstruction && (
+                    <span class="under-construction">
+                        {' '}
+                        (Under Construction)
+                    </span>
+                )
+            }
+        </h3>
+        <ul class="course-section-list">
+            <slot />
+        </ul>
+    </div>
+
+    {
+        hasImage && imageSide === 'right' && (
+            <div class="course-section-image">
+                <ContentFigure src={image!} alt={imageAlt} />
+            </div>
+        )
+    }
+</section>
+
+<style>
+    .course-section {
+        display: grid;
+        grid-template-columns: minmax(0, 1fr) minmax(10rem, 17.5rem);
+        gap: 2rem;
+        align-items: center;
+        margin: 1.5rem 0;
+        padding-top: 1.5rem;
+        border-top: 1px solid var(--sl-color-gray-5);
+    }
+
+    .course-section.image-left {
+        grid-template-columns: minmax(10rem, 17.5rem) minmax(0, 1fr);
+    }
+
+    .course-section.no-image {
+        display: block;
+    }
+
+    .course-section-content {
+        max-width: 34rem;
+    }
+
+    .course-section.image-left .course-section-content {
+        justify-self: end;
+        text-align: right;
+    }
+
+    .course-section.no-image .course-section-content {
+        max-width: 42rem;
+    }
+
+    .course-section-image {
+        width: min(100%, 17.5rem);
+    }
+
+    .course-section.image-right .course-section-image {
+        justify-self: end;
+    }
+
+    .course-section-title {
+        margin-top: 0;
+        margin-bottom: 0.75rem;
+        color: var(--accent-color, #43a047);
+    }
+
+    .course-section-title a {
+        color: var(--accent-color, #43a047);
+        text-decoration: none;
+    }
+
+    .course-section-title a:hover {
+        text-decoration: underline;
+    }
+
+    .under-construction {
+        color: var(--accent-color, #43a047);
+        font-weight: normal;
+    }
+
+    .course-section-list {
+        margin: 0;
+        padding-left: 1.25rem;
+    }
+
+    .course-section.image-left .course-section-list {
+        direction: rtl;
+        list-style-position: outside;
+        padding-right: 1.25rem;
+        padding-left: 0;
+    }
+
+    .course-section-list :global(li) {
+        margin-bottom: 0.25rem;
+    }
+
+    @media (max-width: 768px) {
+        .course-section,
+        .course-section.image-left {
+            grid-template-columns: 1fr;
+            gap: 1rem;
+        }
+
+        .course-section.image-left .course-section-content {
+            justify-self: auto;
+            text-align: left;
+        }
+
+        .course-section.image-left .course-section-list {
+            direction: ltr;
+            padding-right: 0;
+            padding-left: 1.25rem;
+        }
+
+        .course-section-image,
+        .course-section.image-right .course-section-image {
+            justify-self: auto;
+            order: -1;
+            width: min(100%, 17.5rem);
+        }
+    }
+</style>
diff --git a/src/config/sidebarConfig.ts b/src/config/sidebarConfig.ts
index d59606a..72e16be 100644
--- a/src/config/sidebarConfig.ts
+++ b/src/config/sidebarConfig.ts
@@ -26,6 +26,153 @@ export const sidebarSections: Record<string, SidebarSection[]> = {
         },
     ],
 
+    // Learning Course section
+    '/learning-course': [
+        {
+            label: 'Learning Course',
+            items: [
+                { label: 'Overview', slug: 'learning-course' },
+                {
+                    label: 'Feature Guide',
+                    slug: 'learning-course/getting-started/website-feature-guide',
+                },
+                {
+                    label: 'Course Setup',
+                    collapsed: true,
+                    items: [
+                        {
+                            label: 'Required Tools',
+                            slug: 'learning-course/getting-started/required-tools',
+                        },
+                        {
+                            label: 'VS Code Overview',
+                            slug: 'learning-course/getting-started/vscode-overview',
+                        },
+                        {
+                            label: 'Forking and Cloning',
+                            slug: 'learning-course/getting-started/forking-and-cloning',
+                        },
+                    ],
+                },
+                {
+                    label: 'Stage 0',
+                    collapsed: true,
+                    items: [
+                        {
+                            label: 'Stage 0 Introduction',
+                            slug: 'learning-course/intro-to-java/stage-overview',
+                        },
+                        {
+                            label: 'Intro To Java',
+                            collapsed: true,
+                            items: [
+                                {
+                                    label: 'Java Fundamentals',
+                                    slug: 'learning-course/intro-to-java/java-fundamentals',
+                                },
+                                // {
+                                //     label: 'Operators',
+                                //     slug: 'learning-course/intro-to-java/operators',
+                                // },
+                                // {
+                                //     label: 'Conditionals',
+                                //     slug: 'learning-course/intro-to-java/conditionals',
+                                // },
+                                // {
+                                //     label: 'Loops',
+                                //     slug: 'learning-course/intro-to-java/loops',
+                                // },
+                                // {
+                                //     label: 'Objects',
+                                //     slug: 'learning-course/intro-to-java/objects',
+                                // },
+                                // {
+                                //     label: 'Methods',
+                                //     slug: 'learning-course/intro-to-java/methods',
+                                // },
+                            ],
+                        },
+                    ],
+                },
+                {
+                    label: 'Stage 1',
+                    collapsed: true,
+                    items: [
+                        // {
+                        //     label: 'Stage 1 Introduction',
+                        //     slug: 'learning-course/stage-1a-commands/overview',
+                        // },
+                        {
+                            label: 'Stage 1A: TBD',
+                            collapsed: true,
+                            items: [
+                                // {
+                                //     label: 'TBD',
+                                //     slug: 'stage-1a-commands/command-based-overview',
+                                // },
+                                // {
+                                //     label: 'TBD',
+                                //     slug: 'stage-1a-commands/the-command-body',
+                                // },
+                                // {
+                                //     label: 'TBD',
+                                //     slug: 'stage-1a-commands/commands-and-mechanisms',
+                                // },
+                            ],
+                        },
+                        {
+                            label: 'Stage 1B: Commands',
+                            collapsed: true,
+                            items: [
+                                // {
+                                //     label: 'Stage 1B Introduction',
+                                //     slug: 'learning-course/stage1b/overview',
+                                // },
+                                // {
+                                //     label: '1B',
+                                //     collapsed: true,
+                                //     items: [
+                                //         {
+                                //             label: 'The Concepts',
+                                //             slug: 'stage-1b-commands/command-based-overview',
+                                //         },
+                                //         {
+                                //             label: 'The Body of a Command',
+                                //             slug: 'stage-1b-commands/the-command-body',
+                                //         },
+                                //         {
+                                //             label: 'Commands & Mechanisms, Pt. 1',
+                                //             slug: 'stage-1b-commands/commands-and-mechanisms',
+                                //         },
+                                //         {
+                                //             label: 'Triggers and Scheduling',
+                                //             slug: 'stage-1b-commands/triggers',
+                                //         },
+                                //         {
+                                //             label: 'Commands & Mechanisms, Pt. 2',
+                                //             slug: 'stage-1b-commands/commands-and-mechanisms-pt2',
+                                //         },
+                                //         {
+                                //             label: 'Exercise - Kitbot Rewrite, Pt. 1',
+                                //             slug: 'stage-1b-commands/command-based-kitbot',
+                                //         },
+                                //         {
+                                //             label: 'Suppliers in Command-Based',
+                                //             slug: 'stage-1b-commands/suppliers-in-command-based',
+                                //         },
+                                //         {
+                                //             label: 'Exercise - Kitbot Rewrite, Pt. 2',
+                                //             slug: 'stage-1b-commands/command-based-kitbot-pt2',
+                                //         },
+                                //     ],
+                                // },
+                            ],
+                        },
+                    ],
+                },
+            ],
+        },
+    ],
     // Educator's Guide section
     '/educators-guide': [
         {
@@ -94,7 +241,11 @@ export const sidebarSections: Record<string, SidebarSection[]> = {
             label: 'Getting Started',
             items: [
                 {
-                    label: 'Intro to Programmming',
+                    label: 'Website Feature Guide',
+                    slug: 'getting-started/website-feature-guide',
+                },
+                {
+                    label: 'Intro to Programming',
                     slug: 'getting-started/intro-to-prog',
                 },
                 {
diff --git a/src/content/docs/feature-guide/img/slide1.webp b/src/content/docs/feature-guide/img/slide1.webp
deleted file mode 100644
index 388ed02..0000000
Binary files a/src/content/docs/feature-guide/img/slide1.webp and /dev/null differ
diff --git a/src/content/docs/feature-guide/img/slide2.webp b/src/content/docs/feature-guide/img/slide2.webp
deleted file mode 100644
index 90d948b..0000000
Binary files a/src/content/docs/feature-guide/img/slide2.webp and /dev/null differ
diff --git a/src/content/docs/getting-started/intro-to-prog.mdx b/src/content/docs/getting-started/intro-to-prog.mdx
deleted file mode 100644
index 9999245..0000000
--- a/src/content/docs/getting-started/intro-to-prog.mdx
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Intro to Programming
-description: Coming soon!
-prev: false
-next: getting-started/required-tools
----
-
-Coming soon!
diff --git a/src/content/docs/index.mdx b/src/content/docs/index.mdx
index e0e159d..0e308db 100644
--- a/src/content/docs/index.mdx
+++ b/src/content/docs/index.mdx
@@ -10,7 +10,7 @@ hero:
         html: '<img src="/favicon.svg" alt="FRCSoftware.org logo" />'
     actions:
         - text: Start Learning
-          link: /getting-started/intro-to-prog
+          link: /learning-course/
 ---
 
 import HomeCard from '../../components/HomeCard.astro';
@@ -18,22 +18,10 @@ import HomeCard from '../../components/HomeCard.astro';
 <div class="home-cards-grid">
     <HomeCard
         title="Getting Started"
-        href="/getting-started/intro-to-prog"
+        href="/learning-course/"
         icon="check"
         description="Everything you need to know to get started coding."
     />
-    <HomeCard
-        title="Intro to Java"
-        href="/intro-to-java/stage-overview"
-        icon="book"
-        description="Goes over the basics of Java that is needed for FRC programming"
-    />
-    <HomeCard
-        title="Website Feature Guide"
-        href="/feature-guide/"
-        icon="book"
-        description="Explains the main features of the website. Recommended to go through before the learning course."
-    />
     <HomeCard
         title="Educator's Guide"
         href="/educators-guide/introduction"
diff --git a/src/content/docs/getting-started/forking-and-cloning.mdx b/src/content/docs/learning-course/getting-started/forking-and-cloning.mdx
similarity index 94%
rename from src/content/docs/getting-started/forking-and-cloning.mdx
rename to src/content/docs/learning-course/getting-started/forking-and-cloning.mdx
index bd63cf3..73a13c2 100644
--- a/src/content/docs/getting-started/forking-and-cloning.mdx
+++ b/src/content/docs/learning-course/getting-started/forking-and-cloning.mdx
@@ -5,7 +5,7 @@ prev: getting-started/vscode-overview
 next: false
 ---
 
-import ContentFigure from '../../../components/ContentFigure.astro';
+import ContentFigure from '../../../../components/ContentFigure.astro';
 
 ## Forking
 
diff --git a/src/content/docs/getting-started/required-tools.mdx b/src/content/docs/learning-course/getting-started/required-tools.mdx
similarity index 100%
rename from src/content/docs/getting-started/required-tools.mdx
rename to src/content/docs/learning-course/getting-started/required-tools.mdx
diff --git a/src/content/docs/getting-started/vscode-overview.mdx b/src/content/docs/learning-course/getting-started/vscode-overview.mdx
similarity index 100%
rename from src/content/docs/getting-started/vscode-overview.mdx
rename to src/content/docs/learning-course/getting-started/vscode-overview.mdx
diff --git a/src/content/docs/feature-guide/index.mdx b/src/content/docs/learning-course/getting-started/website-feature-guide.mdx
similarity index 71%
rename from src/content/docs/feature-guide/index.mdx
rename to src/content/docs/learning-course/getting-started/website-feature-guide.mdx
index 9a35a4e..5491f3b 100644
--- a/src/content/docs/feature-guide/index.mdx
+++ b/src/content/docs/learning-course/getting-started/website-feature-guide.mdx
@@ -1,10 +1,11 @@
 ---
 title: Website Feature Guide
 description: Learn about the features of FRC Software to navigate the content effectively
-template: splash
+prev: false
+next: getting-started/forking-and-cloning
 ---
 
-There are several features across the website that, if missed, will make it hard to go through the content effectively.
+Before you start learning, there are several features across the website that, if missed, will make it hard to go through the lessons effectively.
 The following features are shown with examples to help you gain a quick understanding of them before you make your way through the website.
 
 ## Across the Website
@@ -14,14 +15,16 @@ The following features are shown with examples to help you gain a quick understa
   Press the `Esc` key to minimize it again.
 - The website has a [glossary](/resources/glossary/) of terms related to the content.
   Whenever a word in that glossary is mentioned in the website, it will be underlined.
-  You can hover over these underlined words to get a quick definition (e.g. COTS, OTB).
+  You can hover over these underlined words to get a quick definition (e.g. PDH, Spark MAX).
 - Some information is hidden in dropdowns.
   Try to check most of them!
 
-<Aside type="example" collapse>
-Information is hidden here to clean up pages.
-
-</Aside>
+<details class="accordion">
+    <summary>Hint</summary>
+    <div class="content">
+        <p>You will find hints or answers to questions here.</p>
+    </div>
+</details>
 
 ### Admonitions (Call-Outs)
 
@@ -47,14 +50,11 @@ Examples for different concepts are shown in an "Example" box like this one.
 ### Slideshows
 
 <Slides>
-![Slide 1](img/slide1.webp) Navigate the slideshows by pressing the arrows on the sides.
+![Slide 1](/website-feature-guide/slide1.png) Navigate the slideshows by pressing the arrows on the sides.
 
-![Slide 2](img/slide2.webp) The dots below the caption indicate the slide you're on.
+![Slide 2](/website-feature-guide/slide2.png) The dots below the caption indicate the slide you're on.
 They can also be clicked to navigate to slides.
 
-![Slide 3](https://www.youtube.com/watch?v=sgEnAByelWs) Some slideshows contain videos.
-Click any slide to open a larger lightbox view.
-
 </Slides>
 
 <Aside type="caution">
diff --git a/src/content/docs/learning-course/index.mdx b/src/content/docs/learning-course/index.mdx
new file mode 100644
index 0000000..2faabed
--- /dev/null
+++ b/src/content/docs/learning-course/index.mdx
@@ -0,0 +1,102 @@
+---
+title: FRCSoftware Learning Course
+description: A guided curriculum for learning FRC Programming
+prev: false
+next: false
+---
+
+import CourseSection from '../../../components/CourseSection.astro';
+
+Welcome to FRCSoftware's learning course! The purpose of this course is to help students learn how to program an FRC robot no matter their skill level.
+The progression of the course moves from learning how to write Java to programming robots of increasing complexity.
+We start individual mechanisms of robots, using the FRC Kitbot, then move to more complex robots.
+
+Software in FRC is always changing! If you want to give feedback or have comments, feel free to do so through our <a href="https://github.com/frcsoftware/frcsoftware.org">Github </a>
+or <a href="discord.gg/uUugPrPZFs">Discord.</a>
+
+<CourseSection
+    title="Course Setup"
+    href="/learning-course/getting-started/required-tools"
+    image="/learning-course/wpilblogo.webp"
+    imageAlt="A screenshot of VS Code"
+>
+    <p>
+        Course Setup goes over downloading the tools needed to complete the
+        learning course, as well as how to navigate and use them. This is a
+        great place to start if you're new to FRC Programming.
+    </p>
+    <ul>
+        <li>
+            {' '}
+            <a href="/learning-course/getting-started/required-tools/">
+                {' '}
+                Required Tools:{' '}
+            </a>{' '}
+            Download the tools needed for this learning course.{' '}
+        </li>
+        <li>
+            {' '}
+            <a href="/learning-course/getting-started/vscode-overview/">
+                {' '}
+                VS Code Overview:{' '}
+            </a>{' '}
+            Learn more about VS Code, the code editor used for this course.
+        </li>
+        <li>
+            {' '}
+            <a href="/learning-course/getting-started/forking-and-cloning/">
+                {' '}
+                Forking and Cloning:{' '}
+            </a>
+            Learn how to use git to fork and clone. This is important for
+            accessing templates that are used throughout the course.
+        </li>
+    </ul>
+</CourseSection>
+
+<CourseSection
+    title="Stage 0"
+    href="/learning-course/intro-to-java/stage-overview"
+    imageAlt="Course Setup"
+>
+    <p>
+        Stage 0 covers the basics of Java that is needed to program the Kitbot,
+        a simple FRC robot. This include:
+        <ul>
+            <li>
+                {' '}
+                Learning about Java syntax, print statements, and variables{' '}
+            </li>
+            <li> Operators </li>
+            <li> Conditionals and loops </li>
+            <li> Objects and methods </li>
+        </ul>
+    </p>
+</CourseSection>
+
+<CourseSection
+    title="Stage 1"
+    image="/learning-course/Kitbot.webp"
+    imageAlt="Course Setup"
+>
+    <p>
+        Stage 1 is where students start to program Kitbot, a basic robot
+        commonly used to learn basic FRC skills.
+        <ul>
+            <li>
+                {' '}
+                Stage1A: Learn basic FRC programming skills by using the Robot
+                class to program Kitbot.{' '}
+            </li>
+            <li>
+                {' '}
+                Stage1B: Add Command-Based programming, a file structure for
+                programming FRC robots, to kitbot{' '}
+            </li>
+        </ul>
+    </p>
+</CourseSection>
+
+<CourseSection title="Stage 2" imageAlt="Course Setup">
+    <p>TBD</p>
+</CourseSection>
diff --git a/src/content/docs/intro-to-java/java-fundamentals.mdx b/src/content/docs/learning-course/intro-to-java/java-fundamentals.mdx
similarity index 100%
rename from src/content/docs/intro-to-java/java-fundamentals.mdx
rename to src/content/docs/learning-course/intro-to-java/java-fundamentals.mdx
diff --git a/src/content/docs/intro-to-java/stage-overview.mdx b/src/content/docs/learning-course/intro-to-java/stage-overview.mdx
similarity index 100%
rename from src/content/docs/intro-to-java/stage-overview.mdx
rename to src/content/docs/learning-course/intro-to-java/stage-overview.mdx
diff --git a/src/starlightOverrides/Header.astro b/src/starlightOverrides/Header.astro
index 4bd529e..d386141 100644
--- a/src/starlightOverrides/Header.astro
+++ b/src/starlightOverrides/Header.astro
@@ -10,14 +10,8 @@ const props = Astro.props;
 
 const navLinks = [
     { href: '/', label: 'Home' },
-    { href: '/feature-guide/', label: 'Website Feature Guide' },
-    { href: '/getting-started/intro-to-prog/', label: 'Getting Started' },
-    //   { href: "/learning-course/", label: "Learning Course" },
+    { href: '/learning-course/', label: 'Learning Course' },
     { href: '/educators-guide/introduction/', label: "Educator's Guide" },
-    //   { href: "/design-handbook/", label: "Design Handbook" },
-    //   { href: "/mechanism-examples/", label: "Mechanism Examples" },
-    //   { href: "/best-practices/", label: "Best Practices" },
-    //   { href: "/resources/", label: "Other Resources" },
     { href: '/contribution/', label: 'Contribution' },
 ];