diff --git a/stepmania/src/SConscript b/stepmania/src/SConscript
index f428cf6061..d7149e73eb 100644
--- a/stepmania/src/SConscript
+++ b/stepmania/src/SConscript
@@ -256,12 +256,17 @@ Screens = [
 	"ScreenOptions.cpp",
 	"ScreenOptionsEditCourse.cpp",
 	"ScreenOptionsEditCourseEntry.cpp",
+	"ScreenOptionsEditPlaylist.cpp",
 	"ScreenOptionsEditProfile.cpp",
+	"ScreenOptionsEditWorkout.cpp",
 	"ScreenOptionsManageCourses.cpp",
 	"ScreenOptionsManageEditSteps.cpp",
 	"ScreenOptionsManageProfiles.cpp",
+	"ScreenOptionsManageWorkouts.cpp",
 	"ScreenOptionsMaster.cpp",
 	"ScreenOptionsMasterPrefs.cpp",
+	"ScreenOptionsMemoryCard.cpp",
+	"ScreenOptionsReviewWorkout.cpp",
 	"ScreenPackages.cpp",
 	"ScreenPlayerOptions.cpp",
 	"ScreenNetworkOptions.cpp",
@@ -371,6 +376,7 @@ DataStructures = [
 	"TrailUtil.cpp",
 	"TitleSubstitution.cpp",
 	"Tween.cpp",
+	"Workout.cpp",
 ]
 
 FileTypes = [
@@ -583,6 +589,7 @@ ActorsInMenus = [
 	"WheelBase.cpp",
 	"WheelItemBase.cpp",
 	"WheelNotifyIcon.cpp",
+	"WorkoutGraph.cpp",
 ]
 
 ActorsInGameplay = [
@@ -737,6 +744,7 @@ GlobalSingletons = [
 	"StatsManager.cpp",
 	"ThemeManager.cpp",
 	"UnlockManager.cpp",
+	"WorkoutManager.cpp",
 ]
 
 # XXX: This wouldn't be included if WITHOUT_NETWORKING, but I don't have that setting implemented (yet)
diff --git a/stepmania/src/StepMania-net2005.vcproj b/stepmania/src/StepMania-net2005.vcproj
index b36af26cd8..69ed544aa2 100644
--- a/stepmania/src/StepMania-net2005.vcproj
+++ b/stepmania/src/StepMania-net2005.vcproj
@@ -620,6 +620,14 @@
 				RelativePath=".\ScreenOptionsEditCourseEntry.h"
 				>
 			</File>
+			<File
+				RelativePath=".\ScreenOptionsEditPlaylist.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ScreenOptionsEditPlaylist.h"
+				>
+			</File>
 			<File
 				RelativePath=".\ScreenOptionsEditProfile.cpp"
 				>
@@ -628,6 +636,14 @@
 				RelativePath=".\ScreenOptionsEditProfile.h"
 				>
 			</File>
+			<File
+				RelativePath=".\ScreenOptionsEditWorkout.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ScreenOptionsEditWorkout.h"
+				>
+			</File>
 			<File
 				RelativePath=".\ScreenOptionsManageCourses.cpp"
 				>
@@ -652,6 +668,14 @@
 				RelativePath=".\ScreenOptionsManageProfiles.h"
 				>
 			</File>
+			<File
+				RelativePath=".\ScreenOptionsManageWorkouts.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ScreenOptionsManageWorkouts.h"
+				>
+			</File>
 			<File
 				RelativePath="ScreenOptionsMaster.cpp"
 				>
@@ -676,6 +700,14 @@
 				RelativePath=".\ScreenOptionsMemoryCard.h"
 				>
 			</File>
+			<File
+				RelativePath=".\ScreenOptionsReviewWorkout.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ScreenOptionsReviewWorkout.h"
+				>
+			</File>
 			<File
 				RelativePath="ScreenPackages.cpp"
 				>
@@ -1580,6 +1612,14 @@
 				RelativePath=".\Tween.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Workout.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Workout.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="File Types"
@@ -2552,6 +2592,14 @@
 				RelativePath="WheelNotifyIcon.h"
 				>
 			</File>
+			<File
+				RelativePath=".\WorkoutGraph.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\WorkoutGraph.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Actors used in Gameplay"
@@ -3744,6 +3792,14 @@
 				RelativePath="UnlockManager.h"
 				>
 			</File>
+			<File
+				RelativePath=".\WorkoutManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\WorkoutManager.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Crypto"