microsoft · kiki-lee · Mar 14, 2024 · Mar 27, 2024 · Mar 27, 2024 · Apr 15, 2024
diff --git a/docs/activities.md b/docs/activities.md
diff --git a/docs/contact.md b/docs/contact.md
@@ -2,8 +2,6 @@
 
 We have [a forum](https://forum.makecode.com) which is good for sharing games and asking questions.
 
-We also have a [Discourse server](https://aka.ms/makecodecommunity) with an Arcade channel for more real-time communication.
-
 You can also try [stack overflow](https://stackoverflow.com/), we monitor the ``makecode`` tag.
 
 You can file issues in [MakeCode Arcade GitHub repo](https://github.com/microsoft/pxt-arcade/issues/new).

diff --git a/docs/courses.md b/docs/courses.md
@@ -33,11 +33,18 @@ Structured courses for teaching computer science in the classroom.
         "url": "/courses/carnival",
         "imageUrl": "/static/hour-of-code/2022/booth.png",
         "largeImageUrl": "/static/hour-of-code/2022/booth.png",
-        "directOpen": true
+        "directOpen": true,
+        "label": "No Verification Required!",
+        "labelClass": "orange ribbon large"
     }
 ]
 ```
 
+Interested in using AP Computer Science Principles or Introduction to Computer Science with Microsoft MakeCode Arcade? You'll need to create an Educator Verified GitHub account to download them.  Details on that process can be found here:
+
+[https://makecode.com/github-teacher-verification](https://makecode.com/github-teacher-verification)
+
+
 ## TinkerGen GameGo-Game Programming Courses
 
 A collection of game programming tutorials to develop kids’ graphical programming skills with TinkerGen's GameGo.
@@ -51,20 +58,24 @@ The games they make in the course can run on the GameGo device! Courses are free
         "url": "https://make2learn.tinkergen.com/course/?sku=604182001",
         "imageUrl": "/static/courses/gamego-beginner.png",
         "largeImageUrl": "/static/courses/gamego-beginner.png",
+        "cardType": "link",
         "directOpen": true
     }, {
         "name": "GameGo Intermediate Programming Course",
         "description": "TinkerGen's intermediate game development course covers more topics like animations and multiplayer. Games made in the course can run on the GameGo device! Course is free after log in.",
         "url": "https://make2learn.tinkergen.com/course/?sku=604182003",
         "imageUrl": "/static/courses/gamego-intermediate.png",
         "largeImageUrl": "/static/courses/gamego-intermediate.png",
+        "cardType": "link",
         "directOpen": true
     }
 ]
 ```
 
 ## See also
 
+
+
 [Code a Carnival](aka.ms/carnivalTeacher)
 [AP Computer Science Principles](https://makecode.com/csp)
 [GameGo Beginner](https://make2learn.tinkergen.com/course/?sku=604182001),

diff --git a/docs/courses/checklist.md b/docs/courses/checklist.md
diff --git a/docs/courses/csintro.md b/docs/courses/csintro.md
@@ -1,57 +1,260 @@
-# CS Intro
+# Introduction to Computer Science with Microsoft MakeCode Arcade
 
-A collection of courses meant to teach introductory programmers using Blocks and JavaScript
+Hello! Welcome to the student guide for **Introduction to Computer Science with Microsoft MakeCode Arcade**!
 
-### ~hint
+This page will provide you with additional activities that you can complete in order to better understand the lessons in the official curriculum.  Please note, this page does not contain any answer keys or exemplar projects.
 
-These courses are currently in beta - this means that they are likely to have bugs and changes made fairly regularly. If you see anything that doesn't seem quite right, or if you have any suggestions, please file an issue on [github](https://github.com/microsoft/pxt-arcade).
+## Introduction
 
-### ~
+New to tutorials in MakeCode? Then follow the *Intro to MakeCode Arcade* tutorial below!
+
+```codecard
+[
+    {
+        "name": "Intro to MakeCode Arcade",
+        "description": "Follow step-by-step instructions to learn the basics of using MakeCode Arcade tutorials!",
+        "url": "https://aka.ms/mc-intro",
+        "imageUrl": "/static/tutorials/interface/info.png",
+        "largeImageUrl": "/static/tutorials/interface/info.png",
+        "label": "New? Try This!",
+        "labelClass": "orange ribbon large"
+    }
+]
+```
 
-## Courses on Flipgrid
+## Combined Activities by Unit
 
-Flipcode for the **Intro to CS** course grid: **[csintroarcade](https://flipgrid.com/csintroarcade)**
+Labs from each unit are grouped in the tiles below.
 
-## Course Sections
+<!--
+### Blocks semester
+-->
 
 ```codecard
 [
     {
-        "name": "CS Intro 1",
-        "description": "A semester length computer science course for beginning coders",
-        "url":"/courses/csintro1",
-        "imageUrl": "/static/courses/csintro1.gif"
-    }, {
-        "name": "CS Intro 2",
-        "description": "A continuation of the Intro to CS course",
-        "url":"/courses/csintro2",
-        "imageUrl": "/static/courses/csintro2.gif"
-    }, {
-        "name": "CS Intro 3",
-        "description": "A quarter length transition from blocks to JavaScript",
-        "url": "/courses/csintro3",
-        "imageUrl": "/static/courses/csintro3.gif"
+        "name": "Unit 0",
+        "description": "It's all about you!",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-0/lab0006",
+        "imageUrl": "https://arcade.makecode.com/api/S02325-67229-86604-38896/thumb"
+    },{
+        "name": "Unit 1",
+        "description": "Sprites",
+        "cardType": "link",
+        "url": "https://arcade.makecode.com/--skillmap#docs:/courses/csintro/blocks/unit-1/skillmap",
+        "imageUrl": "https://arcade.makecode.com/api/S01708-98615-82961-41216/thumb"
+    }, {
+        "name": "Unit 2",
+        "description": "Event handlers and variables",
+        "cardType": "link",
+        "url": "https://arcade.makecode.com/--skillmap#docs:/courses/csintro/blocks/unit-2/skillmap",
+        "imageUrl": "https://arcade.makecode.com/api/S01440-65616-58259-55413/thumb"
+    }, {
+        "name": "Unit 3",
+        "description": "Loops and arrays",
+        "cardType": "link",
+        "url": "https://arcade.makecode.com/--skillmap#docs:/courses/csintro/blocks/unit-3/skillmap",
+        "imageUrl": "https://arcade.makecode.com/api/S24151-39662-06684-76747/thumb"
     }
 ]
 ```
 
-## About the CS Intro Series
+## Individual Tutorials
 
-The CS Intro Series is designed to teach new developers how to code from the ground up.
+Individual activities from the tiles above are provided as standalone tutorials below.
 
-In CS Intro 1, students are introduced to programming through the MakeCode Blocks editor. They can create their own games, while learning concepts that are crucial to software development: creating variables, responding to events, and using iteration to simplify and extend their programs. Throughout the course, they will learn to develop their own games through small daily tasks, as well as projects that guide them through the process of turning basic ideas into full-fledged games.
+<!---
+### Blocks semester
+-->
 
-In CS Intro 2, students will continue to develop the software development skills they were introduced to in the first course, with more advanced programming concepts such as functions, logical comparisons, and arrays. These new skills will allow students to create more advanced and compelling games.
+#### Unit 0 Activities
 
-### ~hint
+```codecard
+[
+    {
+        "name": "Lab 0.6",
+        "description": "It's all about you!",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-0/lab0006",
+        "cardType": "tutorial",
+        "imageUrl": "https://arcade.makecode.com/api/S02325-67229-86604-38896/thumb"
+    }
+]
+```
 
-In the future CS Intro 3 and CS Intro 4 courses, students will transition the skills they have learned in a Block based environment into skills in a text based coding environment, allowing them to dig deeper into the games they make, as well as transition their skills in the @boardname@ into other environments.
+#### Unit 1 Activities
 
-### ~
+```codecard
+[
+    {
+        "name": "Lab 1.1 part 1",
+        "description": "Blocks scavenger hunt",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-1/lab0101-part1",
+        "imageUrl": "https://arcade.makecode.com/api/S84007-40614-44053-34591/thumb"
+    }, {
+        "name": "Lab 1.1 part 2",
+        "description": "Renaming variables",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-1/lab0101-part2",
+        "imageUrl": "/static/courses/csintro/S01.L01.01.P02.rename_variable.gif"
+    }, {
+        "name": "Lab 1.2",
+        "description": "Sprites in the corners",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-1/lab0102",
+        "imageUrl": "https://arcade.makecode.com/api/S48579-29555-87617-56521/thumb"
+    }, {
+        "name": "Lab 1.3",
+        "description": "Moving sprites",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-1/lab0103",
+        "imageUrl": "https://arcade.makecode.com/api/S96674-90076-64399-84406/thumb"
+    }, {
+        "name": "Lab 1.4 part 1",
+        "description": "Start wherever",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-1/lab0104-part1",
+        "imageUrl": "https://arcade.makecode.com/api/S72191-59096-40476-83475/thumb"
+    }, {
+        "name": "Lab 1.4 part 2",
+        "description": "Eat it all",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-1/lab0104-part2",
+        "imageUrl": "https://arcade.makecode.com/api/S72191-59096-40476-83475/thumb"
+    }, {
+        "name": "Lab 1.4 part 3",
+        "description": "Points and Lives",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-1/lab0104-part3",
+        "imageUrl": "https://arcade.makecode.com/api/S72191-59096-40476-83475/thumb"
+    }, {
+        "name": "Lab 1.5",
+        "description": "Eat some more",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-1/lab0105",
+        "imageUrl": "https://arcade.makecode.com/api/S01708-98615-82961-41216/thumb"
+    }
+]
+```
+
+#### Unit 2 Activities
+
+```codecard
+[
+    {
+        "name": "Lab 2.1 part 1",
+        "description": "Fire away",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0201-part1",
+        "imageUrl": "https://arcade.makecode.com/api/S02046-71712-34811-01331/thumb"
+    }, {
+        "name": "Lab 2.1 part 2",
+        "description": "Here come the enemies",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0201-part2",
+        "imageUrl": "https://arcade.makecode.com/api/S02046-71712-34811-01331/thumb"
+    }, {
+        "name": "Lab 2.1 part 3",
+        "description": "Villains be gone",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0201-part3",
+        "imageUrl": "https://arcade.makecode.com/api/S02046-71712-34811-01331/thumb"
+    }, {
+        "name": "Lab 2.1 part 4",
+        "description": "Collision alert",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0201-part4",
+        "imageUrl": "https://arcade.makecode.com/api/S02046-71712-34811-01331/thumb"
+    }, {
+        "name": "Lab 2.1 part 5",
+        "description": "Bonus: Pew-pew",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0201-part5",
+        "imageUrl": "https://arcade.makecode.com/api/S02046-71712-34811-01331/thumb"
+    }, {
+        "name": "Lab 2.2 part 1",
+        "description": "Introduction to variables",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0202-part1",
+        "imageUrl": "https://arcade.makecode.com/api/S47184-28116-73351-38074/thumb"
+    }, {
+        "name": "Lab 2.2 part 2",
+        "description": "Count the items",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0202-part2",
+        "imageUrl": "https://arcade.makecode.com/api/S47184-28116-73351-38074/thumb"
+    }, {
+        "name": "Lab 2.3",
+        "description": "Variables and math",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0203",
+        "imageUrl": "https://arcade.makecode.com/api/S61412-68869-78966-85149/thumb"
+    }, {
+        "name": "Lab 2.4",
+        "description": "Silly story time",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0204",
+        "imageUrl": "https://arcade.makecode.com/api/S01440-65616-58259-55413/thumb"
+    }, {
+        "name": "Lab 2.5 part 1",
+        "description": "Pick a number",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0205-part1",
+        "imageUrl": "https://arcade.makecode.com/api/S67034-82374-71681-88847/thumb"
+    }, {
+        "name": "Lab 2.5 part 2",
+        "description": "Even or odd",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0205-part2",
+        "imageUrl": "https://arcade.makecode.com/api/S99104-69456-21835-87580/thumb"
+    }, {
+        "name": "Lab 2.5 part 3",
+        "description": "Magic four ball",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0205-part3",
+        "imageUrl": "https://arcade.makecode.com/api/S60868-62929-06905-31439/thumb"
+    }, {
+        "name": "Lab 2.6 part 1",
+        "description": "Only room for three",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0206-part1",
+        "imageUrl": "https://arcade.makecode.com/api/S75841-44862-62246-25929/thumb"
+    }, {
+        "name": "Lab 2.6 part 2",
+        "description": "Here come the enemies ... faster",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0206-part2",
+        "imageUrl": "https://arcade.makecode.com/api/S75841-44862-62246-25929/thumb"
+    }, {
+        "name": "Lab 2.6 part 3",
+        "description": "Not too fast",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0206-part3",
+        "imageUrl": "https://arcade.makecode.com/api/S75841-44862-62246-25929/thumb"
+    }, {
+        "name": "Lab 2.6 part 4",
+        "description": "Starting difficulty",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-2/lab0206-part4",
+        "imageUrl": "https://arcade.makecode.com/api/S75841-44862-62246-25929/thumb"
+    }
+]
+```
+
+#### Unit 3 Activities
+
+```codecard
+[
+    {
+        "name": "Lab 3.1 part 1",
+        "description": "The repeat loop",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-3/lab0301-part1",
+        "imageUrl": "https://arcade.makecode.com/api/S58596-07767-54155-54916/thumb"
+    }, {
+        "name": "Lab 3.1 part 2",
+        "description": "The for loop",
+        "url": "http://arcade.makecode.com/#tutorial:/courses/csintro/blocks/unit-3/lab0301-part2",
+        "imageUrl": "https://arcade.makecode.com/api/S04739-13054-75441-03012/thumb"
+    }, {
+        "name": "Lab 3.4",
+        "description": "High scores",
+        "url": "https://arcade.makecode.com/--skillmap#docs:/courses/csintro/blocks/unit-3/lab-3-4-skillmap",
+        "imageUrl": "https://arcade.makecode.com/api/S61379-50555-16499-36625/thumb"
+    }, {
+        "name": "Lab 3.5",
+        "description": "Animated sprites",
+        "url": "https://arcade.makecode.com/--skillmap#docs:/courses/csintro/blocks/unit-3/lab-3-5-skillmap",
+        "imageUrl": "https://arcade.makecode.com/api/S24151-39662-06684-76747/thumb"
+    }
+]
+```
 
 ## See also
 
 [Courses Home Page](/courses),
-[CS Intro 1](/courses/csintro1),
-[CS Intro 2](/courses/csintro2),
-[CS Intro 3](/courses/csintro3)
+[Arcade Tutorials](/tutorials),
+[Beginner Skillmaps](/beginner-maps),
+
+### ~hint
+
+If you are looking for our previous "CS Intro" course, you may now find that at:
+https://arcade.makecode.com/courses/csintro_archive
+
+### ~
+