diff --git a/app/components/track-page/card.hbs b/app/components/track-page/card.hbs
index 613e8283ee..ec92a43600 100644
--- a/app/components/track-page/card.hbs
+++ b/app/components/track-page/card.hbs
@@ -7,7 +7,7 @@
     <div class="flex items-center justify-between gap-3 mb-4">
       <div class="flex items-center flex-wrap gap-3">
         <div
-          class="text-lg md:text-xl font-semibold text-gray-800 dark:text-gray-200 flex items-center
+          class="text-xl font-semibold text-gray-800 dark:text-gray-200 flex items-center
             {{if @isNavigatingToOtherPage 'group-hover:text-teal-500 transition-colors'}}"
           data-test-track-page-card-title
         >
@@ -31,7 +31,7 @@
         {{#if @isComplete}}
           {{svg-jar "check-circle" class="w-8 h-8 fill-current text-teal-500"}}
         {{else if (and @logoImageUrl @logoImageAltText)}}
-          <img src={{@logoImageUrl}} alt={{@logoImageAltText}} class="w-8 md:w-12 transform scale-100 group-hover:scale-105 transition-all" />
+          <img src={{@logoImageUrl}} alt={{@logoImageAltText}} class="w-8 transform scale-100 group-hover:scale-105 transition-all" />
         {{/if}}
       </div>
     </div>
diff --git a/app/components/track-page/introduction-and-courses.hbs b/app/components/track-page/course-card-list.hbs
similarity index 100%
rename from app/components/track-page/introduction-and-courses.hbs
rename to app/components/track-page/course-card-list.hbs
diff --git a/app/components/track-page/introduction-and-courses.ts b/app/components/track-page/course-card-list.ts
similarity index 77%
rename from app/components/track-page/introduction-and-courses.ts
rename to app/components/track-page/course-card-list.ts
index d58058084b..30845eb492 100644
--- a/app/components/track-page/introduction-and-courses.ts
+++ b/app/components/track-page/course-card-list.ts
@@ -15,7 +15,7 @@ interface Signature {
   };
 }
 
-export default class TrackPageIntroductionAndCoursesComponent extends Component<Signature> {
+export default class TrackPageCourseCardListComponent extends Component<Signature> {
   logoImage = logoImage;
   comingSoonImage = comingSoonImage;
 
@@ -37,17 +37,10 @@ export default class TrackPageIntroductionAndCoursesComponent extends Component<
       };
     });
   }
-
-  get userHasStartedTrack() {
-    return (
-      this.authenticator.currentUser &&
-      this.authenticator.currentUser.repositories.filterBy('language', this.args.language).filterBy('lastSubmissionAt')[0]
-    );
-  }
 }
 
 declare module '@glint/environment-ember-loose/registry' {
   export default interface Registry {
-    'TrackPage::IntroductionAndCourses': typeof TrackPageIntroductionAndCoursesComponent;
+    'TrackPage::CourseCardList': typeof TrackPageCourseCardListComponent;
   }
 }
diff --git a/app/components/track-page/course-card.hbs b/app/components/track-page/course-card.hbs
index 02f91b2f48..82e4d68e33 100644
--- a/app/components/track-page/course-card.hbs
+++ b/app/components/track-page/course-card.hbs
@@ -14,7 +14,7 @@
     </:afterTitle>
 
     <:default>
-      <div class="leading-6 prose dark:prose-invert mb-6">
+      <div class="leading-6 prose dark:prose-invert mb-4 pr-8">
         {{markdown-to-html this.introductionMarkdown}}
       </div>
 
@@ -53,7 +53,7 @@
         </div>
       {{/if}}
 
-      <div class="leading-6 prose dark:prose-invert mb-6 pr-8 md:pr-12">
+      <div class="leading-6 prose dark:prose-invert mb-4 pr-8">
         {{markdown-to-html this.introductionMarkdown}}
       </div>
 
