diff --git a/README.md b/README.md
index d5971c46..2adfe8a9 100644
--- a/README.md
+++ b/README.md
@@ -52,10 +52,10 @@ Usage:
 Stack commands:
   cat         Get the CloudFormation template from a running stack
   cc          Interact with templates using Cloud Control API instead of CloudFormation
-  deploy      Deploy a CloudFormation stack from a local template
+  deploy      Deploy a CloudFormation stack or changeset from a local template
   logs        Show the event log for the named stack
-  ls          List running CloudFormation stacks
-  rm          Delete a running CloudFormation stack
+  ls          List running CloudFormation stacks or changesets
+  rm          Delete a CloudFormation stack or changeset
   stackset    This command manipulates stack sets.
   watch       Display an updating view of a CloudFormation stack
 
diff --git a/docs/bash_completion.sh b/docs/bash_completion.sh
index e25eb23f..f734a3e4 100644
--- a/docs/bash_completion.sh
+++ b/docs/bash_completion.sh
@@ -899,6 +899,8 @@ _rain_deploy()
     flags_with_completion=()
     flags_completion=()
 
+    flags+=("--changeset")
+    local_nonpersistent_flags+=("--changeset")
     flags+=("--config=")
     two_word_flags+=("--config")
     two_word_flags+=("-c")
@@ -919,6 +921,10 @@ _rain_deploy()
     flags+=("-k")
     local_nonpersistent_flags+=("--keep")
     local_nonpersistent_flags+=("-k")
+    flags+=("--no-exec")
+    flags+=("-x")
+    local_nonpersistent_flags+=("--no-exec")
+    local_nonpersistent_flags+=("-x")
     flags+=("--params=")
     two_word_flags+=("--params")
     local_nonpersistent_flags+=("--params")
@@ -1249,6 +1255,10 @@ _rain_ls()
     flags+=("-a")
     local_nonpersistent_flags+=("--all")
     local_nonpersistent_flags+=("-a")
+    flags+=("--changeset")
+    flags+=("-c")
+    local_nonpersistent_flags+=("--changeset")
+    local_nonpersistent_flags+=("-c")
     flags+=("--help")
     flags+=("-h")
     local_nonpersistent_flags+=("--help")
@@ -1380,6 +1390,10 @@ _rain_rm()
     flags_with_completion=()
     flags_completion=()
 
+    flags+=("--changeset")
+    flags+=("-c")
+    local_nonpersistent_flags+=("--changeset")
+    local_nonpersistent_flags+=("-c")
     flags+=("--detach")
     flags+=("-d")
     local_nonpersistent_flags+=("--detach")
diff --git a/docs/index.md b/docs/index.md
index 7b36dcfb..8d39730d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -21,18 +21,18 @@ Rain is a command line tool for working with AWS CloudFormation templates and st
 * [rain cat](rain_cat.md)	 - Get the CloudFormation template from a running stack
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 * [rain console](rain_console.md)	 - Login to the AWS console
-* [rain deploy](rain_deploy.md)	 - Deploy a CloudFormation stack from a local template
+* [rain deploy](rain_deploy.md)	 - Deploy a CloudFormation stack or changeset from a local template
 * [rain diff](rain_diff.md)	 - Compare CloudFormation templates
 * [rain fmt](rain_fmt.md)	 - Format CloudFormation templates
 * [rain forecast](rain_forecast.md)	 - Predict deployment failures
 * [rain info](rain_info.md)	 - Show your current configuration
 * [rain logs](rain_logs.md)	 - Show the event log for the named stack
-* [rain ls](rain_ls.md)	 - List running CloudFormation stacks
+* [rain ls](rain_ls.md)	 - List running CloudFormation stacks or changesets
 * [rain merge](rain_merge.md)	 - Merge two or more CloudFormation templates
 * [rain pkg](rain_pkg.md)	 - Package local artifacts into a template
-* [rain rm](rain_rm.md)	 - Delete a running CloudFormation stack
+* [rain rm](rain_rm.md)	 - Delete a CloudFormation stack or changeset
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 * [rain tree](rain_tree.md)	 - Find dependencies of Resources and Outputs in a local template
 * [rain watch](rain_watch.md)	 - Display an updating view of a CloudFormation stack
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_bootstrap.md b/docs/rain_bootstrap.md
index 7e8ff1a2..62823d96 100644
--- a/docs/rain_bootstrap.md
+++ b/docs/rain_bootstrap.md
@@ -30,4 +30,4 @@ rain bootstrap
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_build.md b/docs/rain_build.md
index 51e915bc..c0b6000b 100644
--- a/docs/rain_build.md
+++ b/docs/rain_build.md
@@ -35,4 +35,4 @@ rain build [<resource type>] or <prompt>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_cat.md b/docs/rain_cat.md
index 5c2bea19..7d69158a 100644
--- a/docs/rain_cat.md
+++ b/docs/rain_cat.md
@@ -35,4 +35,4 @@ rain cat <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_cc.md b/docs/rain_cc.md
index a06e531d..ed198ef6 100644
--- a/docs/rain_cc.md
+++ b/docs/rain_cc.md
@@ -32,4 +32,4 @@ You must pass the --experimental (-x) flag to use this command, to acknowledge t
 * [rain cc rm](rain_cc_rm.md)	 - Delete a deployment created by cc deploy (Experimental!)
 * [rain cc state](rain_cc_state.md)	 - Download the state file for a template deployed with cc deploy
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_cc_deploy.md b/docs/rain_cc_deploy.md
index 321a44a1..5a45998a 100644
--- a/docs/rain_cc_deploy.md
+++ b/docs/rain_cc_deploy.md
@@ -40,4 +40,4 @@ rain cc deploy <template> <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_cc_drift.md b/docs/rain_cc_drift.md
index f0c78c5a..96e2e769 100644
--- a/docs/rain_cc_drift.md
+++ b/docs/rain_cc_drift.md
@@ -33,4 +33,4 @@ rain cc drift <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_cc_rm.md b/docs/rain_cc_rm.md
index 66758b7a..5b32e578 100644
--- a/docs/rain_cc_rm.md
+++ b/docs/rain_cc_rm.md
@@ -33,4 +33,4 @@ rain cc rm <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_cc_state.md b/docs/rain_cc_state.md
index 748b2a6b..20fcb554 100644
--- a/docs/rain_cc_state.md
+++ b/docs/rain_cc_state.md
@@ -33,4 +33,4 @@ rain cc state <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_console.md b/docs/rain_console.md
index cbea9f96..8770cc3a 100644
--- a/docs/rain_console.md
+++ b/docs/rain_console.md
@@ -39,4 +39,4 @@ rain console [stack]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_deploy.md b/docs/rain_deploy.md
index 8811a6fd..f9f38e88 100644
--- a/docs/rain_deploy.md
+++ b/docs/rain_deploy.md
@@ -1,10 +1,11 @@
 ## rain deploy
 
