diff --git a/CHANGELIST.md b/CHANGELIST.md
index 1dcf4081..5f92c73c 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -7,6 +7,7 @@
 - Use CommandLine library for CLI executables
 - Create interactive mode features
 - Minor cleanup around last added
+- Add placeholder command set creation
 
 ### 3.4.2 (2025-09-30)
 
diff --git a/MPF.CLI/Program.cs b/MPF.CLI/Program.cs
index 34ef29a6..b8a05366 100644
--- a/MPF.CLI/Program.cs
+++ b/MPF.CLI/Program.cs
@@ -1,11 +1,16 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 #if NET40
 using System.Threading.Tasks;
 #endif
 using MPF.CLI.Features;
 using MPF.Frontend;
+using MPF.Frontend.Features;
 using MPF.Frontend.Tools;
+using SabreTools.CommandLine;
+using SabreTools.CommandLine.Features;
+using SabreTools.CommandLine.Inputs;
 using SabreTools.RedumpLib.Data;
 using SabreTools.RedumpLib.Web;
 
@@ -13,6 +18,18 @@ namespace MPF.CLI
 {
     public class Program
     {
+        #region Constants
+
+        private const string _customName = "custom";
+        private const string _deviceName = "device";
+        private const string _fileName = "file";
+        private const string _mediaTypeName = "media-type";
+        private const string _mountedName = "mounted";
+        private const string _speedName = "speed";
+        private const string _useName = "use";
+
+        #endregion
+
         public static void Main(string[] args)
         {
             // Load options from the config file
@@ -196,6 +213,56 @@ namespace MPF.CLI
             Console.WriteLine(verifyResult.Message);
         }
 
+        /// <summary>
+        /// Create the command set for the program
+        /// </summary>
+        private static CommandSet CreateCommands()
+        {
+            List<string> header = [
+                "MPF.CLI [standalone|system] [options] <path> ...",
+                string.Empty,
+            ];
+
+            List<string> footer = [
+                string.Empty,
+                "Dumping program paths and other settings can be found in the config.json file",
+                "generated next to the program by default. Ensure that all settings are to user",
+                "preference before running MPF.CLI.",
+                string.Empty,
+
+                "Custom dumping parameters, if used, will fully replace the default parameters.",
+                "All dumping parameters need to be supplied if doing this.",
+                "Otherwise, both a drive path and output file path are required.",
+                string.Empty,
+
+                "Mounted filesystem path is only recommended on OSes that require block",
+                "device dumping, usually Linux and macOS.",
+                string.Empty,
+            ];
+
+            var commandSet = new CommandSet(header, footer);
+
+            // Standalone Options
+            commandSet.Add(new Help());
+            commandSet.Add(new VersionFeature());
+            commandSet.Add(new ListCodesFeature());
+            commandSet.Add(new ListMediaTypesFeature());
+            commandSet.Add(new ListSystemsFeature());
+            commandSet.Add(new ListProgramsFeature());
+            commandSet.Add(new InteractiveFeature());
+
+            // CLI Options
+            commandSet.Add(new StringInput(_useName, ["-u", "--use"], "Override configured dumping program name"));
+            commandSet.Add(new StringInput(_mediaTypeName, ["-t", "--mediatype"], "Set media type for dumping (Required for DIC)"));
+            commandSet.Add(new StringInput(_deviceName, ["-d", "--device"], "Physical drive path (Required if no custom parameters set)"));
+            commandSet.Add(new StringInput(_mountedName, ["-m", "--mounted"], "Mounted filesystem path for additional checks"));
+            commandSet.Add(new StringInput(_fileName, ["-f", "--file"], "Output file path (Required if no custom parameters set)"));
+            commandSet.Add(new Int32Input(_speedName, ["-s", "--speed"], "Override default dumping speed"));
+            commandSet.Add(new StringInput(_customName, ["-c", "--custom"], "Custom parameters to use"));
+
+            return commandSet;
+        }
+
         /// <summary>
         /// Display help for MPF.CLI
         /// </summary>
diff --git a/MPF.Check/Program.cs b/MPF.Check/Program.cs
index 57ecc159..5c9c583f 100644
--- a/MPF.Check/Program.cs
+++ b/MPF.Check/Program.cs
@@ -1,11 +1,16 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 #if NET40
 using System.Threading.Tasks;
 #endif
 using MPF.Check.Features;
 using MPF.Frontend;
+using MPF.Frontend.Features;
 using MPF.Frontend.Tools;
+using SabreTools.CommandLine;
+using SabreTools.CommandLine.Features;
+using SabreTools.CommandLine.Inputs;
 using SabreTools.RedumpLib;
 using SabreTools.RedumpLib.Data;
 using SabreTools.RedumpLib.Web;
@@ -14,6 +19,27 @@ namespace MPF.Check
 {
     public class Program
     {
+        #region Constants
+
+        private const string _createIrdName = "create-ird";
+        private const string _deleteName = "delete";
+        private const string _disableArchivesName = "disable-archives";
+        private const string _enableDebugName = "enable-debug";
+        private const string _hideDriveLettersName = "hide-drive-letters";
+        private const string _includeArtifactsName = "include-artifacts";
+        private const string _jsonName = "json";
+        private const string _loadSeedName = "load-seed";
+        private const string _noPlaceholdersName = "no-placeholders";
+        private const string _noRetrieveName = "no-retrieve";
+        private const string _pathName = "path";
+        private const string _pullAllName = "pull-all";
+        private const string _scanName = "scan";
+        private const string _suffixName = "suffix";
+        private const string _useName = "use";
+        private const string _zipName = "zip";
+
+        #endregion
+
         public static void Main(string[] args)
         {
             // Try processing the standalone arguments
@@ -141,6 +167,56 @@ namespace MPF.Check
             }
         }
 
+        /// <summary>
+        /// Create the command set for the program
+        /// </summary>
+        private static CommandSet CreateCommands()
+        {
+            List<string> header = [
+                "MPF.CLI [standalone|system] [options] <path> ...",
+                string.Empty,
+            ];
+
+            List<string> footer = [
+                string.Empty,
+                "WARNING: Check will overwrite both any existing submission information files as well",
+                "as any log archives. Please make backups of those if you need to before running Check.",
+                string.Empty,
+            ];
+
+            var commandSet = new CommandSet(header, footer);
+
+            // Standalone Options
+            commandSet.Add(new Help());
+            commandSet.Add(new VersionFeature());
+            commandSet.Add(new ListCodesFeature());
+            commandSet.Add(new ListMediaTypesFeature());
+            commandSet.Add(new ListSystemsFeature());
+            commandSet.Add(new ListProgramsFeature());
+            commandSet.Add(new InteractiveFeature());
+
+            // Check Options
+            commandSet.Add(new StringInput(_useName, ["-u", "--use"], "Override configured dumping program name"));
+            commandSet.Add(new StringInput(_loadSeedName, "--load-seed", "Load a seed submission JSON for user information"));
+            commandSet.Add(new FlagInput(_noPlaceholdersName, "--no-placeholders", "Disable placeholder values in submission info"));
+            commandSet.Add(new FlagInput(_createIrdName, "--create-ird", "Create IRD from output files (PS3 only)"));
+            commandSet.Add(new FlagInput(_noRetrieveName, "--no-retrieve", "Disable retrieving match information from Redump"));
+            // TODO: Figure out how to work with the credentials input
+            commandSet.Add(new FlagInput(_pullAllName, "--pull-all", "Pull all information from Redump (requires --credentials)"));
+            commandSet.Add(new StringInput(_pathName, ["-p", "--path"], "Physical drive path for additional checks"));
+            commandSet.Add(new FlagInput(_scanName, ["-s", "--scan"], "Enable copy protection scan (requires --path)"));
+            commandSet.Add(new FlagInput(_disableArchivesName, "--disable-archives", "Disable scanning archives (requires --scan)"));
+            commandSet.Add(new FlagInput(_enableDebugName, "--enable-debug", "Enable debug protection information (requires --scan)"));
+            commandSet.Add(new FlagInput(_hideDriveLettersName, "--hide-drive-letters", "Hide drive letters from scan output (requires --scan)"));
+            commandSet.Add(new FlagInput(_suffixName, ["-x", "--suffix"], "Enable adding filename suffix"));
+            commandSet.Add(new FlagInput(_jsonName, ["-j", "--json"], "Enable submission JSON output"));
+            commandSet.Add(new FlagInput(_includeArtifactsName, "--include-artifacts", "Include artifacts in JSON (requires --json)"));
+            commandSet.Add(new FlagInput(_zipName, ["-z", "--zip"], "Enable log file compression"));
+            commandSet.Add(new FlagInput(_deleteName, ["-d", "--delete"], "Enable unnecessary file deletion"));
+
+            return commandSet;
+        }
+
         /// <summary>
         /// Display help for MPF.Check
         /// </summary>