diff --git a/admin/class-convertkit-admin-setup-wizard.php b/admin/class-convertkit-admin-setup-wizard.php
index 4e3096048..92cf0cf83 100644
--- a/admin/class-convertkit-admin-setup-wizard.php
+++ b/admin/class-convertkit-admin-setup-wizard.php
@@ -51,9 +51,9 @@ class ConvertKit_Admin_Setup_Wizard {
 	 *
 	 * @since   1.9.8.4
 	 *
-	 * @var     int
+	 * @var     string
 	 */
-	public $step = 1;
+	public $step = 'start';
 
 	/**
 	 * The programmatic name of the setup screen.
@@ -170,7 +170,7 @@ public function maybe_load_setup_screen() {
 		}
 
 		// Define the step the user is on in the setup process.
-		$this->step = ( filter_has_var( INPUT_GET, 'step' ) ? absint( filter_input( INPUT_GET, 'step', FILTER_SANITIZE_NUMBER_INT ) ) : 1 );
+		$this->step = $this->get_current_step();
 
 		// Process any posted form data.
 		$this->process_form();
@@ -193,6 +193,66 @@ public function maybe_load_setup_screen() {
 
 	}
 
+	/**
+	 * Returns the current step in the setup process.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @return  string     Current step.
+	 */
+	public function get_current_step() {
+
+		$step = ( filter_has_var( INPUT_GET, 'step' ) ? filter_input( INPUT_GET, 'step', FILTER_SANITIZE_FULL_SPECIAL_CHARS ) : 'start' );
+
+		// Fallback to 'start' if the step is a registered step.
+		if ( ! array_key_exists( $step, $this->steps ) ) {
+			$step = 'start';
+		}
+
+		return $step;
+
+	}
+
+	/**
+	 * Get the number of the current step.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @return  int     Step number.
+	 */
+	public function get_current_step_number() {
+
+		return array_search( $this->step, array_keys( $this->steps ), true ) + 1;
+
+	}
+
+	/**
+	 * Get the step by number.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @param   int $number     Step number (1 based index).
+	 * @return  string              Step name/key.
+	 */
+	public function get_step_key_by_number( $number ) {
+
+		return array_keys( $this->steps )[ $number - 1 ];
+
+	}
+
+	/**
+	 * Get the total number of steps.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @return  int     Total steps.
+	 */
+	public function get_total_steps() {
+
+		return count( $this->steps );
+
+	}
+
 	/**
 	 * Process submitted form data for the given setup wizard name and current step.
 	 *
@@ -205,7 +265,7 @@ private function process_form() {
 		 *
 		 * @since   1.9.8.4
 		 *
-		 * @param   int     $step     Current step number.
+		 * @param   string     $step     Current step.
 		 */
 		do_action( 'convertkit_admin_setup_wizard_process_form_' . $this->page_name, $this->step );
 
@@ -231,24 +291,24 @@ private function define_step_urls() {
 		);
 
 		// Define the previous step URL if we're not on the first or last step.
-		if ( $this->step > 1 && $this->step < count( $this->steps ) ) {
+		if ( $this->get_current_step_number() > 1 && $this->get_current_step_number() < $this->get_total_steps() ) {
 			$this->previous_step_url = add_query_arg(
 				array(
 					'page'             => $this->page_name,
 					'convertkit-modal' => $this->is_modal(),
-					'step'             => ( $this->step - 1 ),
+					'step'             => $this->get_step_key_by_number( $this->get_current_step_number() - 1 ),
 				),
 				admin_url( 'options.php' )
 			);
 		}
 
 		// Define the next step URL if we're not on the last page.
-		if ( $this->step < count( $this->steps ) ) {
+		if ( $this->get_current_step_number() < $this->get_total_steps() ) {
 			$this->next_step_url = add_query_arg(
 				array(
 					'page'             => $this->page_name,
 					'convertkit-modal' => $this->is_modal(),
-					'step'             => ( $this->step + 1 ),
+					'step'             => $this->get_step_key_by_number( $this->get_current_step_number() + 1 ),
 				),
 				admin_url( 'options.php' )
 			);
@@ -268,7 +328,7 @@ private function load_screen_data() {
 		 *
 		 * @since   1.9.8.4
 		 *
-		 * @param   int     $step     Current step number.
+		 * @param   string     $step     Current step.
 		 */
 		do_action( 'convertkit_admin_setup_wizard_load_screen_data_' . $this->page_name, $this->step );
 
diff --git a/admin/importers/class-convertkit-admin-importer-campaignmonitor.php b/admin/importers/class-convertkit-admin-importer-campaignmonitor.php
new file mode 100644
index 000000000..7cbde17b3
--- /dev/null
+++ b/admin/importers/class-convertkit-admin-importer-campaignmonitor.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * ConvertKit Admin Importer CampaignMonitor class.
+ *
+ * @package ConvertKit
+ * @author ConvertKit
+ */
+
+/**
+ * Import and migrate data from CampaignMonitor to Kit.
+ *
+ * @package ConvertKit
+ * @author ConvertKit
+ */
+class ConvertKit_Admin_Importer_CampaignMonitor extends ConvertKit_Admin_Importer {
+
+	/**
+	 * Holds the programmatic name of the importer (lowercase, no spaces).
+	 *
+	 * @since   3.1.7
+	 *
+	 * @var     string
+	 */
+	public $name = 'campaignmonitor';
+
+	/**
+	 * Holds the title of the importer (for display in the importer list).
+	 *
+	 * @since   3.1.7
+	 *
+	 * @var     string
+	 */
+	public $title = 'CampaignMonitor';
+
+	/**
+	 * Holds the shortcode name for ActiveCampaign forms.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @var     string
+	 */
+	public $shortcode_name = 'cm_form';
+
+	/**
+	 * Holds the ID attribute name for CampaignMonitor forms.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @var     string
+	 */
+	public $shortcode_id_attribute = 'form_id';
+
+	/**
+	 * Constructor
+	 *
+	 * @since   3.1.7
+	 */
+	public function __construct() {
+
+		// Register this as an importer, if CampaignMonitor forms exist.
+		add_filter( 'convertkit_get_form_importers', array( $this, 'register' ) );
+
+	}
+
+	/**
+	 * Returns an array of CampaignMonitor form IDs and titles.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @return  array
+	 */
+	public function get_forms() {
+
+		// Forms are cached in the Plugin Settings.
+		$settings = get_option( 'forms_for_campaign_monitor_forms' );
+
+		// Bail if the CampaignMonitor Plugin Settings are not set.
+		if ( ! $settings ) {
+			return array();
+		}
+
+		// Build array of forms.
+		$forms = array();
+		foreach ( $settings as $form_id => $form ) {
+			// $form is a Campaign Monitor forms\core\Form object. It'll be a __PHP_Incomplete_Class if the Campaign Monitor plugin is not active.
+			// To consistently access the protected form name property, we have to cast to an array.
+			$form = (array) $form;
+
+			// Access the protected form name property.
+			// When casting __PHP_Incomplete_Class to an array, protected properties are prefixed with \0*\0.
+			$forms[ $form_id ] = $form["\0*\0name"];
+		}
+
+		return $forms;
+
+	}
+
+}
diff --git a/admin/importers/class-convertkit-admin-importer.php b/admin/importers/class-convertkit-admin-importer.php
index 94877e72e..000ae0557 100644
--- a/admin/importers/class-convertkit-admin-importer.php
+++ b/admin/importers/class-convertkit-admin-importer.php
@@ -119,8 +119,17 @@ public function import( $mappings ) {
 
 		// Iterate through the mappings, replacing the third party form shortcodes and blocks with the Kit form shortcodes and blocks.
 		foreach ( $mappings as $third_party_form_id => $kit_form_id ) {
-			$this->replace_blocks_in_posts( (int) $third_party_form_id, (int) $kit_form_id );
-			$this->replace_shortcodes_in_posts( (int) $third_party_form_id, (int) $kit_form_id );
+			// Skip empty Kit Form IDs i.e. no mapping was provided for this third party form.
+			if ( empty( $kit_form_id ) ) {
+				continue;
+			}
+
+			if ( $this->block_name ) {
+				$this->replace_blocks_in_posts( $third_party_form_id, (int) $kit_form_id );
+			}
+			if ( $this->shortcode_name ) {
+				$this->replace_shortcodes_in_posts( $third_party_form_id, (int) $kit_form_id );
+			}
 		}
 
 	}
@@ -136,24 +145,49 @@ public function get_forms_in_posts() {
 
 		global $wpdb;
 
-		// Search post_content for the third party form block or shortcode and return array of post IDs.
-		$results = $wpdb->get_col(
-			$wpdb->prepare(
-				"
-            SELECT ID
-            FROM {$wpdb->posts}
-            WHERE post_status = %s
-            AND (
-				post_content LIKE %s
-				OR post_content LIKE %s
-			)
-            ",
-				'publish',
-				'%[' . $this->shortcode_name . '%',
-				'%<!-- wp:' . $this->block_name . '%'
+		// Build WHERE clauses and values.
+		$post_content_clauses = array();
+		$post_content_values  = array();
+
+		if ( $this->shortcode_name ) {
+			$post_content_clauses[] = 'post_content LIKE %s';
+			$post_content_values[]  = '%[' . $this->shortcode_name . '%';
+		}
+		if ( $this->block_name ) {
+			$post_content_clauses[] = 'post_content LIKE %s';
+			$post_content_values[]  = '%<!-- wp:' . $this->block_name . '%';
+		}
+
+		// Bail early if nothing to search for.
+		if ( empty( $post_content_clauses ) ) {
+			return array();
+		}
+
+		// Prepare SQL using wpdb->prepare.
+		// call_user_func_array() is used so variable length arrays can be passed to prepare().
+		$query = call_user_func_array(
+			array( $wpdb, 'prepare' ),
+			array_merge(
+				array(
+					"
+					SELECT ID
+					FROM {$wpdb->posts}
+					WHERE post_status = %s
+					AND (
+						" . implode( ' OR ', $post_content_clauses ) . '
+					)
+				',
+				),
+				array_merge(
+					array( 'publish' ),
+					$post_content_values
+				)
 			)
 		);
 
+		// Run query.
+		$results = $wpdb->get_col( $query ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+
 		return $results ? $results : array();
 
 	}
@@ -189,8 +223,8 @@ public function has_forms_in_posts() {
 	 *
 	 * @since   3.1.0
 	 *
-	 * @param   int $third_party_form_id    Third Party Form ID.
-	 * @param   int $form_id                Kit Form ID.
+	 * @param   string|int $third_party_form_id    Third Party Form ID.
+	 * @param   int        $form_id                Kit Form ID.
 	 */
 	public function replace_shortcodes_in_posts( $third_party_form_id, $form_id ) {
 
@@ -229,9 +263,9 @@ public function replace_shortcodes_in_posts( $third_party_form_id, $form_id ) {
 	 *
 	 * @since   3.1.0
 	 *
-	 * @param   string $content             Content containing third party Form Shortcodes.
-	 * @param   int    $third_party_form_id    Third Party Form ID.
-	 * @param   int    $form_id                Kit Form ID.
+	 * @param   string     $content                Content containing third party Form Shortcodes.
+	 * @param   string|int $third_party_form_id    Third Party Form ID.
+	 * @param   int        $form_id                Kit Form ID.
 
 	 * @return  string
 	 */
@@ -353,8 +387,8 @@ public function get_form_ids_from_content( $content ) {
 	 *
 	 * @since   3.1.6
 	 *
-	 * @param   int $third_party_form_id    Third Party Form ID.
-	 * @param   int $form_id                Kit Form ID.
+	 * @param   string|int $third_party_form_id    Third Party Form ID.
+	 * @param   int        $form_id                Kit Form ID.
 	 */
 	public function replace_blocks_in_posts( $third_party_form_id, $form_id ) {
 
@@ -378,9 +412,9 @@ public function replace_blocks_in_posts( $third_party_form_id, $form_id ) {
 	 *
 	 * @since   3.1.6
 	 *
-	 * @param   int $post_id                Post ID.
-	 * @param   int $third_party_form_id    Third Party Form ID.
-	 * @param   int $form_id                Kit Form ID.
+	 * @param   int        $post_id                Post ID.
+	 * @param   string|int $third_party_form_id    Third Party Form ID.
+	 * @param   int        $form_id                Kit Form ID.
 	 */
 	public function replace_blocks_in_post( $post_id, $third_party_form_id, $form_id ) {
 
@@ -419,9 +453,9 @@ public function replace_blocks_in_post( $post_id, $third_party_form_id, $form_id
 	 *
 	 * @since   3.1.6
 	 *
-	 * @param   array $blocks                 Blocks.
-	 * @param   int   $third_party_form_id    Third Party Form ID.
-	 * @param   int   $form_id                Kit Form ID.
+	 * @param   array      $blocks                 Blocks.
+	 * @param   string|int $third_party_form_id    Third Party Form ID.
+	 * @param   int        $form_id                Kit Form ID.
 	 *
 	 * @return  string
 	 */
@@ -441,9 +475,9 @@ public function replace_blocks_in_content( $blocks, $third_party_form_id, $form_
 	 *
 	 * @since   3.1.6
 	 *
-	 * @param   array $blocks                 Blocks.
-	 * @param   int   $third_party_form_id    Third Party Form ID.
-	 * @param   int   $form_id                Kit Form ID.
+	 * @param   array      $blocks                 Blocks.
+	 * @param   string|int $third_party_form_id    Third Party Form ID.
+	 * @param   int        $form_id                Kit Form ID.
 	 * @return  array
 	 */
 	private function recursively_convert_blocks( $blocks, $third_party_form_id, $form_id ) {
diff --git a/admin/section/class-convertkit-admin-section-tools.php b/admin/section/class-convertkit-admin-section-tools.php
index d3985a31d..e5524230a 100644
--- a/admin/section/class-convertkit-admin-section-tools.php
+++ b/admin/section/class-convertkit-admin-section-tools.php
@@ -59,6 +59,7 @@ public function register_notices( $notices ) {
 				'import_configuration_success'             => __( 'Configuration imported successfully.', 'convertkit' ),
 				'migrate_activecampaign_configuration_success' => __( 'ActiveCampaign forms migrated successfully.', 'convertkit' ),
 				'migrate_aweber_configuration_success'     => __( 'AWeber forms migrated successfully.', 'convertkit' ),
+				'migrate_campaignmonitor_configuration_success' => __( 'Campaign Monitor forms migrated successfully.', 'convertkit' ),
 				'migrate_mc4wp_configuration_success'      => __( 'MC4WP forms migrated successfully.', 'convertkit' ),
 				'migrate_mailpoet_configuration_success'   => __( 'MailPoet forms migrated successfully.', 'convertkit' ),
 				'migrate_newsletter_configuration_success' => __( 'Newsletter forms migrated successfully.', 'convertkit' ),
diff --git a/admin/setup-wizard/class-convertkit-admin-setup-wizard-landing-page.php b/admin/setup-wizard/class-convertkit-admin-setup-wizard-landing-page.php
index 351a4d65d..f2db0c670 100644
--- a/admin/setup-wizard/class-convertkit-admin-setup-wizard-landing-page.php
+++ b/admin/setup-wizard/class-convertkit-admin-setup-wizard-landing-page.php
@@ -86,13 +86,13 @@ public function __construct() {
 
 		// Define details for each step in the setup process.
 		$this->steps = array(
-			1 => array(
+			'start'  => array(
 				'name'        => __( 'Setup', 'convertkit' ),
 				'next_button' => array(
 					'label' => __( 'Create', 'convertkit' ),
 				),
 			),
-			2 => array(
+			'finish' => array(
 				'name' => __( 'Done', 'convertkit' ),
 			),
 		);
@@ -110,7 +110,7 @@ public function __construct() {
 	 *
 	 * @since   2.5.5
 	 *
-	 * @param   int $step   Current step.
+	 * @param   string $step   Current step.
 	 */
 	public function process_form( $step ) {
 
@@ -124,7 +124,7 @@ public function process_form( $step ) {
 		}
 
 		// Don't process form data if we're not on the second step.
-		if ( $step !== 2 ) {
+		if ( $step !== 'finish' ) {
 			return;
 		}
 
@@ -144,7 +144,7 @@ public function process_form( $step ) {
 
 		// If an error occured creating the Page, go back a step to show the error.
 		if ( is_wp_error( $this->result ) ) {
-			$this->step  = ( $this->step - 1 );
+			$this->step  = $this->get_step_key_by_number( $this->get_current_step_number() - 1 );
 			$this->error = $this->result->get_error_message();
 		}
 
@@ -155,7 +155,7 @@ public function process_form( $step ) {
 	 *
 	 * @since   2.5.5
 	 *
-	 * @param   int $step   Current step.
+	 * @param   string $step   Current step.
 	 */
 	public function load_screen_data( $step ) {
 
@@ -198,7 +198,7 @@ public function load_screen_data( $step ) {
 		);
 
 		// Don't load data if not on the first step.
-		if ( $step !== 1 ) {
+		if ( $step !== 'start' ) {
 			return;
 		}
 
@@ -211,12 +211,12 @@ public function load_screen_data( $step ) {
 		// Bail if an error occured.
 		if ( is_wp_error( $result ) ) {
 			// Change the next button label and make it a link to reload the screen.
-			unset( $this->steps[1]['next_button'] );
+			unset( $this->steps['start']['next_button'] );
 			$this->current_url = add_query_arg(
 				array(
 					'page'         => $this->page_name,
 					'ck_post_type' => $this->post_type,
-					'step'         => 1,
+					'step'         => 'start',
 				),
 				admin_url( 'options.php' )
 			);
@@ -226,12 +226,12 @@ public function load_screen_data( $step ) {
 		// If no Landing Pages exist in ConvertKit, change the next button label and make it a link to reload
 		// the screen.
 		if ( ! $this->landing_pages->exist() ) {
-			unset( $this->steps[1]['next_button'] );
+			unset( $this->steps['start']['next_button'] );
 			$this->current_url = add_query_arg(
 				array(
 					'page'         => $this->page_name,
 					'ck_post_type' => $this->post_type,
-					'step'         => 1,
+					'step'         => 'start',
 				),
 				admin_url( 'options.php' )
 			);
diff --git a/admin/setup-wizard/class-convertkit-admin-setup-wizard-plugin.php b/admin/setup-wizard/class-convertkit-admin-setup-wizard-plugin.php
index 6df21be86..a1277836b 100644
--- a/admin/setup-wizard/class-convertkit-admin-setup-wizard-plugin.php
+++ b/admin/setup-wizard/class-convertkit-admin-setup-wizard-plugin.php
@@ -92,6 +92,24 @@ class ConvertKit_Admin_Setup_Wizard_Plugin extends ConvertKit_Admin_Setup_Wizard
 	 */
 	public $exit_url = 'options-general.php?page=_wp_convertkit_settings';
 
+	/**
+	 * If the Form Importer step will be displayed.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @var     bool
+	 */
+	public $show_form_importer_step = false;
+
+	/**
+	 * Holds the form importers.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @var     array
+	 */
+	public $form_importers = array();
+
 	/**
 	 * Registers action and filter hooks.
 	 *
@@ -103,24 +121,38 @@ public function __construct() {
 		$this->api      = new ConvertKit_API_V4( CONVERTKIT_OAUTH_CLIENT_ID, CONVERTKIT_OAUTH_CLIENT_REDIRECT_URI, false, false, false, 'setup_wizard' );
 		$this->settings = new ConvertKit_Settings();
 
+		$this->show_form_importer_step = count( convertkit_get_form_importers() ) > 0 ? true : false;
+
 		// Define details for each step in the setup process.
 		$this->steps = array(
-			1 => array(
+			'start'         => array(
 				'name'        => __( 'Connect', 'convertkit' ),
 				'next_button' => array(
 					'label' => __( 'Connect', 'convertkit' ),
-					'link'  => $this->api->get_oauth_url( admin_url( 'options.php?page=convertkit-setup&step=2' ), get_site_url() ),
+					'link'  => $this->api->get_oauth_url( admin_url( 'options.php?page=convertkit-setup&step=configuration' ), get_site_url() ),
 				),
 			),
-			2 => array(
+			'configuration' => array(
 				'name'        => __( 'Configuration', 'convertkit' ),
 				'next_button' => array(
-					'label' => __( 'Finish Setup', 'convertkit' ),
+					'label' => $this->show_form_importer_step ? __( 'Next', 'convertkit' ) : __( 'Finish Setup', 'convertkit' ),
 				),
 			),
-			3 => array(
-				'name' => __( 'Done', 'convertkit' ),
-			),
+		);
+
+		// If the Form Importer step will be displayed, add it to the steps.
+		if ( $this->show_form_importer_step ) {
+			$this->steps['form-importer'] = array(
+				'name'        => __( 'Form Importer', 'convertkit' ),
+				'next_button' => array(
+					'label' => __( 'Finish Setup', 'convertkit' ),
+				),
+			);
+		}
+
+		// Add the finish step.
+		$this->steps['finish'] = array(
+			'name' => __( 'Done', 'convertkit' ),
 		);
 
 		// Register link to Setup Wizard below Plugin Name at Plugins > Installed Plugins.
@@ -209,67 +241,92 @@ public function maybe_redirect_to_setup_screen() {
 	public function process_form( $step ) {
 
 		// Depending on the step, process the form data.
-		switch ( $step ) {
-			case 2:
-				// If an error occured from OAuth i.e. the user did not authorize, show it now.
-				if ( array_key_exists( 'error', $_REQUEST ) && array_key_exists( 'error_description', $_REQUEST ) ) {
-					// Decrement the step.
-					$this->step  = ( $this->step - 1 );
-					$this->error = sanitize_text_field( wp_unslash( $_REQUEST['error_description'] ) );
-					return;
-				}
+		if ( array_key_exists( 'code', $_REQUEST ) || array_key_exists( 'error', $_REQUEST ) || array_key_exists( 'error_description', $_REQUEST ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended - no nonce is sent back from OAuth.
+			$this->save_oauth( map_deep( wp_unslash( $_REQUEST ), 'sanitize_text_field' ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended - no nonce is sent back from OAuth.
+			return;
+		}
 
-				// Bail if no authorization code is included in the request.
-				if ( ! array_key_exists( 'code', $_REQUEST ) ) {
-					return;
-				}
+		// Run security checks.
+		if ( ! isset( $_REQUEST['_wpnonce'] ) ) {
+			return;
+		}
+		if ( ! wp_verify_nonce( sanitize_key( $_REQUEST['_wpnonce'] ), $this->page_name ) ) {
+			// Decrement the step.
+			$this->step  = 'configuration';
+			$this->error = __( 'Invalid nonce specified.', 'convertkit' );
+			return;
+		}
 
-				// Sanitize token.
-				$authorization_code = sanitize_text_field( wp_unslash( $_REQUEST['code'] ) );
+		// Configuration.
+		if ( array_key_exists( 'post_form', $_REQUEST ) || array_key_exists( 'page_form', $_REQUEST ) || array_key_exists( 'usage_tracking', $_REQUEST ) ) {
+			$settings = new ConvertKit_Settings();
+			$settings->save(
+				array(
+					'post_form'      => isset( $_REQUEST['post_form'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['post_form'] ) ) : '0',
+					'page_form'      => isset( $_REQUEST['page_form'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['page_form'] ) ) : '0',
+					'usage_tracking' => isset( $_REQUEST['usage_tracking'] ) ? 'on' : '',
+				)
+			);
+			return;
+		}
 
-				// Exchange the authorization code and verifier for an access token.
-				$result = $this->api->get_access_token( $authorization_code );
+		// Form Importer.
+		if ( array_key_exists( 'form_importer', $_REQUEST ) ) {
+			// Replace third party form shortcodes and blocks with Kit form shortcodes and blocks.
+			foreach ( map_deep( wp_unslash( $_REQUEST['form_importer'] ), 'sanitize_text_field' ) as $form_importer_name => $mappings ) {
+				// Sanitize mappings.
+				$mappings = array_map( 'sanitize_text_field', wp_unslash( $mappings ) );
 
-				// Show an error message if we could not fetch the access token.
-				if ( is_wp_error( $result ) ) {
-					// Decrement the step.
-					$this->step  = ( $this->step - 1 );
-					$this->error = $result->get_error_message();
-					return;
-				}
+				// Replace third party form shortcodes and blocks with Kit form shortcodes and blocks.
+				WP_ConvertKit()->get_class( 'admin_importer_' . $form_importer_name )->import( $mappings );
+			}
 
-				// Store Access Token, Refresh Token and expiry.
-				$this->settings->save(
-					array(
-						'access_token'  => $result['access_token'],
-						'refresh_token' => $result['refresh_token'],
-						'token_expires' => ( time() + $result['expires_in'] ),
-					)
-				);
-				break;
+			return;
+		}
 
-			case 3:
-				// Run security checks.
-				if ( ! isset( $_REQUEST['_wpnonce'] ) ) {
-					return;
-				}
-				if ( ! wp_verify_nonce( sanitize_key( $_REQUEST['_wpnonce'] ), $this->page_name ) ) {
-					$this->error = __( 'Invalid nonce specified.', 'convertkit' );
-					return;
-				}
+	}
 
-				// Save Default Page and Post Form settings.
-				$settings = new ConvertKit_Settings();
-				$settings->save(
-					array(
-						'post_form'      => ( isset( $_POST['post_form'] ) ? sanitize_text_field( wp_unslash( $_POST['post_form'] ) ) : '0' ),
-						'page_form'      => ( isset( $_POST['page_form'] ) ? sanitize_text_field( wp_unslash( $_POST['page_form'] ) ) : '0' ),
-						'usage_tracking' => ( isset( $_POST['usage_tracking'] ) ? 'on' : '' ),
-					)
-				);
-				break;
+	/**
+	 * Save the OAuth credentials.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @param   array $request   Request.
+	 * @return  void
+	 */
+	private function save_oauth( $request ) {
+
+		// If an error occured from OAuth i.e. the user did not authorize, show it now.
+		if ( array_key_exists( 'error', $request ) || array_key_exists( 'error_description', $request ) ) {
+			// Decrement the step.
+			$this->step  = 'start';
+			$this->error = sanitize_text_field( wp_unslash( $request['error_description'] ) );
+			return;
 		}
 
+		// Sanitize token.
+		$authorization_code = sanitize_text_field( wp_unslash( $request['code'] ) );
+
+		// Exchange the authorization code and verifier for an access token.
+		$result = $this->api->get_access_token( $authorization_code );
+
+		// Show an error message if we could not fetch the access token.
+		if ( is_wp_error( $result ) ) {
+			// Decrement the step.
+			$this->step  = 'start';
+			$this->error = $result->get_error_message();
+			return;
+		}
+
+		// Store Access Token, Refresh Token and expiry.
+		$this->settings->save(
+			array(
+				'access_token'  => $result['access_token'],
+				'refresh_token' => $result['refresh_token'],
+				'token_expires' => ( time() + $result['expires_in'] ),
+			)
+		);
+
 	}
 
 	/**
@@ -284,7 +341,7 @@ public function load_screen_data( $step ) {
 		// If this wizard is being served in a modal window, change the flow.
 		if ( $this->is_modal() ) {
 			switch ( $step ) {
-				case 1:
+				case 'start':
 					// Setup API.
 					$api = new ConvertKit_API_V4( CONVERTKIT_OAUTH_CLIENT_ID, CONVERTKIT_OAUTH_CLIENT_REDIRECT_URI );
 
@@ -304,10 +361,10 @@ function ( $hosts ) {
 					);
 
 					// Redirect to OAuth.
-					wp_safe_redirect( $api->get_oauth_url( admin_url( 'options.php?page=convertkit-setup&step=2&convertkit-modal=1' ), get_site_url() ) );
+					wp_safe_redirect( $api->get_oauth_url( admin_url( 'options.php?page=convertkit-setup&step=configuration&convertkit-modal=1' ), get_site_url() ) );
 					die();
 
-				case 2:
+				case 'configuration':
 					// Close modal.
 					$this->maybe_close_modal();
 					break;
@@ -315,7 +372,7 @@ function ( $hosts ) {
 		}
 
 		switch ( $step ) {
-			case 2:
+			case 'configuration':
 				// Re-load settings class now that the Access and Refresh Tokens have been defined.
 				$this->settings = new ConvertKit_Settings();
 
@@ -326,11 +383,11 @@ function ( $hosts ) {
 				// Bail if an error occured.
 				if ( is_wp_error( $result ) ) {
 					// Change the next button label and make it a link to reload the screen.
-					$this->steps[2]['next_button']['label'] = __( 'I\'ve created a form in Kit', 'convertkit' );
-					$this->steps[2]['next_button']['link']  = add_query_arg(
+					$this->steps['configuration']['next_button']['label'] = __( 'I\'ve created a form in Kit', 'convertkit' );
+					$this->steps['configuration']['next_button']['link']  = add_query_arg(
 						array(
 							'page' => $this->page_name,
-							'step' => 2,
+							'step' => 'configuration',
 						),
 						admin_url( 'options.php' )
 					);
@@ -340,11 +397,11 @@ function ( $hosts ) {
 				// If no Forms exist in ConvertKit, change the next button label and make it a link to reload
 				// the screen.
 				if ( ! $this->forms->exist() ) {
-					$this->steps[2]['next_button']['label'] = __( 'I\'ve created a form in Kit', 'convertkit' );
-					$this->steps[2]['next_button']['link']  = add_query_arg(
+					$this->steps['configuration']['next_button']['label'] = __( 'I\'ve created a form in Kit', 'convertkit' );
+					$this->steps['configuration']['next_button']['link']  = add_query_arg(
 						array(
 							'page' => $this->page_name,
-							'step' => 2,
+							'step' => 'configuration',
 						),
 						admin_url( 'options.php' )
 					);
@@ -354,6 +411,12 @@ function ( $hosts ) {
 				$this->preview_post_url = WP_ConvertKit()->get_class( 'preview_output' )->get_preview_form_url( 'post' );
 				$this->preview_page_url = WP_ConvertKit()->get_class( 'preview_output' )->get_preview_form_url( 'page' );
 				break;
+
+			case 'form-importer':
+				// Fetch form importers and Kit Forms.
+				$this->form_importers = convertkit_get_form_importers();
+				$this->forms          = new ConvertKit_Resource_Forms( 'setup_wizard' );
+				break;
 		}
 
 	}
diff --git a/admin/setup-wizard/class-convertkit-admin-setup-wizard-restrict-content.php b/admin/setup-wizard/class-convertkit-admin-setup-wizard-restrict-content.php
index bde73a004..001f77e9a 100644
--- a/admin/setup-wizard/class-convertkit-admin-setup-wizard-restrict-content.php
+++ b/admin/setup-wizard/class-convertkit-admin-setup-wizard-restrict-content.php
@@ -140,16 +140,16 @@ public function __construct() {
 
 		// Define details for each step in the setup process.
 		$this->steps = array(
-			1 => array(
+			'start'         => array(
 				'name' => __( 'Setup', 'convertkit' ),
 			),
-			2 => array(
+			'configuration' => array(
 				'name'        => __( 'Configure', 'convertkit' ),
 				'next_button' => array(
 					'label' => __( 'Submit', 'convertkit' ),
 				),
 			),
-			3 => array(
+			'finish'        => array(
 				'name' => __( 'Done', 'convertkit' ),
 			),
 		);
@@ -167,7 +167,7 @@ public function __construct() {
 	 *
 	 * @since   2.1.0
 	 *
-	 * @param   int $step   Current step.
+	 * @param   string $step   Current step.
 	 */
 	public function process_form( $step ) {
 
@@ -182,7 +182,7 @@ public function process_form( $step ) {
 
 		// Depending on the step, process the form data.
 		switch ( $step ) {
-			case 3:
+			case 'finish':
 				// Sanitize configuration.
 				$configuration = array(
 					'type'             => ( isset( $_POST['type'] ) ? sanitize_text_field( wp_unslash( $_POST['type'] ) ) : 'download' ),
@@ -215,7 +215,7 @@ public function process_form( $step ) {
 				// If here, an error occured as create_download() and create_course() perform a redirect on success.
 				// Show an error message if Account Details could not be fetched e.g. API credentials supplied are invalid.
 				// Decrement the step.
-				$this->step  = ( $this->step - 1 );
+				$this->step  = $this->get_step_key_by_number( $this->get_current_step_number() - 1 );
 				$this->error = $result->get_error_message();
 				return;
 
@@ -230,7 +230,7 @@ public function process_form( $step ) {
 	 *
 	 * @since   2.1.0
 	 *
-	 * @param   int $step   Current step.
+	 * @param   string $step   Current step.
 	 */
 	public function load_screen_data( $step ) {
 
@@ -274,7 +274,7 @@ public function load_screen_data( $step ) {
 
 		// Load data depending on the current step.
 		switch ( $step ) {
-			case 1:
+			case 'start':
 				// Fetch Forms, Products and Tags.
 				$this->forms    = new ConvertKit_Resource_Forms( 'restrict_content_wizard' );
 				$this->products = new ConvertKit_Resource_Products( 'restrict_content_wizard' );
@@ -287,12 +287,12 @@ public function load_screen_data( $step ) {
 				// Bail if an error occured.
 				if ( is_wp_error( $result ) ) {
 					// Change the next label and make it a link to reload the screen.
-					unset( $this->steps[1]['next_button'] );
+					unset( $this->steps['start']['next_button'] );
 					$this->current_url = add_query_arg(
 						array(
 							'page'         => $this->page_name,
 							'ck_post_type' => $this->post_type,
-							'step'         => 1,
+							'step'         => 'start',
 						),
 						admin_url( 'options.php' )
 					);
@@ -305,12 +305,12 @@ public function load_screen_data( $step ) {
 				// Bail if an error occured.
 				if ( is_wp_error( $result ) ) {
 					// Change the next label and make it a link to reload the screen.
-					unset( $this->steps[1]['next_button'] );
+					unset( $this->steps['start']['next_button'] );
 					$this->current_url = add_query_arg(
 						array(
 							'page'         => $this->page_name,
 							'ck_post_type' => $this->post_type,
-							'step'         => 1,
+							'step'         => 'start',
 						),
 						admin_url( 'options.php' )
 					);
@@ -323,12 +323,12 @@ public function load_screen_data( $step ) {
 				// Bail if an error occured.
 				if ( is_wp_error( $result ) ) {
 					// Change the next label and make it a link to reload the screen.
-					unset( $this->steps[1]['next_button'] );
+					unset( $this->steps['start']['next_button'] );
 					$this->current_url = add_query_arg(
 						array(
 							'page'         => $this->page_name,
 							'ck_post_type' => $this->post_type,
-							'step'         => 1,
+							'step'         => 'start',
 						),
 						admin_url( 'options.php' )
 					);
@@ -338,12 +338,12 @@ public function load_screen_data( $step ) {
 				// If no Forms, Products and Tags exist in ConvertKit, change the next button label and make it a link to reload
 				// the screen.
 				if ( ! $this->forms->exist() && ! $this->products->exist() && ! $this->tags->exist() ) {
-					unset( $this->steps[1]['next_button'] );
+					unset( $this->steps['start']['next_button'] );
 					$this->current_url = add_query_arg(
 						array(
 							'page'         => $this->page_name,
 							'ck_post_type' => $this->post_type,
-							'step'         => 1,
+							'step'         => 'start',
 						),
 						admin_url( 'options.php' )
 					);
@@ -367,7 +367,7 @@ public function load_screen_data( $step ) {
 				}
 				break;
 
-			case 2:
+			case 'configuration':
 				// Define Member Content Type.
 				if ( filter_has_var( INPUT_GET, 'type' ) ) {
 					$this->type = filter_input( INPUT_GET, 'type', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
diff --git a/includes/class-wp-convertkit.php b/includes/class-wp-convertkit.php
index 067fc1c26..ecafc5792 100644
--- a/includes/class-wp-convertkit.php
+++ b/includes/class-wp-convertkit.php
@@ -85,6 +85,7 @@ private function initialize_admin() {
 		$this->classes['admin_landing_page']                  = new ConvertKit_Admin_Landing_Page();
 		$this->classes['admin_importer_activecampaign']       = new ConvertKit_Admin_Importer_ActiveCampaign();
 		$this->classes['admin_importer_aweber']               = new ConvertKit_Admin_Importer_AWeber();
+		$this->classes['admin_importer_campaignmonitor']      = new ConvertKit_Admin_Importer_CampaignMonitor();
 		$this->classes['admin_importer_mc4wp']                = new ConvertKit_Admin_Importer_MC4WP();
 		$this->classes['admin_importer_mailpoet']             = new ConvertKit_Admin_Importer_Mailpoet();
 		$this->classes['admin_importer_newsletter']           = new ConvertKit_Admin_Importer_Newsletter();
diff --git a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormCest.php b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormCest.php
index ef64e1f4f..fef694c58 100644
--- a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormCest.php
+++ b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormCest.php
@@ -830,6 +830,11 @@ public function testFormBlockWithSitegroundSpeedOptimizerPlugin(EndToEndTester $
 		// Enable Siteground Speed Optimizer's "Combine JavaScript Files" setting.
 		$I->haveOptionInDatabase('siteground_optimizer_combine_javascript', '1');
 
+		// Configure Siteground Speed Optimizer's Heartbeat.
+		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_post_interval', 120 );
+		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_dashboard_interval', 120 );
+		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_frontend_interval', 120 );
+
 		// Add a Page using the Gutenberg editor.
 		$I->addGutenbergPage(
 			$I,
diff --git a/tests/EndToEnd/forms/blocks-shortcodes/PageShortcodeFormCest.php b/tests/EndToEnd/forms/blocks-shortcodes/PageShortcodeFormCest.php
index 568c8097d..18ea9391b 100644
--- a/tests/EndToEnd/forms/blocks-shortcodes/PageShortcodeFormCest.php
+++ b/tests/EndToEnd/forms/blocks-shortcodes/PageShortcodeFormCest.php
@@ -808,6 +808,11 @@ public function testFormShortcodeWithSitegroundSpeedOptimizerPlugin(EndToEndTest
 		// Enable Siteground Speed Optimizer's "Combine JavaScript Files" setting.
 		$I->haveOptionInDatabase('siteground_optimizer_combine_javascript', '1');
 
+		// Configure Siteground Speed Optimizer's Heartbeat.
+		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_post_interval', 120 );
+		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_dashboard_interval', 120 );
+		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_frontend_interval', 120 );
+
 		// Add a Page using the Classic Editor.
 		$I->addClassicEditorPage(
 			$I,
diff --git a/tests/EndToEnd/forms/post-types/PageFormCest.php b/tests/EndToEnd/forms/post-types/PageFormCest.php
index e79ed82f4..66b0e3f06 100644
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormCest.php
@@ -808,6 +808,11 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 		// Activate Siteground Speed Optimizer Plugin.
 		$I->activateThirdPartyPlugin($I, 'sg-cachepress');
 
+		// Configure Siteground Speed Optimizer's Heartbeat.
+		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_post_interval', 120 );
+		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_dashboard_interval', 120 );
+		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_frontend_interval', 120 );
+
 		// Enable Siteground Speed Optimizer's "Combine JavaScript Files" setting.
 		$I->haveOptionInDatabase('siteground_optimizer_combine_javascript', '1');
 
diff --git a/tests/EndToEnd/general/plugin-screens/PluginSettingsToolsImporterCampaignMonitorCest.php b/tests/EndToEnd/general/plugin-screens/PluginSettingsToolsImporterCampaignMonitorCest.php
new file mode 100644
index 000000000..b8eec7774
--- /dev/null
+++ b/tests/EndToEnd/general/plugin-screens/PluginSettingsToolsImporterCampaignMonitorCest.php
@@ -0,0 +1,212 @@
+<?php
+
+namespace Tests\EndToEnd;
+
+use Tests\Support\EndToEndTester;
+
+/**
+ * Tests for the Settings > Kit > Tools > Import sections for Campaign Monitor.
+ *
+ * @since   3.1.7
+ */
+class PluginSettingsToolsImporterCampaignMonitorCest
+{
+	/**
+	 * Run common actions before running the test functions in this class.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _before(EndToEndTester $I)
+	{
+		// Activate Plugins.
+		$I->activateKitPlugin($I);
+	}
+
+	/**
+	 * Test that Campaign Monitor Form Shortcodes are replaced with Kit Form Shortcodes when the Tools > Campaign Monitor: Migrate Configuration is configured.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testCampaignMonitorImportWithShortcodes(EndToEndTester $I)
+	{
+		// Setup Plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Create Campaign Monitor Forms.
+		$campaignMonitorFormIDs = $this->_createCampaignMonitorForms($I);
+
+		// Insert Campaign Monitor Form Shortcodes into Pages.
+		$pageIDs = $this->_createPagesWithCampaignMonitorFormShortcodes($I, $campaignMonitorFormIDs);
+
+		// Navigate to the Tools screen.
+		$I->loadKitSettingsToolsScreen($I);
+
+		// Select the Kit Forms to replace the Campaign Monitor Forms.
+		foreach ($campaignMonitorFormIDs as $campaignMonitorFormID) {
+			$I->selectOption('_wp_convertkit_integration_campaignmonitor_settings[' . $campaignMonitorFormID . ']', $_ENV['CONVERTKIT_API_FORM_ID']);
+		}
+
+		// Click the Migrate button.
+		$I->click('Migrate');
+
+		// Confirm success message displays.
+		$I->waitForElementVisible('.notice-success');
+		$I->see('Campaign Monitor forms migrated successfully.');
+
+		// View the Pages, to confirm Kit Forms now display.
+		foreach ($pageIDs as $pageID) {
+			$I->amOnPage('?p=' . $pageID);
+			$I->seeElementInDOM('form[data-sv-form]');
+		}
+	}
+
+	/**
+	 * Test that the Campaign Monitor: Migrate Configuration section is not displayed when no Campaign Monitor Forms exist.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testCampaignMonitorImportWhenNoCampaignMonitorForms(EndToEndTester $I)
+	{
+		// Setup Plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Navigate to the Tools screen.
+		$I->loadKitSettingsToolsScreen($I);
+
+		// Confirm no Campaign Monitor: Migrate Configuration section is displayed.
+		$I->dontSeeElementInDOM('#import-campaignmonitor');
+	}
+
+	/**
+	 * Test that the Campaign Monitor: Migrate Configuration section is not displayed when Campaign Monitor Forms exist,
+	 * but no Pages, Posts or Custom Posts contain Campaign Monitor Form Shortcodes.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testCampaignMonitorImportWhenNoCampaignMonitorShortcodesInContent(EndToEndTester $I)
+	{
+		// Setup Plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Create Campaign Monitor Forms.
+		$this->_createCampaignMonitorForms($I);
+
+		// Navigate to the Tools screen.
+		$I->loadKitSettingsToolsScreen($I);
+
+		// Confirm no Campaign Monitor: Migrate Configuration section is displayed, as there are no
+		// Campaign Monitor Form Shortcodes in the content.
+		$I->dontSeeElementInDOM('#import-campaignmonitor');
+	}
+
+	/**
+	 * Test that the Campaign Monitor: Migrate Configuration section is not displayed when no Kit Forms exist.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testCampaignMonitorImportWhenNoKitForms(EndToEndTester $I)
+	{
+		// Setup Plugin.
+		$I->setupKitPluginCredentialsNoData($I);
+		$I->setupKitPluginResourcesNoData($I);
+
+		// Navigate to the Tools screen.
+		$I->loadKitSettingsToolsScreen($I);
+
+		// Confirm no Campaign Monitor: Migrate Configuration section is displayed, as there are no
+		// Campaign Monitor Form Shortcodes in the content.
+		$I->dontSeeElementInDOM('#import-campaignmonitor');
+	}
+
+	/**
+	 * Create Campaign Monitor Forms.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 * @return  array
+	 */
+	private function _createCampaignMonitorForms(EndToEndTester $I)
+	{
+		// Create Campaign Monitor Forms in the Plugin Settings.
+		$I->haveOptionInDatabase(
+			'forms_for_campaign_monitor_forms',
+			[
+				'cm_6912dba75db2d' => (object) [
+					'__PHP_Incomplete_Class_Name' => 'forms\core\Form',
+					"\0*\0name"                   => 'Campaign Monitor Form #1',
+				],
+				'cm_6982a693a0095' => (object) [
+					'__PHP_Incomplete_Class_Name' => 'forms\core\Form',
+					"\0*\0name"                   => 'Campaign Monitor Form #2',
+				],
+			]
+		);
+
+		// Return Form IDs.
+		return [ 'cm_6912dba75db2d', 'cm_6982a693a0095' ];
+	}
+
+	/**
+	 * Create Pages with Campaign Monitor Form Shortcodes.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 * @param   array          $campaignMonitorFormIDs  Campaign Monitor Form IDs.
+	 * @return  array
+	 */
+	private function _createPagesWithCampaignMonitorFormShortcodes(EndToEndTester $I, $campaignMonitorFormIDs)
+	{
+		$pageIDs = array();
+
+		foreach ($campaignMonitorFormIDs as $campaignMonitorFormID) {
+			$pageIDs[] = $I->havePostInDatabase(
+				[
+					'post_type'    => 'page',
+					'post_status'  => 'publish',
+					'post_title'   => 'Page with Campaign Monitor Form #' . $campaignMonitorFormID,
+					'post_content' => '[cm_form form_id="' . $campaignMonitorFormID . '"]',
+					'meta_input'   => [
+						'_wp_convertkit_post_meta' => [
+							'form'         => '0',
+							'landing_page' => '',
+							'tag'          => '',
+						],
+					],
+				]
+			);
+		}
+
+		return $pageIDs;
+	}
+
+	/**
+	 * Deactivate and reset Plugin(s) after each test, if the test passes.
+	 * We don't use _after, as this would provide a screenshot of the Plugin
+	 * deactivation and not the true test error.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _passed(EndToEndTester $I)
+	{
+		$I->deactivateKitPlugin($I);
+		$I->dontHaveOptionInDatabase('settings_campaignmonitor');
+		$I->resetKitPlugin($I);
+	}
+}
diff --git a/tests/EndToEnd/general/plugin-screens/PluginSetupWizardCest.php b/tests/EndToEnd/general/plugin-screens/PluginSetupWizardCest.php
index 9b7f9b7c3..33ed640af 100644
--- a/tests/EndToEnd/general/plugin-screens/PluginSetupWizardCest.php
+++ b/tests/EndToEnd/general/plugin-screens/PluginSetupWizardCest.php
@@ -24,7 +24,12 @@ public function testSetupWizardDisplays(EndToEndTester $I)
 		$this->_activatePlugin($I);
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 1, 'Welcome to the Kit Setup Wizard');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'start',
+			stepCount: 1,
+			title: 'Welcome to the Kit Setup Wizard'
+		);
 	}
 
 	/**
@@ -108,7 +113,12 @@ public function testSetupWizardExitLink(EndToEndTester $I)
 		$this->_activatePlugin($I);
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 1, 'Welcome to the Kit Setup Wizard');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'start',
+			stepCount: 1,
+			title: 'Welcome to the Kit Setup Wizard'
+		);
 
 		// Click Exit wizard link.
 		$I->click('Exit wizard');
@@ -136,7 +146,12 @@ public function testSetupWizardSetupScreenConnectButton(EndToEndTester $I)
 		$this->_activatePlugin($I);
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 1, 'Welcome to the Kit Setup Wizard');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'start',
+			stepCount: 1,
+			title: 'Welcome to the Kit Setup Wizard'
+		);
 
 		// Test Connect button.
 		$I->click('Connect');
@@ -147,10 +162,15 @@ public function testSetupWizardSetupScreenConnectButton(EndToEndTester $I)
 
 		// Act as if we completed OAuth.
 		$I->setupKitPluginNoDefaultForms($I);
-		$I->amOnAdminPage('options.php?page=convertkit-setup&step=2');
+		$I->amOnAdminPage('options.php?page=convertkit-setup&step=configuration');
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 2, 'Display an email capture form');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'configuration',
+			stepCount: 2,
+			title: 'Display an email capture form'
+		);
 	}
 
 	/**
@@ -171,7 +191,12 @@ public function testSetupWizardConnectAccountScreenWithInvalidCredentials(EndToE
 		$this->_activatePlugin($I);
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 1, 'Welcome to the Kit Setup Wizard');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'start',
+			stepCount: 1,
+			title: 'Welcome to the Kit Setup Wizard'
+		);
 
 		// Test Connect button.
 		$I->click('Connect');
@@ -181,10 +206,15 @@ public function testSetupWizardConnectAccountScreenWithInvalidCredentials(EndToE
 		$I->seeInSource('oauth/authorize?client_id=' . $_ENV['CONVERTKIT_OAUTH_CLIENT_ID']);
 
 		// Act as if OAuth failed i.e. the user didn't authenticate.
-		$I->amOnAdminPage('options.php?page=convertkit-setup&step=2&error=' . $error . '&error_description=' . urlencode($errorDescription));
+		$I->amOnAdminPage('options.php?page=convertkit-setup&step=configuration&error=' . $error . '&error_description=' . urlencode($errorDescription));
 
 		// Confirm expected setup wizard screen is still displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 1, 'Welcome to the Kit Setup Wizard');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'start',
+			stepCount: 1,
+			title: 'Welcome to the Kit Setup Wizard'
+		);
 
 		// Confirm error notification is displayed.
 		$I->seeElement('div.notice.notice-error.is-dismissible');
@@ -233,10 +263,15 @@ public function testSetupWizardFormConfigurationScreen(EndToEndTester $I)
 		);
 
 		// Load Step 2/3.
-		$I->amOnAdminPage('options.php?page=convertkit-setup&step=2');
+		$I->amOnAdminPage('options.php?page=convertkit-setup&step=configuration');
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 2, 'Display an email capture form');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'configuration',
+			stepCount: 2,
+			title: 'Display an email capture form'
+		);
 
 		// Select a Post Form.
 		$I->fillSelect2Field(
@@ -290,7 +325,12 @@ public function testSetupWizardFormConfigurationScreen(EndToEndTester $I)
 		$I->click('Finish Setup');
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 3, 'Setup complete');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'finish',
+			stepCount: 3,
+			title: 'Setup complete'
+		);
 
 		// Click Plugin Settings.
 		$I->click('Plugin Settings');
@@ -334,10 +374,15 @@ public function testSetupWizardUsageTrackingSetting(EndToEndTester $I)
 		);
 
 		// Load Step 2/3.
-		$I->amOnAdminPage('options.php?page=convertkit-setup&step=2');
+		$I->amOnAdminPage('options.php?page=convertkit-setup&step=configuration');
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 2, 'Display an email capture form');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'configuration',
+			stepCount: 2,
+			title: 'Display an email capture form'
+		);
 
 		// Uncheck Usage Tracking setting.
 		$I->uncheckOption('#wp-convertkit-usage-tracking');
@@ -346,7 +391,12 @@ public function testSetupWizardUsageTrackingSetting(EndToEndTester $I)
 		$I->click('Finish Setup');
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 3, 'Setup complete');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'finish',
+			stepCount: 3,
+			title: 'Setup complete'
+		);
 
 		// Click Plugin Settings.
 		$I->click('Plugin Settings');
@@ -358,10 +408,15 @@ public function testSetupWizardUsageTrackingSetting(EndToEndTester $I)
 		$I->dontSeeCheckboxIsChecked('#usage_tracking');
 
 		// Load Step 2/3 on the Setup Wizard screen again.
-		$I->amOnAdminPage('options.php?page=convertkit-setup&step=2');
+		$I->amOnAdminPage('options.php?page=convertkit-setup&step=configuration');
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 2, 'Display an email capture form');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'configuration',
+			stepCount: 2,
+			title: 'Display an email capture form'
+		);
 
 		// Check Usage Tracking setting.
 		$I->checkOption('#wp-convertkit-usage-tracking');
@@ -370,7 +425,12 @@ public function testSetupWizardUsageTrackingSetting(EndToEndTester $I)
 		$I->click('Finish Setup');
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 3, 'Setup complete');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'finish',
+			stepCount: 3,
+			title: 'Setup complete'
+		);
 
 		// Click Plugin Settings.
 		$I->click('Plugin Settings');
@@ -403,10 +463,16 @@ public function testSetupWizardFormConfigurationScreenWhenNoFormsExist(EndToEndT
 		$I->setupKitPluginCredentialsNoData($I);
 
 		// Load Step 2/3.
-		$I->amOnAdminPage('options.php?page=convertkit-setup&step=2');
+		$I->amOnAdminPage('options.php?page=convertkit-setup&step=configuration');
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 2, 'Create your first Kit Form', true);
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'configuration',
+			stepCount: 2,
+			title: 'Create your first Kit Form',
+			nextButtonIsLink: true
+		);
 
 		// Confirm button link to create a form on Kit is correct.
 		$I->seeInSource('<a href="https://app.kit.com/forms/new/?utm_source=wordpress&amp;utm_term=en_US&amp;utm_content=convertkit"');
@@ -419,7 +485,12 @@ public function testSetupWizardFormConfigurationScreenWhenNoFormsExist(EndToEndT
 		$I->click('I\'ve created a form in Kit');
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 2, 'Display an email capture form');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'configuration',
+			stepCount: 2,
+			title: 'Display an email capture form'
+		);
 
 		// Confirm we can select a Post Form.
 		$I->fillSelect2Field(
@@ -449,16 +520,130 @@ public function testSetupWizardFormConfigurationScreenWhenNoPostsOrPagesExist(En
 		$I->setupKitPluginNoDefaultForms($I);
 
 		// Load Step 2/3.
-		$I->amOnAdminPage('options.php?page=convertkit-setup&step=2');
+		$I->amOnAdminPage('options.php?page=convertkit-setup&step=configuration');
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 2, 'Display an email capture form');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'configuration',
+			stepCount: 2,
+			title: 'Display an email capture form'
+		);
 
 		// Confirm no Page or Post preview links exist, because there are no Pages or Posts in WordPress.
 		$I->dontSeeElementInDOM('a#convertkit-preview-form-post');
 		$I->dontSeeElementInDOM('a#convertkit-preview-form-page');
 	}
 
+	/**
+	 * Test that the Setup Wizard > Form Importer screen works as expected
+	 * when Active Campaign Forms exist.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testSetupWizardFormImporterScreen(EndToEndTester $I)
+	{
+		// Activate Plugin.
+		$this->_activatePlugin($I);
+
+		// Wait for the Plugin Setup Wizard screen to load.
+		$I->waitForElementVisible('body.convertkit');
+
+		// Define Plugin settings and resources.
+		$I->setupKitPluginResources($I);
+		$I->setupKitPluginNoDefaultForms($I);
+
+		// Create Active Campaign Forms.
+		$I->haveOptionInDatabase(
+			'settings_activecampaign',
+			[
+				'forms' => [
+					1 => [
+						'id'   => '1',
+						'name' => 'ActiveCampaign Form #1',
+					],
+					2 => [
+						'id'   => '2',
+						'name' => 'ActiveCampaign Form #2',
+					],
+				],
+			]
+		);
+
+		// Create Pages with ActiveCampaign Form Shortcode and Block.
+		$pageIDs = [
+			$I->havePostInDatabase(
+				[
+					'post_type'    => 'page',
+					'post_status'  => 'publish',
+					'post_title'   => 'Page with ActiveCampaign Form',
+					'post_content' => '[activecampaign form="1"]',
+					'meta_input'   => [
+						'_wp_convertkit_post_meta' => [
+							'form'         => '0',
+							'landing_page' => '',
+							'tag'          => '',
+						],
+					],
+				]
+			),
+			$I->havePostInDatabase(
+				[
+					'post_type'    => 'page',
+					'post_status'  => 'publish',
+					'post_title'   => 'Page with ActiveCampaign Block',
+					'post_content' => '<!-- wp:activecampaign-form/activecampaign-form-block {"formId":2} /--><!-- wp:html --><div class="wp-block-core-html">Some content with characters !@£$%^&amp;*()_+~!@£$%^&amp;*()_+\\\</div><!-- /wp:html -->',
+
+					// Configure Kit Plugin to not display a default Form, so we test against the Kit Form in the content.
+					'meta_input'   => [
+						'_wp_convertkit_post_meta' => [
+							'form'         => '0',
+							'landing_page' => '',
+							'tag'          => '',
+						],
+					],
+				]
+			),
+		];
+
+		// Load Form Importer screen of Setup Wizard.
+		$I->amOnAdminPage('options.php?page=convertkit-setup&step=form-importer');
+
+		// Select the Kit Forms to replace the ActiveCampaign Forms.
+		$I->fillSelect2Field(
+			$I,
+			container: '#select2-form-importer-activecampaign-1-container',
+			value: $_ENV['CONVERTKIT_API_FORM_NAME']
+		);
+		$I->fillSelect2Field(
+			$I,
+			container: '#select2-form-importer-activecampaign-2-container',
+			value: $_ENV['CONVERTKIT_API_FORM_NAME']
+		);
+
+		// Click the Finish Setup button.
+		$I->click('Finish Setup');
+
+		// Confirm expected setup wizard screen is displayed.
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'finish',
+			stepCount: 4,
+			totalSteps: 4,
+			title: 'Setup complete'
+		);
+
+		// Test each Page.
+		foreach ($pageIDs as $pageID) {
+			$I->amOnPage('?p=' . $pageID);
+
+			// Check Kit Forms are displayed.
+			$I->seeElementInDOM('form[data-sv-form]');
+		}
+	}
+
 	/**
 	 * Tests that a link to the Setup Wizard exists on the Plugins screen, and works when clicked.
 	 *
@@ -483,7 +668,12 @@ public function testSetupWizardLinkOnPluginsScreen(EndToEndTester $I)
 		$I->click('tr[data-slug="convertkit"] td div.row-actions span.setup_wizard a');
 
 		// Confirm expected setup wizard screen is displayed.
-		$this->_seeExpectedSetupWizardScreen($I, 1, 'Welcome to the Kit Setup Wizard');
+		$this->_seeExpectedSetupWizardScreen(
+			$I,
+			step: 'start',
+			stepCount: 1,
+			title: 'Welcome to the Kit Setup Wizard'
+		);
 	}
 
 	/**
@@ -520,12 +710,14 @@ private function _activatePlugin(EndToEndTester $I)
 	 *
 	 * @since   1.9.8.4
 	 *
-	 * @param   EndToEndTester $I      Tester.
-	 * @param   int            $step   Current step.
-	 * @param   string         $title  Expected title.
+	 * @param   EndToEndTester $I                  Tester.
+	 * @param   string         $step               Current step.
+	 * @param   int            $stepCount          Current step count.
+	 * @param   string         $title              Expected title.
 	 * @param   bool           $nextButtonIsLink   Check that next button is a link (false = must be a <button> element).
+	 * @param   int            $totalSteps         Total steps in Setup Wizard.
 	 */
-	private function _seeExpectedSetupWizardScreen(EndToEndTester $I, $step, $title, $nextButtonIsLink = false)
+	private function _seeExpectedSetupWizardScreen(EndToEndTester $I, $step, $stepCount, $title, $nextButtonIsLink = false, $totalSteps = 3)
 	{
 		// Wait for the Plugin Setup Wizard screen to load.
 		$I->waitForElementVisible('body.convertkit');
@@ -540,19 +732,17 @@ private function _seeExpectedSetupWizardScreen(EndToEndTester $I, $step, $title,
 		$I->see($title);
 
 		// Confirm current and previous steps are highlighted as 'done'.
-		for ($stepCount = 1; $stepCount <= $step; $stepCount++) {
-			$I->seeElement('li.step-' . $stepCount . '.done');
-		}
+		$I->seeNumberOfElements('ol li.done', $stepCount);
 
 		// Confirm Step text is correct.
-		$I->see('Step ' . $step . ' of 3');
+		$I->see('Step ' . $stepCount . ' of ' . $totalSteps);
 
 		// Depending on the step, confirm previous/next buttons exist / do not exist.
 		switch ($step) {
 			/**
 			 * First step should only display Connect button.
 			 */
-			case 1:
+			case 'start':
 				$I->dontSeeElementInDOM('#convertkit-setup-wizard-footer div.left a.button');
 				$I->dontSeeElementInDOM('#convertkit-setup-wizard-footer div.right button');
 				$I->seeElementInDOM('#convertkit-setup-wizard-footer div.right a.button');
@@ -561,7 +751,7 @@ private function _seeExpectedSetupWizardScreen(EndToEndTester $I, $step, $title,
 			/**
 			 * Middle step should always display footer buttons.
 			 */
-			case 2:
+			case 'configuration':
 				$I->seeElementInDOM('#convertkit-setup-wizard-footer div.left a.button');
 
 				if ($nextButtonIsLink) {
@@ -576,7 +766,7 @@ private function _seeExpectedSetupWizardScreen(EndToEndTester $I, $step, $title,
 			/**
 			 * Last step should not display any footer buttons.
 			 */
-			case 3:
+			case 'finish':
 				$I->dontSeeElementInDOM('#convertkit-setup-wizard-footer div.left a.button');
 				$I->dontSeeElementInDOM('#convertkit-setup-wizard-footer div.right button');
 				$I->dontSeeElementInDOM('#convertkit-setup-wizard-footer div.right a.button');
@@ -607,7 +797,7 @@ public function testSetupWizardModal(EndToEndTester $I)
 
 		// Act as if we completed OAuth.
 		$I->setupKitPluginNoDefaultForms($I);
-		$I->amOnAdminPage('options.php?page=convertkit-setup&step=2&convertkit-modal=1');
+		$I->amOnAdminPage('options.php?page=convertkit-setup&step=configuration&convertkit-modal=1');
 
 		// Confirm the close modal view was loaded, which includes some JS.
 		$I->seeInSource('self.close();');
diff --git a/tests/EndToEnd/landing-pages/PageLandingPageSetupWizardCest.php b/tests/EndToEnd/landing-pages/PageLandingPageSetupWizardCest.php
index dd5270eb9..65dd2a683 100644
--- a/tests/EndToEnd/landing-pages/PageLandingPageSetupWizardCest.php
+++ b/tests/EndToEnd/landing-pages/PageLandingPageSetupWizardCest.php
@@ -179,7 +179,7 @@ public function testAddNewLandingPageExitWizardLink(EndToEndTester $I)
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewMemberLandingPage(EndToEndTester $I)
+	public function testAddNewLandingPage(EndToEndTester $I)
 	{
 		// Setup Plugin and navigate to Add New Landing Page screen.
 		$this->_setupAndLoadAddNewLandingPageScreen($I);
@@ -224,7 +224,7 @@ public function testAddNewMemberLandingPage(EndToEndTester $I)
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewMemberLegacyLandingPage(EndToEndTester $I)
+	public function testAddNewLegacyLandingPage(EndToEndTester $I)
 	{
 		// Setup Plugin and navigate to Add New Landing Page screen.
 		$this->_setupAndLoadAddNewLandingPageScreen($I);
diff --git a/tests/Integration/ImporterTest.php b/tests/Integration/ImporterTest.php
index 9d39348ab..29336d7f6 100644
--- a/tests/Integration/ImporterTest.php
+++ b/tests/Integration/ImporterTest.php
@@ -386,6 +386,102 @@ public function testAWeberReplaceBlocksInContent()
 		);
 	}
 
+	/**
+	 * Test that the get_form_ids_from_content() method returns Campaign Monitor form shortcode Form IDs
+	 * ignoring any other shortcodes.
+	 *
+	 * @since   3.1.7
+	 */
+	public function testCampaignMonitorGetFormIDsFromContent()
+	{
+		// Initialize the class we want to test.
+		$this->importer = new \ConvertKit_Admin_Importer_CampaignMonitor();
+
+		// Confirm initialization didn't result in an error.
+		$this->assertNotInstanceOf(\WP_Error::class, $this->importer);
+
+		// Define the content to test.
+		$content = '[cm_form form_id="cm_6912dba75db2d"] some content [cm_form form_id="cm_6982a693a0095"] some other content [aweber formid="12"] different shortcode to ignore';
+
+		// Extract form IDs from content.
+		$form_ids = $this->importer->get_form_ids_from_content( $content );
+
+		// Assert the correct number of form IDs are returned.
+		$this->assertEquals( 2, count( $form_ids ) );
+		$this->assertEquals( 'cm_6912dba75db2d', $form_ids[0] );
+		$this->assertEquals( 'cm_6982a693a0095', $form_ids[1] );
+	}
+
+	/**
+	 * Test that the replace_shortcodes_in_content() method replaces the Campaign Monitor form shortcode with the Kit form shortcode.
+	 *
+	 * @since   3.1.7
+	 */
+	public function testCampaignMonitorReplaceShortcodesInContent()
+	{
+		// Initialize the class we want to test.
+		$this->importer = new \ConvertKit_Admin_Importer_CampaignMonitor();
+
+		// Confirm initialization didn't result in an error.
+		$this->assertNotInstanceOf(\WP_Error::class, $this->importer);
+
+		// Define the shortcodes to test.
+		$shortcodes = [
+			'[cm_form form_id="cm_6912dba75db2d"]',
+			'[cm_form form_id=cm_6912dba75db2d]',
+		];
+
+		// Test each shortcode is replaced with the Kit form shortcode.
+		foreach ( $shortcodes as $shortcode ) {
+			$this->assertEquals(
+				'[convertkit_form id="' . $_ENV['CONVERTKIT_API_FORM_ID'] . '"]',
+				$this->importer->replace_shortcodes_in_content( $shortcode, 'cm_6912dba75db2d', $_ENV['CONVERTKIT_API_FORM_ID'] )
+			);
+
+			// Prepend and append some content.
+			$content = 'Some content before the shortcode: ' . $shortcode . ' Some content after the shortcode.';
+			$this->assertEquals(
+				'Some content before the shortcode: [convertkit_form id="' . $_ENV['CONVERTKIT_API_FORM_ID'] . '"] Some content after the shortcode.',
+				$this->importer->replace_shortcodes_in_content( $content, 'cm_6912dba75db2d', $_ENV['CONVERTKIT_API_FORM_ID'] )
+			);
+
+			// Prepend and append some content and duplicate the shortcode.
+			$content = 'Some content before the shortcode: ' . $shortcode . ' Some content after the shortcode: ' . $shortcode;
+			$this->assertEquals(
+				'Some content before the shortcode: [convertkit_form id="' . $_ENV['CONVERTKIT_API_FORM_ID'] . '"] Some content after the shortcode: [convertkit_form id="' . $_ENV['CONVERTKIT_API_FORM_ID'] . '"]',
+				$this->importer->replace_shortcodes_in_content( $content, 'cm_6912dba75db2d', $_ENV['CONVERTKIT_API_FORM_ID'] )
+			);
+		}
+	}
+
+	/**
+	 * Test that the replace_shortcodes_in_content() method ignores non-Campaign Monitor shortcodes.
+	 *
+	 * @since   3.1.7
+	 */
+	public function testCampaignMonitorReplaceShortcodesInContentIgnoringOtherShortcodes()
+	{
+		// Initialize the class we want to test.
+		$this->importer = new \ConvertKit_Admin_Importer_CampaignMonitor();
+
+		// Confirm initialization didn't result in an error.
+		$this->assertNotInstanceOf(\WP_Error::class, $this->importer);
+
+		// Define the shortcodes to test.
+		$shortcodes = [
+			'[convertkit_form id="' . $_ENV['CONVERTKIT_API_FORM_ID'] . '"]',
+			'[a_random_shortcode]',
+		];
+
+		// Test each shortcode is ignored.
+		foreach ( $shortcodes as $shortcode ) {
+			$this->assertEquals(
+				$shortcode,
+				$this->importer->replace_shortcodes_in_content( $shortcode, 'cm_6912dba75db2d', $_ENV['CONVERTKIT_API_FORM_ID'] )
+			);
+		}
+	}
+
 	/**
 	 * Test that the get_form_ids_from_content() method returns MC4WP form shortcode Form IDs
 	 * ignoring any other shortcodes.
diff --git a/tests/Support/Helper/ThirdPartyPlugin.php b/tests/Support/Helper/ThirdPartyPlugin.php
index cc02c4886..a0ba082ac 100644
--- a/tests/Support/Helper/ThirdPartyPlugin.php
+++ b/tests/Support/Helper/ThirdPartyPlugin.php
@@ -73,6 +73,9 @@ public function activateThirdPartyPlugin($I, $name, $wizardExpectsToDisplay = tr
 		if ($name === 'wishlist-member' && version_compare( phpversion(), '8.1', '>' )) {
 			return;
 		}
+		if ($name === 'sg-cachepress') {
+			return;
+		}
 
 		// Check that no PHP warnings or notices were output.
 		$I->checkNoWarningsAndNoticesOnScreen($I);
diff --git a/views/backend/setup-wizard/convertkit-landing-page-setup/content-2.php b/views/backend/setup-wizard/convertkit-landing-page-setup/content-finish.php
similarity index 100%
rename from views/backend/setup-wizard/convertkit-landing-page-setup/content-2.php
rename to views/backend/setup-wizard/convertkit-landing-page-setup/content-finish.php
diff --git a/views/backend/setup-wizard/convertkit-landing-page-setup/content-1.php b/views/backend/setup-wizard/convertkit-landing-page-setup/content-start.php
similarity index 100%
rename from views/backend/setup-wizard/convertkit-landing-page-setup/content-1.php
rename to views/backend/setup-wizard/convertkit-landing-page-setup/content-start.php
diff --git a/views/backend/setup-wizard/convertkit-restrict-content-setup/content-2.php b/views/backend/setup-wizard/convertkit-restrict-content-setup/content-configuration.php
similarity index 100%
rename from views/backend/setup-wizard/convertkit-restrict-content-setup/content-2.php
rename to views/backend/setup-wizard/convertkit-restrict-content-setup/content-configuration.php
diff --git a/views/backend/setup-wizard/convertkit-restrict-content-setup/content-1.php b/views/backend/setup-wizard/convertkit-restrict-content-setup/content-start.php
similarity index 100%
rename from views/backend/setup-wizard/convertkit-restrict-content-setup/content-1.php
rename to views/backend/setup-wizard/convertkit-restrict-content-setup/content-start.php
diff --git a/views/backend/setup-wizard/convertkit-setup/content-2.php b/views/backend/setup-wizard/convertkit-setup/content-configuration.php
similarity index 100%
rename from views/backend/setup-wizard/convertkit-setup/content-2.php
rename to views/backend/setup-wizard/convertkit-setup/content-configuration.php
diff --git a/views/backend/setup-wizard/convertkit-setup/content-3.php b/views/backend/setup-wizard/convertkit-setup/content-finish.php
similarity index 100%
rename from views/backend/setup-wizard/convertkit-setup/content-3.php
rename to views/backend/setup-wizard/convertkit-setup/content-finish.php
diff --git a/views/backend/setup-wizard/convertkit-setup/content-form-importer.php b/views/backend/setup-wizard/convertkit-setup/content-form-importer.php
new file mode 100644
index 000000000..3b5a6d662
--- /dev/null
+++ b/views/backend/setup-wizard/convertkit-setup/content-form-importer.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Outputs the content for the Plugin Setup Wizard > Form Importer step.
+ *
+ * @package ConvertKit
+ * @author ConvertKit
+ */
+
+foreach ( $this->form_importers as $form_importer ) {
+	?>
+	<div>
+		<h1><?php echo esc_html( $form_importer['title'] ); ?></h1>
+		<p>
+			<?php
+			printf(
+				/* translators: %s: Form importer title */
+				esc_html__( 'We detected the following %s forms in your content. We recommend replacing these with Kit forms, but you may leave them as is.', 'convertkit' ),
+				esc_html( $form_importer['title'] )
+			);
+			?>
+		</p>
+
+		<table class="widefat striped">
+			<thead>
+				<tr>
+					<th>
+						<?php
+						/* translators: %s: Form importer title */
+						printf(
+							/* translators: %s: Form importer title */
+							esc_html__( '%s Form', 'convertkit' ),
+							esc_html( $form_importer['title'] )
+						);
+						?>
+					</th>
+					<th>
+						<?php esc_html_e( 'Kit Form', 'convertkit' ); ?>
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				<?php
+				foreach ( $form_importer['forms'] as $form_importer_form_id => $form_importer_form_title ) {
+					?>
+					<tr>
+						<td><?php echo esc_html( $form_importer_form_title ); ?></td>
+						<td>
+						<?php
+							$this->forms->output_select_field_all(
+								'form_importer[' . $form_importer['name'] . '][' . $form_importer_form_id . ']',
+								'form-importer-' . $form_importer['name'] . '-' . $form_importer_form_id,
+								array(
+									'convertkit-select2',
+									'widefat',
+								),
+								'',
+								array(
+									'0' => esc_html__( 'Don\'t replace.', 'convertkit' ),
+								)
+							);
+						?>
+						</td>
+					</tr>
+					<?php
+				}
+				?>
+			</tbody>
+		</table>
+	</div>
+	<?php
+}
diff --git a/views/backend/setup-wizard/convertkit-setup/content-1.php b/views/backend/setup-wizard/convertkit-setup/content-start.php
similarity index 100%
rename from views/backend/setup-wizard/convertkit-setup/content-1.php
rename to views/backend/setup-wizard/convertkit-setup/content-start.php
diff --git a/views/backend/setup-wizard/footer.php b/views/backend/setup-wizard/footer.php
index 6ac5eafb9..1858a76ac 100644
--- a/views/backend/setup-wizard/footer.php
+++ b/views/backend/setup-wizard/footer.php
@@ -50,7 +50,7 @@
 
 			<?php
 			// Show exit link if we're not on the last step.
-			if ( $this->step < count( $this->steps ) && ! $this->is_modal() ) {
+			if ( $this->get_current_step_number() < $this->get_total_steps() && ! $this->is_modal() ) {
 				?>
 				<div id="convertkit-setup-wizard-exit-link">
 					<a href="<?php echo esc_url( $this->exit_url ); ?>" class="convertkit-confirm" title="<?php esc_html_e( 'Exit wizard', 'convertkit' ); ?>" data-message="<?php esc_html_e( 'Are you sure you want to exit the wizard? Setup is incomplete.', 'convertkit' ); ?>">
diff --git a/views/backend/setup-wizard/header.php b/views/backend/setup-wizard/header.php
index 5194c20b6..6598dab8a 100644
--- a/views/backend/setup-wizard/header.php
+++ b/views/backend/setup-wizard/header.php
@@ -41,10 +41,12 @@
 					<div id="convertkit-setup-wizard-progress">
 						<ol>
 							<?php
-							foreach ( $this->steps as $step_count => $step ) {
+							$step_count = 1;
+							foreach ( $this->steps as $step_name => $step ) {
 								?>
-								<li class="step-<?php echo esc_attr( $step_count ); ?><?php echo ( $step_count <= $this->step ? ' done' : '' ); ?>"><?php echo esc_html( $step['name'] ); ?></li>
+								<li class="step-<?php echo esc_attr( $step_name ); ?><?php echo ( $step_count <= $this->get_current_step_number() ? ' done' : '' ); ?>"><?php echo esc_html( $step['name'] ); ?></li>
 								<?php
+								++$step_count;
 							}
 							?>
 						</ol>
@@ -75,8 +77,8 @@
 								printf(
 									/* translators: %1$s: Current Step, %2$s: Total Steps */
 									esc_html__( 'Step %1$s of %2$s', 'convertkit' ),
-									esc_html( $this->step ),
-									esc_html( count( $this->steps ) )
+									esc_html( $this->get_current_step_number() ),
+									esc_html( $this->get_total_steps() )
 								);
 								?>
 							</div>
diff --git a/wp-convertkit.php b/wp-convertkit.php
index 27dc19989..42e498a3c 100644
--- a/wp-convertkit.php
+++ b/wp-convertkit.php
@@ -118,6 +118,7 @@
 require_once CONVERTKIT_PLUGIN_PATH . '/admin/importers/class-convertkit-admin-importer.php';
 require_once CONVERTKIT_PLUGIN_PATH . '/admin/importers/class-convertkit-admin-importer-activecampaign.php';
 require_once CONVERTKIT_PLUGIN_PATH . '/admin/importers/class-convertkit-admin-importer-aweber.php';
+require_once CONVERTKIT_PLUGIN_PATH . '/admin/importers/class-convertkit-admin-importer-campaignmonitor.php';
 require_once CONVERTKIT_PLUGIN_PATH . '/admin/importers/class-convertkit-admin-importer-mc4wp.php';
 require_once CONVERTKIT_PLUGIN_PATH . '/admin/importers/class-convertkit-admin-importer-mailpoet.php';
 require_once CONVERTKIT_PLUGIN_PATH . '/admin/importers/class-convertkit-admin-importer-newsletter.php';