-Deploy a CloudFormation stack from a local template
+Deploy a CloudFormation stack or changeset from a local template
 
 ### Synopsis
 
-Creates or updates a CloudFormation stack named <stack> from the template file <template>.
+Creates or updates a CloudFormation stack named <stack> from the template file <template>. 
+You can also create and execute changesets with this command.
 If you don't specify a stack name, rain will use the template filename minus its extension.
 
 If a template needs to be packaged before it can be deployed, rain will package the template first.
@@ -35,6 +36,16 @@ YAML:
     TagKey: TagValue
     ...
 
+To create a changeset:
+
+rain deploy --no-exec <template> [stackName]
+
+To execute a changeset:
+
+rain deploy --changeset <stackName> <changeSetName>
+
+To list and delete changesets, use the ls and rm commands.
+
 
 ```
 rain deploy <template> [stack]
@@ -43,11 +54,13 @@ rain deploy <template> [stack]
 ### Options
 
 ```
+      --changeset                execute the changeset, rain deploy --changeset <stackName> <changeSetName>
   -c, --config string            YAML or JSON file to set tags and parameters
   -d, --detach                   once deployment has started, don't wait around for it to finish
   -h, --help                     help for deploy
       --ignore-unknown-params    Ignore unknown parameters
   -k, --keep                     keep deployed resources after a failure by disabling rollbacks
+  -x, --no-exec                  do not execute the changeset
       --params strings           set parameter values; use the format key1=value1,key2=value2
   -p, --profile string           AWS profile name; read from the AWS CLI configuration file
   -r, --region string            AWS region to use
@@ -70,4 +83,4 @@ rain deploy <template> [stack]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_diff.md b/docs/rain_diff.md
index 3aa9c711..16d6d2f6 100644
--- a/docs/rain_diff.md
+++ b/docs/rain_diff.md
@@ -28,4 +28,4 @@ rain diff <from> <to>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_fmt.md b/docs/rain_fmt.md
index f76aa343..1ec5aeb7 100644
--- a/docs/rain_fmt.md
+++ b/docs/rain_fmt.md
@@ -32,4 +32,4 @@ rain fmt <filename>...
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_forecast.md b/docs/rain_forecast.md
index cc5eecf3..82b3356e 100644
--- a/docs/rain_forecast.md
+++ b/docs/rain_forecast.md
@@ -59,4 +59,4 @@ rain forecast --experimental <template> [stackName]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_info.md b/docs/rain_info.md
index 57299de0..d9a74670 100644
--- a/docs/rain_info.md
+++ b/docs/rain_info.md
@@ -30,4 +30,4 @@ rain info
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_logs.md b/docs/rain_logs.md
index 087a5fe2..8fb5c8ea 100644
--- a/docs/rain_logs.md
+++ b/docs/rain_logs.md
@@ -36,4 +36,4 @@ rain logs <stack> (<resource>)
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_ls.md b/docs/rain_ls.md
index 5e165ac1..5dcc0d65 100644
--- a/docs/rain_ls.md
+++ b/docs/rain_ls.md
@@ -1,19 +1,20 @@
 ## rain ls
 
-List running CloudFormation stacks
+List running CloudFormation stacks or changesets
 
 ### Synopsis
 
-Displays a list of all running stacks or the contents of <stack> if provided.
+Displays a list of all running stacks or the contents of <stack> if provided. If the -c arg is supplied, operates on changesets instead of stacks
 
 ```
-rain ls <stack>
+rain ls <stack> [changeset]
 ```
 
 ### Options
 
 ```
   -a, --all              list stacks in all regions; if you specify a stack, show more details
+  -c, --changeset        List changesets instead of stacks
   -h, --help             help for ls
   -p, --profile string   AWS profile name; read from the AWS CLI configuration file
   -r, --region string    AWS region to use
@@ -30,4 +31,4 @@ rain ls <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_merge.md b/docs/rain_merge.md
index 082b8674..4f1dc6de 100644
--- a/docs/rain_merge.md
+++ b/docs/rain_merge.md
@@ -29,4 +29,4 @@ rain merge <template> <template> ...
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_pkg.md b/docs/rain_pkg.md
index 30e1f44f..ffc05e51 100644
--- a/docs/rain_pkg.md
+++ b/docs/rain_pkg.md
@@ -66,4 +66,4 @@ rain pkg <template>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_rm.md b/docs/rain_rm.md
index 143407fd..96c2fce5 100644
--- a/docs/rain_rm.md
+++ b/docs/rain_rm.md
@@ -1,18 +1,19 @@
 ## rain rm
 
-Delete a running CloudFormation stack
+Delete a CloudFormation stack or changeset
 
 ### Synopsis
 
-Deletes the CloudFormation stack named <stack> and waits for the action to complete.
+Deletes the CloudFormation stack named <stack> and waits for the action to complete. With -c, deletes a changeset named [changeset].
 
 ```