diff --git a/app/components/track-page/header/index.hbs b/app/components/track-page/header/index.hbs
index 80cf633e09..4042f57053 100644
--- a/app/components/track-page/header/index.hbs
+++ b/app/components/track-page/header/index.hbs
@@ -29,25 +29,26 @@
     {{#if (has-block "cta")}}
       {{yield to="cta"}}
     {{else}}
-      <div class="flex items-center flex-wrap gap-x-2 gap-y-4 mt-5">
-        {{#if this.currentUserHasStartedTrack}}
+      {{#if this.currentUserHasStartedTrack}}
+        <div class="flex items-center flex-wrap gap-x-2 gap-y-4 mt-5">
           <TrackPage::ResumeTrackButton @language={{@language}} @courses={{@courses}} />
-        {{else}}
-          <TrackPage::StartTrackButton @language={{@language}} @courses={{@courses}} />
-        {{/if}}
 
-        {{#if (gt this.topParticipants.length 0)}}
-          <div class="hidden sm:flex items-center">
-            <div class="flex -space-x-1 hover:space-x-1 items-center">
-              {{#each this.topParticipants as |user|}}
-                <TrackPage::Header::TopParticipantAvatar @user={{user}} />
-              {{/each}}
-            </div>
+          {{! TODO: Bring this the "Start Track" button once we can account for both concepts & challenges }}
+          {{!-- <TrackPage::StartTrackButton @language={{@language}} @courses={{@courses}} /> --}}
 
-            <span class="text-xs text-gray-600 dark:text-gray-400 ml-2">Join the best</span>
-          </div>
-        {{/if}}
-      </div>
+          {{#if (gt this.topParticipants.length 0)}}
+            <div class="hidden sm:flex items-center">
+              <div class="flex -space-x-1 hover:space-x-1 items-center">
+                {{#each this.topParticipants as |user|}}
+                  <TrackPage::Header::TopParticipantAvatar @user={{user}} />
+                {{/each}}
+              </div>
+
+              <span class="text-xs text-gray-600 dark:text-gray-400 ml-2">Join the best</span>
+            </div>
+          {{/if}}
+        </div>
+      {{/if}}
     {{/if}}
   </div>
   <div class="ml-4 hidden md:flex h-36 w-36 flex-shrink-0">
diff --git a/app/components/track-page/primer-concept-group-section/concept-list-item.hbs b/app/components/track-page/primer-concept-group-section/concept-list-item.hbs
new file mode 100644
index 0000000000..1f3b29a9fc
--- /dev/null
+++ b/app/components/track-page/primer-concept-group-section/concept-list-item.hbs
@@ -0,0 +1,35 @@
+<LinkTo
+  @route="concept"
+  @models={{array @concept.slug}}
+  class="block hover:bg-gray-50 dark:hover:bg-gray-700/50 py-1.5 -mx-1.5 px-1.5 rounded"
+  data-test-concept-list-item
+  ...attributes
+>
+  <div class="flex items-center justify-between">
+    <div class="flex items-center">
+      <div class="w-2 h-2 {{if @isComplete 'bg-teal-500' 'bg-gray-200 dark:bg-gray-700'}} rounded-full mr-2"></div>
+
+      {{! TODO: Qualify all heroicons with solid/outline }}
+      {{svg-jar "book-open-outline" class="w-6 mr-2 text-gray-400 dark:text-gray-600"}}
+
+      <div class="prose dark:prose-invert prose-sm">
+        {{@concept.title}}
+      </div>
+    </div>
+
+    {{#if @isComplete}}
+      {{svg-jar "check" class="ml-1 w-5 text-teal-500"}}
+    {{else}}
+      <div class="flex items-center gap-1 pl-4 flex-shrink-0">
+        <span class="text-xs text-gray-400 dark:text-gray-600">
+          {{@concept.estimatedReadingTimeInMinutes}}
+          mins
+        </span>
+
+        {{svg-jar "clock" class="w-4 fill-current text-gray-300 dark:text-gray-700"}}
+      </div>
+    {{/if}}
+
+    <EmberTooltip @text={{@concept.descriptionMarkdown}} />
+  </div>
+</LinkTo>
\ No newline at end of file
diff --git a/app/components/track-page/primer-concept-group-section/concept-list-item.ts b/app/components/track-page/primer-concept-group-section/concept-list-item.ts
new file mode 100644
index 0000000000..236af7d456
--- /dev/null
+++ b/app/components/track-page/primer-concept-group-section/concept-list-item.ts
@@ -0,0 +1,23 @@
+import Component from '@glimmer/component';
+import type AuthenticatorService from 'codecrafters-frontend/services/authenticator';
+import type ConceptModel from 'codecrafters-frontend/models/concept';
+import { service } from '@ember/service';
+
+interface Signature {
+  Element: HTMLAnchorElement;
+
+  Args: {
+    isComplete: boolean;
+    concept: ConceptModel;
+  };
+}
+
+export default class ConceptListItemComponent extends Component<Signature> {
+  @service declare authenticator: AuthenticatorService;
+}
+
+declare module '@glint/environment-ember-loose/registry' {
+  export default interface Registry {
+    'TrackPage::PrimerConceptGroupSection::ConceptListItem': typeof ConceptListItemComponent;
+  }
+}
diff --git a/app/components/track-page/primer-concept-group-section/concept-list.hbs b/app/components/track-page/primer-concept-group-section/concept-list.hbs
new file mode 100644
index 0000000000..8f7353bea8
--- /dev/null
+++ b/app/components/track-page/primer-concept-group-section/concept-list.hbs
@@ -0,0 +1,3 @@
+{{#each this.sortedConcepts as |concept|}}
+  <TrackPage::PrimerConceptGroupSection::ConceptListItem @concept={{concept}} @isComplete={{false}} />
+{{/each}}
\ No newline at end of file
diff --git a/app/components/track-page/primer-concept-group-section/concept-list.ts b/app/components/track-page/primer-concept-group-section/concept-list.ts
new file mode 100644
index 0000000000..6145f3ebdd
--- /dev/null
+++ b/app/components/track-page/primer-concept-group-section/concept-list.ts
@@ -0,0 +1,35 @@
+import Component from '@glimmer/component';
+import ConceptGroupModel from 'codecrafters-frontend/models/concept-group';
+import ConceptModel from 'codecrafters-frontend/models/concept';
+import Store from '@ember-data/store';
+import { inject as service } from '@ember/service';
+
+interface Signature {
+  Element: HTMLDivElement;
+
+  Args: {
+    conceptGroup: ConceptGroupModel;
+  };
+}
+
+export default class ConceptListComponent extends Component<Signature> {
+  @service declare store: Store;
+
+  get sortedConcepts() {
+    return this.args.conceptGroup.conceptSlugs.reduce((acc, slug) => {
+      const concept = this.store.peekAll('concept').find((concept) => concept.slug === slug);
+
+      if (concept) {
+        acc.push(concept);
+      }
+
+      return acc;
+    }, [] as ConceptModel[]);
+  }
+}
+
+declare module '@glint/environment-ember-loose/registry' {
+  export default interface Registry {
+    'TrackPage::PrimerConceptGroupSection::ConceptList': typeof ConceptListComponent;
+  }
+}
diff --git a/app/components/track-page/primer-concept-group-section/index.hbs b/app/components/track-page/primer-concept-group-section/index.hbs
new file mode 100644
index 0000000000..0c78de440e
--- /dev/null
+++ b/app/components/track-page/primer-concept-group-section/index.hbs
@@ -0,0 +1,50 @@
+{{! template-lint-disable no-invalid-interactive }}
+<div
+  class="relative group/concept-group-section {{unless this.conceptListIsExpanded 'cursor-pointer'}}"
+  {{on "click" this.handleSectionClick}}
+  role={{if this.conceptListIsExpanded "region" "button"}}
+  ...attributes
+  data-test-primer-concept-group-section
+>
+  <div class="border-b pb-1 mb-4 flex items-center gap-2 {{unless this.conceptListIsExpanded 'group-hover/concept-group-section:border-gray-300'}}">
+    <div class="text-2xl font-semibold text-gray-800 dark:text-gray-200">
+      {{@language.name}}
+      Basics
+    </div>
+    <Pill @color="green">
+      FREE
+      <EmberTooltip @text="These interactive guides are 100% free to access." />
+    </Pill>
+  </div>
+
+  <div class="prose dark:prose-invert mb-4">
+    <p>
+      New to
+      {{@language.name}}? Start with our interactive byte-sized guides that cover the basics.
+    </p>
+  </div>
+
+  <div class={{if this.conceptListIsExpanded "" "h-60 overflow-hidden"}}>
+    <TrackPage::PrimerConceptGroupSection::ConceptList @conceptGroup={{@conceptGroup}} />
+
+    {{#if this.conceptListIsExpanded}}
+      <div class="flex items-center justify-center mt-2">
+        <PrimaryButton {{on "click" this.handleCollapseButtonClick}}>
+          ↑ Collapse ↑
+        </PrimaryButton>
+      </div>
+    {{else}}
+      <div class="absolute top-20 bottom-0 left-0 right-0 vertical-mask dark:vertical-mask-gray-850 rounded-b-md p-4 flex items-end justify-center">
+        {{#if this.authenticator.isAuthenticated}}
+          <PrimaryButton class="mb-4 group-hover/concept-group-section:bg-teal-600 w-full sm:w-auto">
+            ↓ Show all ↓
+          </PrimaryButton>
+        {{else}}
+          <PrimaryButton class="mb-4 group-hover/concept-group-section:bg-teal-600 w-full sm:w-auto">
+            <span>Start learning →</span>
+          </PrimaryButton>
+        {{/if}}
+      </div>
+    {{/if}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/components/track-page/primer-concept-group-section/index.ts b/app/components/track-page/primer-concept-group-section/index.ts
new file mode 100644
index 0000000000..1d1930e2ca
--- /dev/null
+++ b/app/components/track-page/primer-concept-group-section/index.ts
@@ -0,0 +1,51 @@
+import Component from '@glimmer/component';
+import ConceptGroupModel from 'codecrafters-frontend/models/concept-group';
+import LanguageModel from 'codecrafters-frontend/models/language';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { next } from '@ember/runloop';
+import { service } from '@ember/service';
+import type AuthenticatorService from 'codecrafters-frontend/services/authenticator';
+import type RouterService from '@ember/routing/router-service';
+
+interface Signature {
+  Element: HTMLDivElement;
+
+  Args: {
+    language: LanguageModel;
+    conceptGroup: ConceptGroupModel;
+  };
+}
+
+export default class TrackPagePrimerConceptGroupSectionComponent extends Component<Signature> {
+  @service declare authenticator: AuthenticatorService;
+  @service declare router: RouterService;
+
+  @tracked conceptListIsExpanded = false;
+
+  @action
+  handleCollapseButtonClick() {
+    next(() => {
+      this.conceptListIsExpanded = false;
+    });
+  }
+
+  @action
+  handleSectionClick() {
+    if (this.conceptListIsExpanded) {
+      return;
+    }
+
+    if (this.authenticator.isAuthenticated) {
+      this.conceptListIsExpanded = true;
+    } else {
+      this.router.transitionTo('concept', this.args.conceptGroup.conceptSlugs[0]!);
+    }
+  }
+}
+
+declare module '@glint/environment-ember-loose/registry' {
+  export default interface Registry {
+    'TrackPage::PrimerConceptGroupSection': typeof TrackPagePrimerConceptGroupSectionComponent;
+  }
+}
diff --git a/app/controllers/track.ts b/app/controllers/track.ts
index 70e08f23c0..9ba703ed01 100644
--- a/app/controllers/track.ts
+++ b/app/controllers/track.ts
@@ -1,13 +1,15 @@
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
 import type AuthenticatorService from 'codecrafters-frontend/services/authenticator';
 import type CourseModel from 'codecrafters-frontend/models/course';
+import type Store from '@ember-data/store';
+import { inject as service } from '@ember/service';
 import { type ModelType } from 'codecrafters-frontend/routes/track';
 
 export default class TrackController extends Controller {
   declare model: ModelType;
 
   @service declare authenticator: AuthenticatorService;
+  @service declare store: Store;
 
   get courses(): CourseModel[] {
     if (this.authenticator.currentUser && this.authenticator.currentUser.isStaff) {
diff --git a/app/models/language.ts b/app/models/language.ts
index 84ec0b4aa6..f4df671d95 100644
--- a/app/models/language.ts
+++ b/app/models/language.ts
@@ -145,6 +145,10 @@ export default class LanguageModel extends Model {
     return this.slug === 'go';
   }
 
+  get isRust() {
+    return this.slug === 'rust';
+  }
+
   get sortPositionForTrack() {
     return [
       // Popular tracks, sorted by usage
@@ -247,4 +251,12 @@ A quick welcome to CodeCrafters.
       zig: 7037,
     }[this.slug];
   }
+
+  get trackPrimerConceptGroupSlug() {
+    if (this.isRust) {
+      return 'rust-primer';
+    } else {
+      return null;
+    }
+  }
 }
diff --git a/app/routes/catalog.ts b/app/routes/catalog.ts
index e57d9b4caa..fea2f8094c 100644
--- a/app/routes/catalog.ts
+++ b/app/routes/catalog.ts
@@ -7,6 +7,7 @@ import BaseRoute from 'codecrafters-frontend/utils/base-route';
 import RepositoryPoller from 'codecrafters-frontend/utils/repository-poller';
 import { hash as RSVPHash } from 'rsvp';
 import RouteInfoMetadata, { RouteColorScheme } from 'codecrafters-frontend/utils/route-info-metadata';
+import type LanguageModel from 'codecrafters-frontend/models/language';
 
 export type ModelType = {
   repositories?: RepositoryModel[];
@@ -26,6 +27,7 @@ export default class CatalogRoute extends BaseRoute {
     const modelPromises: {
       repositories?: Promise<RepositoryModel[]>;
       courses?: Promise<CourseModel[]>;
+      _languages?: Promise<LanguageModel[]>;
     } = {};
 
     if (this.authenticator.isAuthenticated) {
@@ -39,6 +41,11 @@ export default class CatalogRoute extends BaseRoute {
       include: 'extensions,stages,language-configurations.language',
     }) as unknown as Promise<CourseModel[]>;
 
+    // Resources required by the track page
+    modelPromises._languages = this.store.findAll('language', {
+      include: 'primer-concept-group,primer-concept-group.author,primer-concept-group.concepts,primer-concept-group.concepts.author',
+    }) as unknown as Promise<LanguageModel[]>;
+
     return RSVPHash(modelPromises) as Promise<ModelType>;
   }
 }
diff --git a/app/routes/track.ts b/app/routes/track.ts
index 7575c69d37..d368c3ce41 100644
--- a/app/routes/track.ts
+++ b/app/routes/track.ts
@@ -47,12 +47,14 @@ export default class TrackRoute extends BaseRoute {
       include: 'extensions,stages,language-configurations.language',
     })) as unknown as CourseModel[];
 
-    const language = this.store.peekAll('language').findBy('slug', params.track_slug) as LanguageModel;
+    const languages = (await this.store.findAll('language', {
+      include: 'primer-concept-group,primer-concept-group.author,primer-concept-group.concepts,primer-concept-group.concepts.author',
+    })) as unknown as LanguageModel[];
+
+    const language = languages.find((language) => language.slug === params.track_slug)!;
 
     if (this.authenticator.isAuthenticated) {
-      await this.store.findAll('repository', {
-        include: RepositoryPoller.defaultIncludedResources,
-      });
+      await this.store.findAll('repository', { include: RepositoryPoller.defaultIncludedResources });
     }
 
     return {
diff --git a/app/templates/join-track.hbs b/app/templates/join-track.hbs
index fc4fa0292a..56fa07e3be 100644
--- a/app/templates/join-track.hbs
+++ b/app/templates/join-track.hbs
@@ -24,7 +24,7 @@
 
     <div class="flex items-start">
       <div class="flex-grow">
-        <TrackPage::IntroductionAndCourses @language={{@model.language}} @courses={{this.sortedCourses}} class="w-full mb-4" />
+        <TrackPage::CourseCardList @language={{@model.language}} @courses={{this.sortedCourses}} class="w-full mb-4" />
       </div>
 
       <div class="hidden lg:block w-80 flex-shrink-0 sticky top-4 ml-2">
diff --git a/app/templates/track.hbs b/app/templates/track.hbs
index ae84545a63..df9fbc816f 100644
--- a/app/templates/track.hbs
+++ b/app/templates/track.hbs
@@ -10,7 +10,30 @@
   <div class="container mx-auto lg:max-w-screen-lg px-3 md:px-6 py-6 md:py-10">
     <div class="flex items-start">
       <div class="flex-grow">
-        <TrackPage::IntroductionAndCourses @language={{@model.language}} @courses={{this.sortedCourses}} class="w-full mb-4" />
+        {{#if @model.language.primerConceptGroup}}
+          <TrackPage::PrimerConceptGroupSection
+            @language={{@model.language}}
+            @conceptGroup={{@model.language.primerConceptGroup}}
+            class="w-full mb-6"
+          />
+        {{/if}}
+
+        <div class="border-b pb-1 mb-4 flex">
+          <div class="text-2xl font-semibold text-gray-800 dark:text-gray-200">
+            {{@model.language.name}}
+            Challenges
+          </div>
+        </div>
+
+        <div class="prose dark:prose-invert mb-4">
+          <p>
+            Put your
+            {{@model.language.name}}
+            skills to the test. Practice by building popular open-source tools from scratch.
+          </p>
+        </div>
+
+        <TrackPage::CourseCardList @language={{@model.language}} @courses={{this.sortedCourses}} class="w-full mb-4" />
       </div>
 
       <div class="hidden lg:block w-80 flex-shrink-0 sticky top-4 ml-2">
diff --git a/public/assets/images/heroicons/outline/book-open.svg b/public/assets/images/heroicons/outline/book-open-outline.svg
similarity index 100%
rename from public/assets/images/heroicons/outline/book-open.svg
rename to public/assets/images/heroicons/outline/book-open-outline.svg
diff --git a/tests/acceptance/course-page/attempt-course-stage-test.js b/tests/acceptance/course-page/attempt-course-stage-test.js
index 3903594824..45c61e9556 100644
--- a/tests/acceptance/course-page/attempt-course-stage-test.js
+++ b/tests/acceptance/course-page/attempt-course-stage-test.js
@@ -35,8 +35,10 @@ module('Acceptance | course-page | attempt-course-stage', function (hooks) {
     assert.strictEqual(
       apiRequestsCount(this.server),
       [
-        'fetch courses (courses listing page)',
-        'fetch repositories (courses listing page)',
+        'fetch courses (catalog)',
+        'fetch repositories (catalog)',
+        'fetch concepts (catalog)',
+        'fetch concept groups (catalog)',
         'fetch courses (course page)',
         'fetch repositories (course page)',
         'fetch leaderboard entries (course page)',
diff --git a/tests/acceptance/course-page/resume-course-test.js b/tests/acceptance/course-page/resume-course-test.js
index 59afe5d316..c0aab57c5f 100644
--- a/tests/acceptance/course-page/resume-course-test.js
+++ b/tests/acceptance/course-page/resume-course-test.js
@@ -33,8 +33,10 @@ module('Acceptance | course-page | resume-course-test', function (hooks) {
     assert.strictEqual(
       apiRequestsCount(this.server),
       [
-        'fetch courses (courses listing page)',
-        'fetch repositories (courses listing page)',
+        'fetch courses (catalog)',
+        'fetch repositories (catalog)',
+        'fetch concepts (catalog)',
+        'fetch concept groups (catalog)',
         'fetch courses (course page)',
         'fetch repositories (course page)',
         'fetch leaderboard entries (course page)',
diff --git a/tests/acceptance/course-page/start-course-test.js b/tests/acceptance/course-page/start-course-test.js
index 8116dcf784..5a01f6994e 100644
--- a/tests/acceptance/course-page/start-course-test.js
+++ b/tests/acceptance/course-page/start-course-test.js
@@ -58,8 +58,10 @@ module('Acceptance | course-page | start-course', function (hooks) {
     assert.strictEqual(currentURL(), '/courses/dummy/introduction', 'current URL is course page URL');
 
     let baseRequestsCount = [
-      'fetch courses (courses listing page)',
-      'fetch repositories (courses listing page)',
+      'fetch courses (catalog)',
+      'fetch repositories (catalog)',
+      'fetch concepts (catalog)',
+      'fetch concept groups (catalog)',
       'fetch leaderboard entries (course overview page)',
       'refresh course (course overview page)',
       'fetch courses (course page)',
diff --git a/tests/acceptance/course-page/switch-repository-test.js b/tests/acceptance/course-page/switch-repository-test.js
index b321a951f0..ec842408cf 100644
--- a/tests/acceptance/course-page/switch-repository-test.js
+++ b/tests/acceptance/course-page/switch-repository-test.js
@@ -39,8 +39,10 @@ module('Acceptance | course-page | switch-repository', function (hooks) {
     await catalogPage.clickOnCourse('Build your own Redis');
 
     const baseRequestsCount = [
-      'fetch courses (courses listing page)',
-      'fetch repositories (courses listing page)',
+      'fetch courses (catalog)',
+      'fetch repositories (catalog)',
+      'fetch concepts (catalog)',
+      'fetch concept groups (catalog)',
       'fetch courses (course page)',
       'fetch repositories (course page)',
       'fetch leaderboard entries (course page)',
diff --git a/tests/acceptance/course-page/try-other-language-test.js b/tests/acceptance/course-page/try-other-language-test.js
index ba34f5f656..68e101c8b3 100644
--- a/tests/acceptance/course-page/try-other-language-test.js
+++ b/tests/acceptance/course-page/try-other-language-test.js
@@ -30,8 +30,10 @@ module('Acceptance | course-page | try-other-language', function (hooks) {
     });
 
     let expectedRequestsCount = [
-      'fetch courses (courses listing page)',
-      'fetch repositories (courses listing page)',
+      'fetch courses (catalog)',
+      'fetch repositories (catalog)',
+      'fetch concepts (catalog)',
+      'fetch concept groups (catalog)',
       'fetch courses (course page)',
       'fetch repositories (course page)',
       'fetch leaderboard entries (course page)',
diff --git a/tests/acceptance/track-page/start-track-test.js b/tests/acceptance/track-page/start-track-test.js
index 0c485e1a53..7810a02866 100644
--- a/tests/acceptance/track-page/start-track-test.js
+++ b/tests/acceptance/track-page/start-track-test.js
@@ -1,6 +1,6 @@
 import testScenario from 'codecrafters-frontend/mirage/scenarios/test';
 import trackPage from 'codecrafters-frontend/tests/pages/track-page';
-import { module, test } from 'qunit';
+import { module, skip } from 'qunit';
 import { setupApplicationTest } from 'codecrafters-frontend/tests/helpers';
 import { signIn } from 'codecrafters-frontend/tests/support/authentication-helpers';
 import { currentURL, visit } from '@ember/test-helpers';
@@ -8,14 +8,16 @@ import { currentURL, visit } from '@ember/test-helpers';
 module('Acceptance | track-page | start-track', function (hooks) {
   setupApplicationTest(hooks);
 
-  test('it display the start-track-button for anonymous user', async function (assert) {
+  // TODO: Bring this back once we can account for both concepts & challenges
+  skip('it display the start-track-button for anonymous user', async function (assert) {
     testScenario(this.server);
 
     await visit('/tracks/go');
     assert.ok(trackPage.hasStartTrackButton, 'start track button should be visible for anonymous users');
   });
 
-  test('it display the start-track-button for logged-in user who has not started course in the track', async function (assert) {
+  // TODO: Bring this back once we can account for both concepts & challenges
+  skip('it display the start-track-button for logged-in user who has not started course in the track', async function (assert) {
     testScenario(this.server);
     signIn(this.owner, this.server);
 
@@ -23,7 +25,8 @@ module('Acceptance | track-page | start-track', function (hooks) {
     assert.ok(trackPage.hasStartTrackButton, 'start track button should be visible for users without course progress');
   });
 
-  test('it does not display the start-track-button for logged-in user who has started course in the track', async function (assert) {
+  // TODO: Bring this back once we can account for both concepts & challenges
+  skip('it does not display the start-track-button for logged-in user who has started course in the track', async function (assert) {
     testScenario(this.server);
     signIn(this.owner, this.server);
 
@@ -40,7 +43,8 @@ module('Acceptance | track-page | start-track', function (hooks) {
     assert.notOk(trackPage.hasStartTrackButton, 'start track button should not be visible for users with course progress');
   });
 
-  test('it starts track for logged-in user who has started course in a different track', async function (assert) {
+  // TODO: Bring this back once we can account for both concepts & challenges
+  skip('it starts track for logged-in user who has started course in a different track', async function (assert) {
     testScenario(this.server);
     signIn(this.owner, this.server);
 
diff --git a/tests/acceptance/track-page/view-track-test.js b/tests/acceptance/track-page/view-track-test.js
index 4a01dd5e32..086bf40444 100644
--- a/tests/acceptance/track-page/view-track-test.js
+++ b/tests/acceptance/track-page/view-track-test.js
@@ -1,11 +1,15 @@
 import createTrackLeaderboardEntries from 'codecrafters-frontend/mirage/utils/create-track-leaderboard-entries';
 import percySnapshot from '@percy/ember';
 import testScenario from 'codecrafters-frontend/mirage/scenarios/test';
+import catalogPage from 'codecrafters-frontend/tests/pages/catalog-page';
 import trackPage from 'codecrafters-frontend/tests/pages/track-page';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'codecrafters-frontend/tests/helpers';
 import { signIn } from 'codecrafters-frontend/tests/support/authentication-helpers';
-import { visit } from '@ember/test-helpers';
+import { visit, find, waitUntil, isSettled } from '@ember/test-helpers';
+import createConceptFromFixture from 'codecrafters-frontend/mirage/utils/create-concept-from-fixture';
+import tcpOverview from 'codecrafters-frontend/mirage/concept-fixtures/tcp-overview';
+import networkProtocols from 'codecrafters-frontend/mirage/concept-fixtures/network-protocols';
 
 module('Acceptance | track-page | view-track', function (hooks) {
   setupApplicationTest(hooks);
@@ -13,12 +17,29 @@ module('Acceptance | track-page | view-track', function (hooks) {
   test('it renders for anonymous user', async function (assert) {
     testScenario(this.server);
     createTrackLeaderboardEntries(this.server, 'go', 'redis');
+    createTrackLeaderboardEntries(this.server, 'rust', 'redis');
+
+    createConceptFromFixture(this.server, tcpOverview);
+    createConceptFromFixture(this.server, networkProtocols);
+
+    this.server.create('concept-group', {
+      author: this.server.schema.users.first(),
+      description_markdown: 'Dummy description',
+      concept_slugs: ['tcp-overview', 'network-protocols', 'tcp-overview', 'network-protocols', 'tcp-overview', 'network-protocols'],
+      slug: 'rust-primer',
+      title: 'Rust Primer',
+    });
 
     await visit('/tracks/go');
     assert.strictEqual(1, 1); // dummy assertion
 
     await percySnapshot('Track - Anonymous User');
 
+    await visit('/tracks/rust');
+    assert.strictEqual(1, 1); // dummy assertion
+
+    await percySnapshot('Track (With Primer) - Anonymous User');
+
     await visit('/tracks/haskell');
     assert.strictEqual(1, 1); // dummy assertion
 
@@ -126,4 +147,38 @@ module('Acceptance | track-page | view-track', function (hooks) {
     await visit('/tracks/go');
     assert.notOk(trackPage.cards.mapBy('title').includes('Build your own Docker'));
   });
+
+  test('visiting from catalog page has no loading page', async function (assert) {
+    testScenario(this.server);
+
+    createTrackLeaderboardEntries(this.server, 'rust', 'redis');
+
+    createConceptFromFixture(this.server, tcpOverview);
+    createConceptFromFixture(this.server, networkProtocols);
+
+    this.server.create('concept-group', {
+      author: this.server.schema.users.first(),
+      description_markdown: 'Dummy description',
+      concept_slugs: ['tcp-overview', 'network-protocols', 'tcp-overview', 'network-protocols', 'tcp-overview', 'network-protocols'],
+      slug: 'rust-primer',
+      title: 'Rust Primer',
+    });
+
+    let loadingIndicatorWasRendered = false;
+
+    await catalogPage.visit();
+    catalogPage.clickOnTrack('Rust');
+
+    await waitUntil(() => {
+      if (isSettled()) {
+        return true;
+      } else if (find('[data-test-loading]')) {
+        loadingIndicatorWasRendered = true;
+      }
+    });
+
+    assert.notOk(loadingIndicatorWasRendered, 'loading indicator was not rendered');
+    assert.true(trackPage.primerConceptGroupSection.isVisible, 'primer concept group section should be visible');
+    assert.strictEqual(trackPage.cards.length, 6, 'expected 6 track cards to be present (one per course)');
+  });
 });
diff --git a/tests/pages/track-page.js b/tests/pages/track-page.js
index 566e6d2f8e..92934328a2 100644
--- a/tests/pages/track-page.js
+++ b/tests/pages/track-page.js
@@ -22,5 +22,9 @@ export default createPage({
     scope: '[data-test-track-header]',
   },
 
+  primerConceptGroupSection: {
+    scope: '[data-test-primer-concept-group-section]',
+  },
+
   visit: visitable('/tracks/:track_slug'),
 });