-rain rm <stack>
+rain rm <stack> [changeset]
 ```
 
 ### Options
 
 ```
+  -c, --changeset         delete a changeset
   -d, --detach            once removal has started, don't wait around for it to finish
   -h, --help              help for rm
   -p, --profile string    AWS profile name; read from the AWS CLI configuration file
@@ -32,4 +33,4 @@ rain rm <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_stackset.md b/docs/rain_stackset.md
index ac8a9d2e..50cac796 100644
--- a/docs/rain_stackset.md
+++ b/docs/rain_stackset.md
@@ -28,4 +28,4 @@ This command manipulates stack sets. It has no action if specific stack set comm
 * [rain stackset ls](rain_stackset_ls.md)	 - List a CloudFormation stack sets in a given region
 * [rain stackset rm](rain_stackset_rm.md)	 - Delete a CloudFormation stack set and/or its instances.
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_stackset_deploy.md b/docs/rain_stackset_deploy.md
index a5d1b28d..780b1a4e 100644
--- a/docs/rain_stackset_deploy.md
+++ b/docs/rain_stackset_deploy.md
@@ -64,4 +64,4 @@ rain stackset deploy <template> [stackset] [flags]
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_stackset_ls.md b/docs/rain_stackset_ls.md
index d4efb3ee..52de0cd3 100644
--- a/docs/rain_stackset_ls.md
+++ b/docs/rain_stackset_ls.md
@@ -30,4 +30,4 @@ rain stackset ls <stack set>
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_stackset_rm.md b/docs/rain_stackset_rm.md
index 3bb7d173..b3967dcf 100644
--- a/docs/rain_stackset_rm.md
+++ b/docs/rain_stackset_rm.md
@@ -30,4 +30,4 @@ rain stackset rm <stackset>
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_tree.md b/docs/rain_tree.md
index 96cced4b..86ce4900 100644
--- a/docs/rain_tree.md
+++ b/docs/rain_tree.md
@@ -30,4 +30,4 @@ rain tree [template]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/docs/rain_watch.md b/docs/rain_watch.md
index 66e440a8..59d7731c 100644
--- a/docs/rain_watch.md
+++ b/docs/rain_watch.md
@@ -30,4 +30,4 @@ rain watch <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 21-Feb-2024
+###### Auto generated by spf13/cobra on 29-Feb-2024
diff --git a/internal/aws/cfn/cfn.go b/internal/aws/cfn/cfn.go
index 21fdab01..56be3adf 100644
--- a/internal/aws/cfn/cfn.go
+++ b/internal/aws/cfn/cfn.go
@@ -119,6 +119,33 @@ func StackExists(stackName string) (bool, error) {
 	return false, nil
 }
 
+// List the active change sets associated with a stack
+func ListChangeSets(stackName string) ([]types.ChangeSetSummary, error) {
+	var token *string
+	retval := make([]types.ChangeSetSummary, 0)
+	for {
+		res, err := getClient().ListChangeSets(context.Background(), &cloudformation.ListChangeSetsInput{
+			StackName: &stackName,
+			NextToken: token,
+		})
+
+		if err != nil {
+			return retval, nil
+		}
+
+		retval = append(retval, res.Summaries...)
+
+		if res.NextToken == nil {
+			break
+		}
+
+		token = res.NextToken
+	}
+
+	return retval, nil
+
+}
+
 // ListStacks returns a list of all existing stacks
 func ListStacks() ([]types.StackSummary, error) {
 	stacks := make([]types.StackSummary, 0)
diff --git a/internal/aws/cfn/mock.go b/internal/aws/cfn/mock.go
index 7d183bfd..531382c4 100644
--- a/internal/aws/cfn/mock.go
+++ b/internal/aws/cfn/mock.go
@@ -453,3 +453,7 @@ func ListResourceTypes() ([]string, error) {
 func IsCCAPI(t string) (bool, error) {
 	return true, nil
 }
+
+func ListChangeSets(stackName string) ([]types.ChangeSetSummary, error) {
+	return make([]types.ChangeSetSummary, 0), nil
+}
diff --git a/internal/cmd/deploy/deploy.go b/internal/cmd/deploy/deploy.go
index 7d9c1c56..df282667 100644
--- a/internal/cmd/deploy/deploy.go
+++ b/internal/cmd/deploy/deploy.go
@@ -11,6 +11,7 @@ import (
 	"github.com/aws-cloudformation/rain/internal/console/spinner"
 	"github.com/aws-cloudformation/rain/internal/dc"
 	"github.com/aws-cloudformation/rain/internal/ui"
+	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 
 	"github.com/spf13/cobra"
 )
@@ -24,12 +25,15 @@ var terminationProtection bool
 var keep bool
 var roleArn string
 var ignoreUnknownParams bool
+var noexec bool
+var changeset bool
 
 // Cmd is the deploy command's entrypoint
 var Cmd = &cobra.Command{
 	Use:   "deploy <template> [stack]",
-	Short: "Deploy a CloudFormation stack from a local template",
-	Long: `Creates or updates a CloudFormation stack named <stack> from the template file <template>.
+	Short: "Deploy a CloudFormation stack or changeset from a local template",
+	Long: `Creates or updates a CloudFormation stack named <stack> from the template file <template>. 
+You can also create and execute changesets with this command.
 If you don't specify a stack name, rain will use the template filename minus its extension.
 
 If a template needs to be packaged before it can be deployed, rain will package the template first.
@@ -59,80 +63,113 @@ YAML:
   Tags:
     TagKey: TagValue
     ...
+
+To create a changeset:
+
+rain deploy --no-exec <template> [stackName]
+
+To execute a changeset:
+
+rain deploy --changeset <stackName> <changeSetName>
+
+To list and delete changesets, use the ls and rm commands.
 `,
 	Args:                  cobra.RangeArgs(1, 2),
 	DisableFlagsInUseLine: true,
 	Run: func(cmd *cobra.Command, args []string) {
-		fn := args[0]
-		base := filepath.Base(fn)
 
-		var suppliedStackName string
+		var stackName, changeSetName, fn string
+		var err error
+		var stack types.Stack
 
-		if len(args) == 2 {
-			suppliedStackName = args[1]
-		} else {
-			suppliedStackName = ""
-		}
+		if changeset {
 
-		// Package template
-		spinner.Push(fmt.Sprintf("Preparing template '%s'", base))
-		template := PackageTemplate(fn, yes)
-		spinner.Pop()
+			if len(args) != 2 {
+				panic("expected 2 args: rain deploy --changeset <stackName> <changeSetName>")
+			}
 
-		stackName := dc.GetStackName(suppliedStackName, base)
+			stackName = args[0]
+			changeSetName = args[1]
 
-		// Check current stack status
-		spinner.Push(fmt.Sprintf("Checking current status of stack '%s'", stackName))
-		stack, stackExists := CheckStack(stackName)
-		spinner.Pop()
+		} else {
 
-		dc, err := dc.GetDeployConfig(tags, params, configFilePath, base,
-			template, stack, stackExists, yes, ignoreUnknownParams)
-		if err != nil {
-			panic(err)
-		}
+			fn = args[0]
+			base := filepath.Base(fn)
 
-		// Figure out how long we thing the stack will take to execute
-		//totalSeconds := forecast.PredictTotalEstimate(template, stackExists)
-		// TODO - Wait until the forecast command is GA and add this to output
+			var suppliedStackName string
 
-		// Create change set
-		spinner.Push("Creating change set")
-		changeSetName, createErr := cfn.CreateChangeSet(template, dc.Params, dc.Tags, stackName, roleArn)
-		if createErr != nil {
-			if changeSetHasNoChanges(createErr.Error()) {
-				spinner.Pop()
-				fmt.Println(console.Green("Change set was created, but there is no change. Deploy was skipped."))
-				return
+			if len(args) == 2 {
+				suppliedStackName = args[1]
 			} else {
-				panic(ui.Errorf(createErr, "error creating changeset"))
+				suppliedStackName = ""
 			}
-		}
-		spinner.Pop()
 
-		// Confirm changes
-		if !yes {
-			spinner.Push("Formatting change set")
-			status := formatChangeSet(stackName, changeSetName)
+			// Package template
+			spinner.Push(fmt.Sprintf("Preparing template '%s'", base))
+			template := PackageTemplate(fn, yes)
+			spinner.Pop()
+
+			stackName = dc.GetStackName(suppliedStackName, base)
+
+			// Check current stack status
+			spinner.Push(fmt.Sprintf("Checking current status of stack '%s'", stackName))
+			stack, stackExists := CheckStack(stackName)
 			spinner.Pop()
 
-			fmt.Println("CloudFormation will make the following changes:")
-			fmt.Println(status)
+			dc, err := dc.GetDeployConfig(tags, params, configFilePath, base,
+				template, stack, stackExists, yes, ignoreUnknownParams)
+			if err != nil {
+				panic(err)
+			}
 
-			if !console.Confirm(true, "Do you wish to continue?") {
-				err := cfn.DeleteChangeSet(stackName, changeSetName)
-				if err != nil {
-					panic(ui.Errorf(err, "error while deleting changeset '%s'", changeSetName))
+			// Figure out how long we thing the stack will take to execute
+			//totalSeconds := forecast.PredictTotalEstimate(template, stackExists)
+			// TODO - Wait until the forecast command is GA and add this to output
+
+			// Create change set
+			spinner.Push("Creating change set")
+			var createErr error
+			changeSetName, createErr = cfn.CreateChangeSet(template, dc.Params, dc.Tags, stackName, roleArn)
+			if createErr != nil {
+				if changeSetHasNoChanges(createErr.Error()) {
+					spinner.Pop()
+					fmt.Println(console.Green("Change set was created, but there is no change. Deploy was skipped."))
+					return
+				} else {
+					panic(ui.Errorf(createErr, "error creating changeset"))
 				}
+			}
+			spinner.Pop()
+
+			// Confirm changes
+			if !yes {
+				spinner.Push("Formatting change set")
+				status := formatChangeSet(stackName, changeSetName)
+				spinner.Pop()
+
+				fmt.Println("CloudFormation will make the following changes:")
+				fmt.Println(status)
 
-				if !stackExists {
-					err = cfn.DeleteStack(stackName, "")
+				if !console.Confirm(true, "Do you wish to continue?") {
+					err := cfn.DeleteChangeSet(stackName, changeSetName)
 					if err != nil {
-						panic(ui.Errorf(err, "error deleting empty stack '%s'", stackName))
+						panic(ui.Errorf(err, "error while deleting changeset '%s'", changeSetName))
 					}
+
+					if !stackExists {
+						err = cfn.DeleteStack(stackName, "")
+						if err != nil {
+							panic(ui.Errorf(err, "error deleting empty stack '%s'", stackName))
+						}
+					}
+
+					panic(errors.New("user cancelled deployment"))
 				}
+			}
 
-				panic(errors.New("user cancelled deployment"))
+			if noexec {
+				fmt.Println("changeset created but not executed:", changeSetName)
+				return
 			}
 		}
 
@@ -145,8 +182,13 @@ YAML:
 		if detach {
 			fmt.Printf("Detaching. You can check your stack's status with: rain watch %s\n", stackName)
 		} else {
-			fmt.Printf("Deploying template '%s' as stack '%s' in %s.\n", filepath.Base(fn), stackName, aws.Config().Region)
-
+			if changeset {
+				fmt.Printf("Executing changeset '%s' as stack '%s' in %s.\n",
+					changeSetName, stackName, aws.Config().Region)
+			} else {
+				fmt.Printf("Deploying template '%s' as stack '%s' in %s.\n",
+					filepath.Base(fn), stackName, aws.Config().Region)
+			}
 			status, messages := cfn.WaitForStackToSettle(stackName)
 			stack, _ = cfn.GetStack(stackName)
 			output := cfn.GetStackSummary(stack, false)
@@ -207,4 +249,6 @@ func init() {
 	Cmd.Flags().BoolVarP(&keep, "keep", "k", false, "keep deployed resources after a failure by disabling rollbacks")
 	Cmd.Flags().StringVarP(&roleArn, "role-arn", "", "", "ARN of an IAM role that CloudFormation should assume to deploy the stack")
 	Cmd.Flags().BoolVarP(&ignoreUnknownParams, "ignore-unknown-params", "", false, "Ignore unknown parameters")
+	Cmd.Flags().BoolVarP(&noexec, "no-exec", "x", false, "do not execute the changeset")
+	Cmd.Flags().BoolVar(&changeset, "changeset", false, "execute the changeset, rain deploy --changeset <stackName> <changeSetName>")
 }
diff --git a/internal/cmd/deploy/deploy_test.go b/internal/cmd/deploy/deploy_test.go
index 0e34edf9..053e5a62 100644
--- a/internal/cmd/deploy/deploy_test.go
+++ b/internal/cmd/deploy/deploy_test.go
@@ -1,62 +1 @@
 package deploy_test
-
-import (
-	"os"
-
-	"github.com/aws-cloudformation/rain/internal/cmd/deploy"
-)
-
-func Example_deploy_help() {
-	os.Args = []string{
-		os.Args[0],
-		"--help",
-	}
-
-	deploy.Cmd.Execute()
-	// Output:
-	// Creates or updates a CloudFormation stack named <stack> from the template file <template>.
-	// If you don't specify a stack name, rain will use the template filename minus its extension.
-	//
-	// If a template needs to be packaged before it can be deployed, rain will package the template first.
-	// Rain will attempt to create an S3 bucket to store artifacts that it packages and deploys.
-	// The bucket's name will be of the format rain-artifacts-<AWS account id>-<AWS region>.
-	//
-	// The config flag can be used to programmatically set tags and parameters.
-	// The format is similar to the "Template configuration file" for AWS CodePipeline just without the
-	// 'StackPolicy' key. The file can be in YAML or JSON format.
-	//
-	// JSON:
-	//   {
-	//     "Parameters" : {
-	//       "NameOfTemplateParameter" : "ValueOfParameter",
-	//       ...
-	//     },
-	//     "Tags" : {
-	//       "TagKey" : "TagValue",
-	//       ...
-	//     }
-	//   }
-	//
-	// YAML:
-	//   Parameters:
-	//     NameOfTemplateParameter: ValueOfParameter
-	//     ...
-	//   Tags:
-	//     TagKey: TagValue
-	//     ...
-	//
-	// Usage:
-	//   deploy <template> [stack]
-	//
-	// Flags:
-	//   -c, --config string            YAML or JSON file to set tags and parameters
-	//   -d, --detach                   once deployment has started, don't wait around for it to finish
-	//   -h, --help                     help for deploy
-	//       --ignore-unknown-params    Ignore unknown parameters
-	//   -k, --keep                     keep deployed resources after a failure by disabling rollbacks
-	//       --params strings           set parameter values; use the format key1=value1,key2=value2
-	//       --role-arn string          ARN of an IAM role that CloudFormation should assume to deploy the stack
-	//       --tags strings             add tags to the stack; use the format key1=value1,key2=value2
-	//   -t, --termination-protection   enable termination protection on the stack
-	//   -y, --yes                      don't ask questions; just deploy
-}
diff --git a/internal/cmd/ls/ls.go b/internal/cmd/ls/ls.go
index cf8f2f16..12758006 100644
--- a/internal/cmd/ls/ls.go
+++ b/internal/cmd/ls/ls.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/aws-cloudformation/rain/internal/config"
 	"github.com/aws-cloudformation/rain/internal/ui"
 
 	"github.com/aws-cloudformation/rain/internal/aws"
@@ -16,30 +17,150 @@ import (
 )
 
 var all = false
+var changeset = false
+
+func ShowChangeSetsForStack(stackName string) error {
+	sets, err := cfn.ListChangeSets(stackName)
+	if err != nil {
+		return err
+	}
+
+	if len(sets) == 0 {
+		return nil
+	}
+
+	fmt.Printf("  %s\n", stackName)
+	for _, cs := range sets {
+		if cs.ChangeSetName == nil {
+			continue
+		}
+		fmt.Printf("    %s %v/%v\n",
+			*cs.ChangeSetName,
+			ui.ColouriseStatus(string(cs.ExecutionStatus)),
+			ui.ColouriseStatus(string(cs.Status)))
+	}
+
+	return nil
+}
 
 // Cmd is the ls command's entrypoint
 var Cmd = &cobra.Command{
-	Use:                   "ls <stack>",
-	Short:                 "List running CloudFormation stacks",
-	Long:                  "Displays a list of all running stacks or the contents of <stack> if provided.",
-	Args:                  cobra.MaximumNArgs(1),
+	Use:                   "ls <stack> [changeset]",
+	Short:                 "List running CloudFormation stacks or changesets",
+	Long:                  "Displays a list of all running stacks or the contents of <stack> if provided. If the -c arg is supplied, operates on changesets instead of stacks",
+	Args:                  cobra.MaximumNArgs(2),
 	Aliases:               []string{"list"},
 	DisableFlagsInUseLine: true,
 	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) == 1 {
-			stackName := args[0]
+		if len(args) > 0 {
 
-			spinner.Push("Fetching stack status")
-			stack, err := cfn.GetStack(stackName)
-			if err != nil {
-				panic(ui.Errorf(err, "failed to list stack '%s'", stackName))
-			}
+			if changeset {
+				// Get the status of a single changeset
+
+				if len(args) != 2 {
+					panic("Usage: rain ls -c stackName changeSetName")
+				}
 
-			output := cfn.GetStackSummary(stack, all)
-			spinner.Pop()
+				stackName := args[0]
+				changeSetName := args[1]
+				spinner.Push("Fetching changeset details")
+				cs, err := cfn.GetChangeSet(stackName, changeSetName)
+				if err != nil {
+					panic(ui.Errorf(err, "failed to get changeset '%s'", changeSetName))
+				}
+				out := ""
+				out += fmt.Sprintf("Arn: %v\n", *cs.ChangeSetId)
+				out += fmt.Sprintf("Created: %v\n", cs.CreationTime)
+				descr := ""
+				if cs.Description != nil {
+					descr = *cs.Description
+				}
+				out += fmt.Sprintf("Description: %v\n", descr)
+				reason := ""
+				if cs.StatusReason != nil {
+					reason = "(" + *cs.StatusReason + ")"
+				}
+				out += fmt.Sprintf("Status: %v/%v %v\n",
+					ui.ColouriseStatus(string(cs.ExecutionStatus)),
+					ui.ColouriseStatus(string(cs.Status)),
+					reason)
+				out += "Parameters: "
+				if len(cs.Parameters) == 0 {
+					out += "(None)\n"
+				} else {
+					out += "\n"
+				}
+				for _, p := range cs.Parameters {
+					k, v := "", ""
+					if p.ParameterKey != nil {
+						k = *p.ParameterKey
+					}
+					if p.ParameterValue != nil {
+						v = *p.ParameterValue
+					}
+					out += fmt.Sprintf("  %s: %s\n", k, v)
+				}
+				// TODO: Convert changes to table
+				out += "Changes: \n"
+				for _, csch := range cs.Changes {
+					if csch.ResourceChange == nil {
+						continue
+					}
+					change := csch.ResourceChange
+					rid := ""
+					if change.LogicalResourceId != nil {
+						rid = *change.LogicalResourceId
+					}
+					rt := ""
+					if change.ResourceType != nil {
+						rt = *change.ResourceType
+					}
+					pid := ""
+					if change.PhysicalResourceId != nil {
+						pid = *change.PhysicalResourceId
+					}
+					replace := ""
+					switch string(change.Replacement) {
+					case "True":
+						replace = " [Replace]"
+					case "Conditional":
+						replace = " [Might replace]"
+					}
+					out += fmt.Sprintf("  %s%s: %s (%s) %s\n",
+						string(change.Action),
+						replace,
+						rid,
+						rt,
+						pid)
+
+				}
 
-			fmt.Println(output)
+				spinner.Pop()
+
+				fmt.Println(out)
+
+			} else {
+				// Get the status for a single stack
+				stackName := args[0]
+				spinner.Push("Fetching stack status")
+				stack, err := cfn.GetStack(stackName)
+				if err != nil {
+					panic(ui.Errorf(err, "failed to list stack '%s'", stackName))
+				}
+
+				output := cfn.GetStackSummary(stack, all)
+				spinner.Pop()
+
+				fmt.Println(output)
+				fmt.Println(console.Yellow("  ChangeSets:"))
+				err = ShowChangeSetsForStack(*stack.StackName)
+				if err != nil {
+					panic(err)
+				}
+			}
 		} else {
+			// List all stacks or changesets
+
 			var err error
 			regions := []string{aws.Config().Region}
 
@@ -55,6 +176,7 @@ var Cmd = &cobra.Command{
 			origRegion := aws.Config().Region
 
 			for _, region := range regions {
+
 				spinner.Push(fmt.Sprintf("Fetching stacks in %s", region))
 				aws.SetRegion(region)
 				stacks, err := cfn.ListStacks()
@@ -68,19 +190,40 @@ var Cmd = &cobra.Command{
 				}
 
 				stackNames := make(sort.StringSlice, 0)
-				stackMap := make(map[string]types.StackSummary)
-				for _, stack := range stacks {
-					stackNames = append(stackNames, *stack.StackName)
-					stackMap[*stack.StackName] = stack
-				}
-				sort.Strings(stackNames)
 
-				fmt.Println(console.Yellow(fmt.Sprintf("CloudFormation stacks in %s:", region)))
-				for _, stackName := range stackNames {
-					stack := stackMap[stackName]
+				// For changesets, we need to now call ListChangeSets for
+				// each stack and see if it has any active changesets
+				if changeset {
+					fmt.Println(console.Yellow(fmt.Sprintf("Stacks with changesets in %s:", region)))
+					for _, stack := range stacks {
+						if stack.StackName == nil {
+							continue
+						}
+						config.Debugf("Checking stack %s", *stack.StackName)
+
+						err := ShowChangeSetsForStack(*stack.StackName)
+						if err != nil {
+							panic(err)
+						}
+
+					}
+
+				} else {
+
+					stackMap := make(map[string]types.StackSummary)
+					for _, stack := range stacks {
+						stackNames = append(stackNames, *stack.StackName)
+						stackMap[*stack.StackName] = stack
+					}
+					sort.Strings(stackNames)
+
+					fmt.Println(console.Yellow(fmt.Sprintf("CloudFormation stacks in %s:", region)))
+					for _, stackName := range stackNames {
+						stack := stackMap[stackName]
 
-					if stack.ParentId == nil {
-						fmt.Println(ui.Indent("  ", formatStack(stack, stackMap)))
+						if stack.ParentId == nil {
+							fmt.Println(ui.Indent("  ", formatStack(stack, stackMap)))
+						}
 					}
 				}
 			}
@@ -95,4 +238,5 @@ var Cmd = &cobra.Command{
 
 func init() {
 	Cmd.Flags().BoolVarP(&all, "all", "a", false, "list stacks in all regions; if you specify a stack, show more details")
+	Cmd.Flags().BoolVarP(&changeset, "changeset", "c", false, "List changesets instead of stacks")
 }
diff --git a/internal/cmd/ls/ls_test.go b/internal/cmd/ls/ls_test.go
index 48e8799e..6867ffd3 100644
--- a/internal/cmd/ls/ls_test.go
+++ b/internal/cmd/ls/ls_test.go
@@ -14,15 +14,16 @@ func Example_ls_help() {
 
 	ls.Cmd.Execute()
 	// Output:
-	// Displays a list of all running stacks or the contents of <stack> if provided.
+	// Displays a list of all running stacks or the contents of <stack> if provided. If the -c arg is supplied, operates on changesets instead of stacks
 	//
 	// Usage:
-	//   ls <stack>
+	//   ls <stack> [changeset]
 	//
 	// Aliases:
 	//   ls, list
 	//
 	// Flags:
-	//   -a, --all    list stacks in all regions; if you specify a stack, show more details
-	//   -h, --help   help for ls
+	//   -a, --all         list stacks in all regions; if you specify a stack, show more details
+	//   -c, --changeset   List changesets instead of stacks
+	//   -h, --help        help for ls
 }
diff --git a/internal/cmd/rain/rain_test.go b/internal/cmd/rain/rain_test.go
index ded5accb..a648fd1d 100644
--- a/internal/cmd/rain/rain_test.go
+++ b/internal/cmd/rain/rain_test.go
@@ -21,10 +21,10 @@ func Example_rainhelp() {
 	// Stack commands:
 	//   cat         Get the CloudFormation template from a running stack
 	//   cc          Interact with templates using Cloud Control API instead of CloudFormation
-	//   deploy      Deploy a CloudFormation stack from a local template
+	//   deploy      Deploy a CloudFormation stack or changeset from a local template
 	//   logs        Show the event log for the named stack
-	//   ls          List running CloudFormation stacks
-	//   rm          Delete a running CloudFormation stack
+	//   ls          List running CloudFormation stacks or changesets
+	//   rm          Delete a CloudFormation stack or changeset
 	//   stackset    This command manipulates stack sets.
 	//   watch       Display an updating view of a CloudFormation stack
 	//
diff --git a/internal/cmd/rm/rm.go b/internal/cmd/rm/rm.go
index 09de688f..9813bc11 100644
--- a/internal/cmd/rm/rm.go
+++ b/internal/cmd/rm/rm.go
@@ -8,44 +8,79 @@ import (
 	"github.com/aws-cloudformation/rain/internal/console"
 	"github.com/aws-cloudformation/rain/internal/console/spinner"
 	"github.com/aws-cloudformation/rain/internal/ui"
+	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 	"github.com/spf13/cobra"
 )
 
 var yes bool
 var detach bool
 var roleArn string
+var changeset bool
+
+func DeleteChangeSet(stack *types.Stack, changeSetName string) error {
+	if !yes {
+		spinner.Push("Fetching changeset details")
+		cs, err := cfn.GetChangeSet(*stack.StackName, changeSetName)
+		if err != nil {
+			panic(ui.Errorf(err, "failed to get changeset '%s'", changeSetName))
+		}
+		spinner.Pop()
+		fmt.Printf("Arn: %v\n", *cs.ChangeSetId)
+		fmt.Printf("Created: %v\n", cs.CreationTime)
+		fmt.Printf("Status: %v/%v\n",
+			ui.ColouriseStatus(string(cs.ExecutionStatus)),
+			ui.ColouriseStatus(string(cs.Status)))
+
+		fmt.Println()
+		if !console.Confirm(false, "Are you sure you want to delete this changeset?") {
+			panic(fmt.Errorf("user cancelled deletion of changeset '%s'", *cs.ChangeSetName))
+		}
+	}
+	return cfn.DeleteChangeSet(*stack.StackName, changeSetName)
+}
 
 // Cmd is the rm command's entrypoint
 var Cmd = &cobra.Command{
-	Use:                   "rm <stack>",
-	Short:                 "Delete a running CloudFormation stack",
-	Long:                  "Deletes the CloudFormation stack named <stack> and waits for the action to complete.",
-	Args:                  cobra.ExactArgs(1),
+	Use:                   "rm <stack> [changeset]",
+	Short:                 "Delete a CloudFormation stack or changeset",
+	Long:                  "Deletes the CloudFormation stack named <stack> and waits for the action to complete. With -c, deletes a changeset named [changeset].",
+	Args:                  cobra.MaximumNArgs(2),
 	Aliases:               []string{"remove", "del", "delete"},
 	DisableFlagsInUseLine: true,
 	Run: func(cmd *cobra.Command, args []string) {
+		if len(args) == 0 {
+			panic("at least one argument is required")
+		}
 		stackName := args[0]
 
 		spinner.Push("Fetching stack status")
 		stack, err := cfn.GetStack(stackName)
 		if err != nil {
-			panic(ui.Errorf(err, "unable to delete stack '%s'", stackName))
+			panic(ui.Errorf(err, "unable to get stack '%s'", stackName))
+		}
+		spinner.Pop()
+
+		if changeset {
+			if len(args) != 2 {
+				panic("expected 2 arguments: stackName changeSetName")
+			}
+			if err := DeleteChangeSet(&stack, args[1]); err != nil {
+				panic(err)
+			}
+			return
 		}
 
 		if !yes {
 			output, _ := cfn.GetStackOutput(stack)
 
-			spinner.Pause()
 			fmt.Println(output)
 
 			if !console.Confirm(false, "Are you sure you want to delete this stack?") {
 				panic(fmt.Errorf("user cancelled deletion of stack '%s'", stackName))
 			}
-			spinner.Resume()
 		}
 
 		if *stack.EnableTerminationProtection {
-			spinner.Pause()
 
 			if yes || console.Confirm(false, "This stack has termination protection enabled. Do you wish to disable it?") {
 				spinner.Push("Disabling termination protection")
@@ -56,12 +91,8 @@ var Cmd = &cobra.Command{
 			} else {
 				panic(fmt.Errorf("user cancelled deletion of stack '%s'", stackName))
 			}
-
-			spinner.Resume()
 		}
 
-		spinner.Pop()
-
 		err = cfn.DeleteStack(stackName, roleArn)
 		if err != nil {
 			panic(ui.Errorf(err, "unable to delete stack '%s'", stackName))
@@ -96,4 +127,5 @@ func init() {
 	Cmd.Flags().BoolVarP(&detach, "detach", "d", false, "once removal has started, don't wait around for it to finish")
 	Cmd.Flags().BoolVarP(&yes, "yes", "y", false, "don't ask questions; just delete")
 	Cmd.Flags().StringVar(&roleArn, "role-arn", "", "ARN of an IAM role that CloudFormation should assume to remove the stack")
+	Cmd.Flags().BoolVarP(&changeset, "changeset", "c", false, "delete a changeset")
 }
diff --git a/internal/cmd/rm/rm_test.go b/internal/cmd/rm/rm_test.go
index 868eb61d..cd38afe3 100644
--- a/internal/cmd/rm/rm_test.go
+++ b/internal/cmd/rm/rm_test.go
@@ -14,15 +14,16 @@ func Example_rm_help() {
 
 	rm.Cmd.Execute()
 	// Output:
-	// Deletes the CloudFormation stack named <stack> and waits for the action to complete.
+	// Deletes the CloudFormation stack named <stack> and waits for the action to complete. With -c, deletes a changeset named [changeset].
 	//
 	// Usage:
-	//   rm <stack>
+	//   rm <stack> [changeset]
 	//
 	// Aliases:
 	//   rm, remove, del, delete
 	//
 	// Flags:
+	//   -c, --changeset         delete a changeset
 	//   -d, --detach            once removal has started, don't wait around for it to finish
 	//   -h, --help              help for rm
 	//       --role-arn string   ARN of an IAM role that CloudFormation should assume to remove the stack
diff --git a/internal/ui/colourise.go b/internal/ui/colourise.go
index 5a467b79..bba225ab 100644
--- a/internal/ui/colourise.go
+++ b/internal/ui/colourise.go
@@ -61,16 +61,30 @@ func MapStatus(status string) *StatusRep {
 		rep.Category = Complete
 
 	case strings.HasSuffix(status, "CANCELLED"):
+		fallthrough
 	case strings.HasSuffix(status, "OUTDATED"):
 		rep.Category = Cancelled
 
 	case strings.HasSuffix(status, "FAILED"):
+		fallthrough
 	case strings.HasSuffix(status, "INOPERABLE"):
 		rep.Category = Failed
 
 	case strings.HasSuffix(status, "RUNNING"):
 		rep.Category = InProgress
 
+	// changesets
+	case strings.HasSuffix(status, "CREATE_COMPLETE"):
+		fallthrough
+	case strings.HasSuffix(status, "AVAILABLE"):
+		rep.Category = Complete
+	case strings.HasSuffix(status, "OBSOLETE"):
+		fallthrough
+	case strings.HasSuffix(status, "UNAVAILABLE"):
+		rep.Category = Cancelled
+	case strings.HasSuffix(status, "CREATE_IN_PROGRESS"):
+		rep.Category = InProgress
+
 	default:
 		rep.Category = Pending
 	}
diff --git a/test/func_test.go b/test/func_test.go
index 799000dc..277afbd8 100644
--- a/test/func_test.go
+++ b/test/func_test.go
@@ -133,6 +133,7 @@ Resources:
 	}, `Stack success: CREATE_COMPLETE
   Outputs:
     MockKey: Mock value # Mock output description (exported as MockExport)
+  ChangeSets:
 `, "", 0)
 
 	// List full stack
@@ -148,6 +149,7 @@ Resources:
       MockPhysicalId
   Outputs:
     MockKey: Mock value # Mock output description (exported as MockExport)
+  ChangeSets:
 `, "", 0)
 
 	// Watch stack