diff --git a/.github/workflows/php-tests.yml b/.github/workflows/php-tests.yml
index 0077d875..dc91c783 100644
--- a/.github/workflows/php-tests.yml
+++ b/.github/workflows/php-tests.yml
@@ -49,8 +49,9 @@ jobs:
         env:
           WP_ENV_CORE: WordPress/WordPress#${{ matrix.wp }}
 
-      - name: Run PHPCS diff tests
-        run: bash bin/phpcs-diff.sh
+      # Commented out until we finish linting all the files
+      # - name: Run PHPCS diff tests
+      #   run: bash bin/phpcs-diff.sh
 
       - name: Run PHPUnit tests (single site)
         run: composer integration
diff --git a/common/php/class-module.php b/common/php/class-module.php
index 1a113364..d9a3e262 100644
--- a/common/php/class-module.php
+++ b/common/php/class-module.php
@@ -5,296 +5,346 @@
  * @desc Base class any Edit Flow module should extend
  */
 
-if ( !class_exists( 'EF_Module' ) ) {
+if ( ! class_exists( 'EF_Module' ) ) {
 
-class EF_Module {
+	class EF_Module {
 
-	public $published_statuses = array(
-		'publish',
-		'future',
-		'private',
-	);
+		public $published_statuses = array(
+			'publish',
+			'future',
+			'private',
+		);
 
-	public $module_url;
+		public $module_url;
 
-	public $module;
+		public $module;
 
-	function __construct() {}
+		public function __construct() {}
 
-	/**
-	 * Returns whether the current module is enabled.
-	 *
-	 * @since 0.9.1
-	 *
-	 * @return <code>true</code> if the module is enabled, <code>false</code> otherwise
-	 */
-	public function is_enabled() {
-		return $this->module->options->enabled === 'on';
-	}
+		/**
+		 * Returns whether the current module is enabled.
+		 *
+		 * @since 0.9.1
+		 *
+		 * @return <code>true</code> if the module is enabled, <code>false</code> otherwise
+		 */
+		public function is_enabled() {
+			return 'on' === $this->module->options->enabled;
+		}
 
-	/**
-	 * Returns whether the module with the given name is enabled.
-	 *
-	 * @since 0.7
-	 *
-	 * @param string module Slug of the module to check
-	 * @return <code>true</code> if the module is enabled, <code>false</code> otherwise
-	 */
-	function module_enabled( $slug ) {
-		global $edit_flow;
-
-		return isset( $edit_flow->$slug ) && $edit_flow->$slug->is_enabled();
-	}
+		/**
+		 * Returns whether the module with the given name is enabled.
+		 *
+		 * @since 0.7
+		 *
+		 * @param string module Slug of the module to check
+		 * @return <code>true</code> if the module is enabled, <code>false</code> otherwise
+		 */
+		public function module_enabled( $slug ) {
+			global $edit_flow;
 
-	/**
-	 * Gets an array of allowed post types for a module
-	 *
-	 * @return array post-type-slug => post-type-label
-	 */
-	function get_all_post_types() {
+			return isset( $edit_flow->$slug ) && $edit_flow->$slug->is_enabled();
+		}
 
-		$allowed_post_types = array(
-			'post' => __( 'Post' ),
-			'page' => __( 'Page' ),
-		);
-		$custom_post_types = $this->get_supported_post_types_for_module();
+		/**
+		 * Returns whether vip features have been enabled or not.
+		 *
+		 * @since 0.10.0
+		 *
+		 * @return true, if the module is enabled, false otherwise
+		 */
+		protected function are_vip_features_enabled() {
+			global $edit_flow;
 
-		foreach( $custom_post_types as $custom_post_type => $args ) {
-			$allowed_post_types[$custom_post_type] = $args->label;
+			return 'on' === $edit_flow->settings->module->options->vip_features;
 		}
-		return $allowed_post_types;
-	}
 
-	/**
-	 * Cleans up the 'on' and 'off' for post types on a given module (so we don't get warnings all over)
-	 * For every post type that doesn't explicitly have the 'on' value, turn it 'off'
-	 * If add_post_type_support() has been used anywhere (legacy support), inherit the state
-	 *
-	 * @param array $module_post_types Current state of post type options for the module
-	 * @param string $post_type_support What the feature is called for post_type_support (e.g. 'ef_calendar')
-	 * @return array $normalized_post_type_options The setting for each post type, normalized based on rules
-	 *
-	 * @since 0.7
-	 */
-	function clean_post_type_options( $module_post_types = array(), $post_type_support = null ) {
-		$normalized_post_type_options = array();
-		$all_post_types = array_keys( $this->get_all_post_types() );
-		foreach( $all_post_types as $post_type ) {
-			if ( ( isset( $module_post_types[$post_type] ) && $module_post_types[$post_type] == 'on' ) || post_type_supports( $post_type, $post_type_support ) )
-				$normalized_post_type_options[$post_type] = 'on';
-			else
-				$normalized_post_type_options[$post_type] = 'off';
+		/**
+		 * Returns whether vip features have been enabled or not.
+		 *
+		 * @since 0.10.0
+		 *
+		 * @return true, if the module is enabled, false otherwise
+		 */
+		protected function is_analytics_enabled() {
+			global $edit_flow;
+
+			return 'on' === $edit_flow->settings->module->options->analytics;
+		}
+
+		/**
+		 * Check if the site is a WPVIP site.
+		 *
+		 * @since 0.10.0
+		 *
+		 * @param bool $only_production Whether to only allow production sites to be considered WPVIP sites
+		 * @return true, if it is a WPVIP site, false otherwise
+		 */
+		protected function is_vip_site( $only_production = false ) {
+			$is_vip_site = defined( 'VIP_GO_ENV' )
+				&& defined( 'WPCOM_SANDBOXED' ) && constant( 'WPCOM_SANDBOXED' ) === false
+				&& defined( 'FILES_CLIENT_SITE_ID' );
+
+			if ( $only_production ) {
+				$is_vip_site = $is_vip_site && defined( 'VIP_GO_ENV' ) && 'production' === constant( 'VIP_GO_ENV' );
+			}
+
+			return $is_vip_site;
+		}
+
+		/**
+		 * Gets an array of allowed post types for a module
+		 *
+		 * @return array post-type-slug => post-type-label
+		 */
+		public function get_all_post_types() {
+
+			$allowed_post_types = array(
+				'post' => __( 'Post' ),
+				'page' => __( 'Page' ),
+			);
+			$custom_post_types = $this->get_supported_post_types_for_module();
+
+			foreach ( $custom_post_types as $custom_post_type => $args ) {
+				$allowed_post_types[ $custom_post_type ] = $args->label;
+			}
+			return $allowed_post_types;
+		}
+
+		/**
+		 * Cleans up the 'on' and 'off' for post types on a given module (so we don't get warnings all over)
+		 * For every post type that doesn't explicitly have the 'on' value, turn it 'off'
+		 * If add_post_type_support() has been used anywhere (legacy support), inherit the state
+		 *
+		 * @param array $module_post_types Current state of post type options for the module
+		 * @param string $post_type_support What the feature is called for post_type_support (e.g. 'ef_calendar')
+		 * @return array $normalized_post_type_options The setting for each post type, normalized based on rules
+		 *
+		 * @since 0.7
+		 */
+		public function clean_post_type_options( $module_post_types = array(), $post_type_support = null ) {
+			$normalized_post_type_options = array();
+			$all_post_types = array_keys( $this->get_all_post_types() );
+			foreach ( $all_post_types as $post_type ) {
+				if ( ( isset( $module_post_types[ $post_type ] ) && 'on' == $module_post_types[ $post_type ] ) || post_type_supports( $post_type, $post_type_support ) ) {
+					$normalized_post_type_options[ $post_type ] = 'on';
+				} else {
+					$normalized_post_type_options[ $post_type ] = 'off';
+				}
+			}
+			return $normalized_post_type_options;
 		}
-		return $normalized_post_type_options;
-	}
 
-	/**
-	 * Get all of the possible post types that can be used with a given module
-	 *
-	 * @param object $module The full module
-	 * @return array $post_types An array of post type objects
-	 *
-	 * @since 0.7.2
-	 */
-	function get_supported_post_types_for_module( $module = null ) {
-
-		$pt_args = array(
+		/**
+		 * Get all of the possible post types that can be used with a given module
+		 *
+		 * @param object $module The full module
+		 * @return array $post_types An array of post type objects
+		 *
+		 * @since 0.7.2
+		 */
+		public function get_supported_post_types_for_module( $module = null ) {
+
+			$pt_args = array(
 				'_builtin' => false,
 				'public' => true,
 			);
-		$pt_args = apply_filters( 'edit_flow_supported_module_post_types_args', $pt_args, $module );
-		return get_post_types( $pt_args, 'objects' );
-	}
+			$pt_args = apply_filters( 'edit_flow_supported_module_post_types_args', $pt_args, $module );
+			return get_post_types( $pt_args, 'objects' );
+		}
+
+		/**
+		 * Collect all of the active post types for a given module
+		 *
+		 * @param object $module Module's data
+		 * @return array $post_types All of the post types that are 'on'
+		 *
+		 * @since 0.7
+		 */
+		public function get_post_types_for_module( $module ) {
 
-	/**
-	 * Collect all of the active post types for a given module
-	 *
-	 * @param object $module Module's data
-	 * @return array $post_types All of the post types that are 'on'
-	 *
-	 * @since 0.7
-	 */
-	function get_post_types_for_module( $module ) {
-
-		$post_types = array();
-		if ( isset( $module->options->post_types ) && is_array( $module->options->post_types ) ) {
-			foreach( $module->options->post_types as $post_type => $value )
-				if ( 'on' == $value )
-					$post_types[] = $post_type;
+			$post_types = array();
+			if ( isset( $module->options->post_types ) && is_array( $module->options->post_types ) ) {
+				foreach ( $module->options->post_types as $post_type => $value ) {
+					if ( 'on' == $value ) {
+						$post_types[] = $post_type;
+					}
+				}
+			}
+			return $post_types;
 		}
-		return $post_types;
-	}
 
-	/**
-	 * Get all of the currently available post statuses
-	 * This should be used in favor of calling $edit_flow->custom_status->get_custom_statuses() directly
-	 *
-	 * @return array $post_statuses All of the post statuses that aren't a published state
-	 *
-	 * @since 0.7
-	 */
-	function get_post_statuses() {
-		global $edit_flow;
-
-		if ( $this->module_enabled('custom_status') ) {
-		 	return $edit_flow->custom_status->get_custom_statuses();
-		} else {
-			return $this->get_core_post_statuses();
+		/**
+		 * Get all of the currently available post statuses
+		 * This should be used in favor of calling $edit_flow->custom_status->get_custom_statuses() directly
+		 *
+		 * @return array $post_statuses All of the post statuses that aren't a published state
+		 *
+		 * @since 0.7
+		 */
+		public function get_post_statuses() {
+			global $edit_flow;
+
+			if ( $this->module_enabled( 'custom_status' ) ) {
+				return $edit_flow->custom_status->get_custom_statuses();
+			} else {
+				return $this->get_core_post_statuses();
+			}
 		}
-	}
 
-	/**
-	 * Get core's 'draft' and 'pending' post statuses, but include our special attributes
-	 *
-	 * @since 0.8.1
-	 *
-	 * @return array
-	 */
-	protected function get_core_post_statuses() {
-
-		return array(
-				(object)array(
+		/**
+		 * Get core's 'draft' and 'pending' post statuses, but include our special attributes
+		 *
+		 * @since 0.8.1
+		 *
+		 * @return array
+		 */
+		protected function get_core_post_statuses() {
+
+			return array(
+				(object) array(
 					'name'         => __( 'Draft' ),
 					'description'  => '',
 					'slug'         => 'draft',
 					'position'     => 1,
 				),
-				(object)array(
+				(object) array(
 					'name'         => __( 'Pending Review' ),
 					'description'  => '',
 					'slug'         => 'pending',
 					'position'     => 2,
 				),
 			);
-	}
-
-	/**
-	 * Gets the name of the default custom status. If custom statuses are disabled,
-	 * returns 'draft'.
-	 *
-	 * @return str Name of the status
-	 */
-	function get_default_post_status(){
+		}
 
-		// Check if custom status module is enabled
-		$custom_status_module = EditFlow()->custom_status->module->options;
+		/**
+		 * Gets the name of the default custom status. If custom statuses are disabled,
+		 * returns 'draft'.
+		 *
+		 * @return str Name of the status
+		 */
+		public function get_default_post_status() {
 
-		if( $custom_status_module->enabled == 'on' )
-			return $custom_status_module->default_status;
-		else
-			return 'draft';
+			// Check if custom status module is enabled
+			$custom_status_module = EditFlow()->custom_status->module->options;
 
-	}
+			if ( 'on' == $custom_status_module->enabled ) {
+				return $custom_status_module->default_status;
+			} else {
+				return 'draft';
+			}
+		}
 
-	/**
-	 * Filter to all posts with a given post status (can be a custom status or a built-in status) and optional custom post type.
-	 *
-	 * @since 0.7
-	 *
-	 * @param string $slug The slug for the post status to which to filter
-	 * @param string $post_type Optional post type to which to filter
-	 * @return an edit.php link to all posts with the given post status and, optionally, the given post type
-	 */
-	function filter_posts_link( $slug, $post_type = 'post' ) {
-		$filter_link = add_query_arg( 'post_status', $slug, get_admin_url( null, 'edit.php' ) );
-		if ( $post_type != 'post' && in_array( $post_type, get_post_types( '', 'names' ) ) )
-			$filter_link = add_query_arg( 'post_type', $post_type, $filter_link );
-		return $filter_link;
-	}
+		/**
+		 * Filter to all posts with a given post status (can be a custom status or a built-in status) and optional custom post type.
+		 *
+		 * @since 0.7
+		 *
+		 * @param string $slug The slug for the post status to which to filter
+		 * @param string $post_type Optional post type to which to filter
+		 * @return an edit.php link to all posts with the given post status and, optionally, the given post type
+		 */
+		public function filter_posts_link( $slug, $post_type = 'post' ) {
+			$filter_link = add_query_arg( 'post_status', $slug, get_admin_url( null, 'edit.php' ) );
+			if ( 'post' != $post_type && in_array( $post_type, get_post_types( '', 'names' ) ) ) {
+				$filter_link = add_query_arg( 'post_type', $post_type, $filter_link );
+			}
+			return $filter_link;
+		}
 
-	/**
-	 * Enqueue any resources (CSS or JS) associated with datepicker functionality
-	 *
-	 * @since 0.7
-	 */
-	function enqueue_datepicker_resources() {
+		/**
+		 * Enqueue any resources (CSS or JS) associated with datepicker functionality
+		 *
+		 * @since 0.7
+		 */
+		public function enqueue_datepicker_resources() {
 
-		wp_enqueue_script( 'jquery-ui-datepicker' );
+			wp_enqueue_script( 'jquery-ui-datepicker' );
 
-		//Timepicker needs to come after jquery-ui-datepicker and jquery
-		wp_enqueue_script( 'edit_flow-timepicker', EDIT_FLOW_URL . 'common/js/jquery-ui-timepicker-addon.js', array( 'jquery', 'jquery-ui-datepicker' ), EDIT_FLOW_VERSION, true );
-		wp_enqueue_script( 'edit_flow-date_picker', EDIT_FLOW_URL . 'common/js/ef_date.js', array( 'jquery', 'jquery-ui-datepicker', 'edit_flow-timepicker' ), EDIT_FLOW_VERSION, true );
-		wp_add_inline_script( 'edit_flow-date_picker', sprintf( 'var ef_week_first_day =  %s;', wp_json_encode( get_option( 'start_of_week' ) ) ), 'before' );
+			//Timepicker needs to come after jquery-ui-datepicker and jquery
+			wp_enqueue_script( 'edit_flow-timepicker', EDIT_FLOW_URL . 'common/js/jquery-ui-timepicker-addon.js', array( 'jquery', 'jquery-ui-datepicker' ), EDIT_FLOW_VERSION, true );
+			wp_enqueue_script( 'edit_flow-date_picker', EDIT_FLOW_URL . 'common/js/ef_date.js', array( 'jquery', 'jquery-ui-datepicker', 'edit_flow-timepicker' ), EDIT_FLOW_VERSION, true );
+			wp_add_inline_script( 'edit_flow-date_picker', sprintf( 'var ef_week_first_day =  %s;', wp_json_encode( get_option( 'start_of_week' ) ) ), 'before' );
 
-		// Now styles
-		wp_enqueue_style( 'jquery-ui-datepicker', EDIT_FLOW_URL . 'common/css/jquery.ui.datepicker.css', array( 'wp-jquery-ui-dialog' ), EDIT_FLOW_VERSION, 'screen' );
-		wp_enqueue_style( 'jquery-ui-theme', EDIT_FLOW_URL . 'common/css/jquery.ui.theme.css', false, EDIT_FLOW_VERSION, 'screen' );
-	}
+			// Now styles
+			wp_enqueue_style( 'jquery-ui-datepicker', EDIT_FLOW_URL . 'common/css/jquery.ui.datepicker.css', array( 'wp-jquery-ui-dialog' ), EDIT_FLOW_VERSION, 'screen' );
+			wp_enqueue_style( 'jquery-ui-theme', EDIT_FLOW_URL . 'common/css/jquery.ui.theme.css', false, EDIT_FLOW_VERSION, 'screen' );
+		}
 
-	/**
-	 * Checks for the current post type
-	 *
-	 * @since 0.7
-	 * @return string|null $post_type The post type we've found, or null if no post type
-	 */
-	function get_current_post_type() {
-		global $post, $typenow, $pagenow, $current_screen;
-		//get_post() needs a variable
-		$post_id = isset( $_REQUEST['post'] ) ? (int)$_REQUEST['post'] : false;
-
-		if ( $post && $post->post_type ) {
-			$post_type = $post->post_type;
-		} elseif ( $typenow ) {
-			$post_type = $typenow;
-		} elseif ( $current_screen && !empty( $current_screen->post_type ) ) {
-			$post_type = $current_screen->post_type;
-		} elseif ( isset( $_REQUEST['post_type'] ) ) {
-			$post_type = sanitize_key( $_REQUEST['post_type'] );
-		} elseif ( 'post.php' == $pagenow
+		/**
+		 * Checks for the current post type
+		 *
+		 * @since 0.7
+		 * @return string|null $post_type The post type we've found, or null if no post type
+		 */
+		public function get_current_post_type() {
+			global $post, $typenow, $pagenow, $current_screen;
+			//get_post() needs a variable
+			$post_id = isset( $_REQUEST['post'] ) ? (int) $_REQUEST['post'] : false;
+
+			if ( $post && $post->post_type ) {
+				$post_type = $post->post_type;
+			} elseif ( $typenow ) {
+				$post_type = $typenow;
+			} elseif ( $current_screen && ! empty( $current_screen->post_type ) ) {
+				$post_type = $current_screen->post_type;
+			} elseif ( isset( $_REQUEST['post_type'] ) ) {
+				$post_type = sanitize_key( $_REQUEST['post_type'] );
+			} elseif ( 'post.php' == $pagenow
 			&& $post_id
-			&& !empty( get_post( $post_id )->post_type ) ) {
-			$post_type = get_post( $post_id )->post_type;
-		} elseif ( 'edit.php' == $pagenow && empty( $_REQUEST['post_type'] ) ) {
-			$post_type = 'post';
-		} else {
-			$post_type = null;
+			&& ! empty( get_post( $post_id )->post_type ) ) {
+				$post_type = get_post( $post_id )->post_type;
+			} elseif ( 'edit.php' == $pagenow && empty( $_REQUEST['post_type'] ) ) {
+				$post_type = 'post';
+			} else {
+				$post_type = null;
+			}
+
+			return $post_type;
 		}
 
-		return $post_type;
-	}
+		/**
+		 * Wrapper for the get_user_meta() function so we can replace it if we need to
+		 *
+		 * @since 0.7
+		 *
+		 * @param int $user_id Unique ID for the user
+		 * @param string $key Key to search against
+		 * @param bool $single Whether or not to return just one value
+		 * @return string|bool|array $value Whatever the stored value was
+		 */
+		public function get_user_meta( $user_id, $key, $string = true ) {
 
-	/**
-	 * Wrapper for the get_user_meta() function so we can replace it if we need to
-	 *
-	 * @since 0.7
-	 *
-	 * @param int $user_id Unique ID for the user
-	 * @param string $key Key to search against
-	 * @param bool $single Whether or not to return just one value
-	 * @return string|bool|array $value Whatever the stored value was
-	 */
-	function get_user_meta( $user_id, $key, $string = true ) {
-
-		$response = null;
-		$response = apply_filters( 'ef_get_user_meta', $response, $user_id, $key, $string );
-		if ( !is_null( $response ) )
-			return $response;
-
-		return get_user_meta( $user_id, $key, $string );
+			$response = null;
+			$response = apply_filters( 'ef_get_user_meta', $response, $user_id, $key, $string );
+			if ( ! is_null( $response ) ) {
+				return $response;
+			}
 
-	}
+			return get_user_meta( $user_id, $key, $string );
+		}
+
+		/**
+		 * Wrapper for the update_user_meta() function so we can replace it if we need to
+		 *
+		 * @since 0.7
+		 *
+		 * @param int $user_id Unique ID for the user
+		 * @param string $key Key to search against
+		 * @param string|bool|array $value Whether or not to return just one value
+		 * @param string|bool|array $previous (optional) Previous value to replace
+		 * @return bool $success Whether we were successful in saving
+		 */
+		public function update_user_meta( $user_id, $key, $value, $previous = null ) {
 
-	/**
-	 * Wrapper for the update_user_meta() function so we can replace it if we need to
-	 *
-	 * @since 0.7
-	 *
-	 * @param int $user_id Unique ID for the user
-	 * @param string $key Key to search against
-	 * @param string|bool|array $value Whether or not to return just one value
-	 * @param string|bool|array $previous (optional) Previous value to replace
-	 * @return bool $success Whether we were successful in saving
-	 */
-	function update_user_meta( $user_id, $key, $value, $previous = null ) {
-
-		$response = null;
-		$response = apply_filters( 'ef_update_user_meta', $response, $user_id, $key, $value, $previous );
-		if ( !is_null( $response ) )
-			return $response;
-
-		return update_user_meta( $user_id, $key, $value, $previous );
+			$response = null;
+			$response = apply_filters( 'ef_update_user_meta', $response, $user_id, $key, $value, $previous );
+			if ( ! is_null( $response ) ) {
+				return $response;
+			}
 
-	}
+			return update_user_meta( $user_id, $key, $value, $previous );
+		}
 
 		/**
 		 * Take a status and a message, JSON encode and print
@@ -315,189 +365,155 @@ protected function print_ajax_response( $status, $message = '', $http_code = 200
 			exit;
 		}
 
-	/**
-	 * Whether or not the current page is a user-facing Edit Flow View
-	 * @todo Think of a creative way to make this work
-	 *
-	 * @since 0.7
-	 *
-	 * @param string $module_name (Optional) Module name to check against
-	 */
-	function is_whitelisted_functional_view( $module_name = null ) {
+		/**
+		 * Whether or not the current page is a user-facing Edit Flow View
+		 * @todo Think of a creative way to make this work
+		 *
+		 * @since 0.7
+		 *
+		 * @param string $module_name (Optional) Module name to check against
+		 */
+		public function is_whitelisted_functional_view( $module_name = null ) {
 
-		// @todo complete this method
+			// @todo complete this method
 
-		return true;
-	}
-
-	/**
-	 * Whether or not the current page is an Edit Flow settings view (either main or module)
-	 * Determination is based on $pagenow, $_GET['page'], and the module's $settings_slug
-	 * If there's no module name specified, it will return true against all Edit Flow settings views
-	 *
-	 * @since 0.7
-	 *
-	 * @param string $module_name (Optional) Module name to check against
-	 * @return bool $is_settings_view Return true if it is
-	 */
-	function is_whitelisted_settings_view( $module_name = null ) {
-		global $pagenow, $edit_flow;
-
-		// All of the settings views are based on admin.php and a $_GET['page'] parameter
-		if ( $pagenow != 'admin.php' || !isset( $_GET['page'] ) )
-			return false;
-
-		// Load all of the modules that have a settings slug/ callback for the settings page
-		foreach ( $edit_flow->modules as $mod_name => $mod_data ) {
-			if ( isset( $mod_data->options->enabled ) && $mod_data->options->enabled == 'on' && $mod_data->configure_page_cb )
-				$settings_view_slugs[] = $mod_data->settings_slug;
+			return true;
 		}
 
-		// The current page better be in the array of registered settings view slugs
-		if ( !in_array( $_GET['page'], $settings_view_slugs ) )
-			return false;
-
-		if ( $module_name && $edit_flow->modules->$module_name->settings_slug != $_GET['page'] )
-			return false;
-
-		return true;
-	}
-
-
-	/**
-	 * This is a hack, Hack, HACK!!!
-	 * Encode all of the given arguments as a serialized array, and then base64_encode
-	 * Used to store extra data in a term's description field
-	 *
-	 * @since 0.7
-	 *
-	 * @param array $args The arguments to encode
-	 * @return string Arguments encoded in base64
-	 */
-	function get_encoded_description( $args = array() ) {
-		return base64_encode( maybe_serialize( $args ) );
-	}
-
-	/**
-	 * If given an encoded string from a term's description field,
-	 * return an array of values. Otherwise, return the original string
-	 *
-	 * @since 0.7
-	 *
-	 * @param string $string_to_unencode Possibly encoded string
-	 * @return array Array if string was encoded, otherwise the string as the 'description' field
-	 */
-	function get_unencoded_description( $string_to_unencode ) {
-		return maybe_unserialize( base64_decode( $string_to_unencode ) );
-	}
-
-	/**
-	 * Get the publicly accessible URL for the module based on the filename
-	 *
-	 * @since 0.7
-	 *
-	 * @param string $filepath File path for the module
-	 * @return string $module_url Publicly accessible URL for the module
-	 */
-	function get_module_url( $file ) {
-		$module_url = plugins_url( '/', $file );
-		return trailingslashit( $module_url );
-	}
+		/**
+		 * Whether or not the current page is an Edit Flow settings view (either main or module)
+		 * Determination is based on $pagenow, $_GET['page'], and the module's $settings_slug
+		 * If there's no module name specified, it will return true against all Edit Flow settings views
+		 *
+		 * @since 0.7
+		 *
+		 * @param string $module_name (Optional) Module name to check against
+		 * @return bool $is_settings_view Return true if it is
+		 */
+		public function is_whitelisted_settings_view( $module_name = null ) {
+			global $pagenow, $edit_flow;
 
-	/**
-	 * Produce a human-readable version of the time since a timestamp
-	 *
-	 * @param int $original The UNIX timestamp we're producing a relative time for
-	 * @return string $relative_time Human-readable version of the difference between the timestamp and now
-	 */
-	function timesince( $original ) {
-		// array of time period chunks
-		$chunks = array(
-			array(60 * 60 * 24 * 365 , 'year'),
-			array(60 * 60 * 24 * 30 , 'month'),
-			array(60 * 60 * 24 * 7, 'week'),
-			array(60 * 60 * 24 , 'day'),
-			array(60 * 60 , 'hour'),
-			array(60 , 'minute'),
-			array(1 , 'second'),
-		);
+			// All of the settings views are based on admin.php and a $_GET['page'] parameter
+			if ( 'admin.php' != $pagenow || ! isset( $_GET['page'] ) ) {
+				return false;
+			}
 
-		$today = time(); /* Current unix time  */
-		$since = $today - $original;
+			// Load all of the modules that have a settings slug/ callback for the settings page
+			foreach ( $edit_flow->modules as $mod_name => $mod_data ) {
+				if ( isset( $mod_data->options->enabled ) && 'on' == $mod_data->options->enabled && $mod_data->configure_page_cb ) {
+					$settings_view_slugs[] = $mod_data->settings_slug;
+				}
+			}
 
-		if ( $since > $chunks[2][0] ) {
-			$print = date("M jS", $original);
+			// The current page better be in the array of registered settings view slugs
+			if ( ! in_array( $_GET['page'], $settings_view_slugs ) ) {
+				return false;
+			}
 
-			if( $since > $chunks[0][0] ) { // Seconds in a year
-					$print .= ", " . date( "Y", $original );
+			if ( $module_name && $edit_flow->modules->$module_name->settings_slug != $_GET['page'] ) {
+				return false;
 			}
 
-			return $print;
+			return true;
 		}
 
-		// $j saves performing the count function each time around the loop
-		for ($i = 0, $j = count($chunks); $i < $j; $i++) {
 
-			$seconds = $chunks[$i][0];
-			$name = $chunks[$i][1];
+		/**
+		 * This is a hack, Hack, HACK!!!
+		 * Encode all of the given arguments as a serialized array, and then base64_encode
+		 * Used to store extra data in a term's description field
+		 *
+		 * @since 0.7
+		 *
+		 * @param array $args The arguments to encode
+		 * @return string Arguments encoded in base64
+		 */
+		public function get_encoded_description( $args = array() ) {
+			return base64_encode( maybe_serialize( $args ) );
+		}
+
+		/**
+		 * If given an encoded string from a term's description field,
+		 * return an array of values. Otherwise, return the original string
+		 *
+		 * @since 0.7
+		 *
+		 * @param string $string_to_unencode Possibly encoded string
+		 * @return array Array if string was encoded, otherwise the string as the 'description' field
+		 */
+		public function get_unencoded_description( $string_to_unencode ) {
+			return maybe_unserialize( base64_decode( $string_to_unencode ) );
+		}
 
-			// finding the biggest chunk (if the chunk fits, break)
-			if (($count = floor($since / $seconds)) != 0) {
-				break;
-			}
+		/**
+		 * Get the publicly accessible URL for the module based on the filename
+		 *
+		 * @since 0.7
+		 *
+		 * @param string $filepath File path for the module
+		 * @return string $module_url Publicly accessible URL for the module
+		 */
+		public function get_module_url( $file ) {
+			$module_url = plugins_url( '/', $file );
+			return trailingslashit( $module_url );
 		}
 
-		return sprintf( _n( "1 $name ago", "$count {$name}s ago", $count), $count);
-	}
+		/**
+		 * Displays a list of users that can be selected!
+		 *
+		 * @since 0.7
+		 *
+		 * @todo Add pagination support for blogs with billions of users
+		 *
+		 * @param ???
+		 * @param ???
+		 */
+		public function users_select_form( $selected = null, $args = null ) {
 
-	/**
-	 * Displays a list of users that can be selected!
-	 *
-	 * @since 0.7
-	 *
-	 * @todo Add pagination support for blogs with billions of users
-	 *
-	 * @param ???
-	 * @param ???
-	 */
-	function users_select_form( $selected = null, $args = null ) {
-
-		// Set up arguments
-		$defaults = array(
-			'list_class' => 'ef-users-select-form',
-			'input_id' => 'ef-selected-users'
-		);
-		$parsed_args = wp_parse_args( $args, $defaults );
-		extract($parsed_args, EXTR_SKIP);
-
-		$args = array(
-			'capability' => 'publish_posts',
-			'fields' => array(
-				'ID',
-				'display_name',
-				'user_email'
-			),
-			'orderby' => 'display_name',
-		);
-		$args = apply_filters( 'ef_users_select_form_get_users_args', $args );
+			// Set up arguments
+			$defaults = array(
+				'list_class' => 'ef-users-select-form',
+				'input_id' => 'ef-selected-users',
+			);
+			$parsed_args = wp_parse_args( $args, $defaults );
+			extract( $parsed_args, EXTR_SKIP );
+
+			$args = array(
+				'capability' => 'publish_posts',
+				'fields' => array(
+					'ID',
+					'display_name',
+					'user_email',
+				),
+				'orderby' => 'display_name',
+			);
+			$args = apply_filters( 'ef_users_select_form_get_users_args', $args );
 
-		$users = get_users( $args );
+			$users = get_users( $args );
 
-		if ( !is_array($selected) ) $selected = array();
-		?>
+			if ( ! is_array( $selected ) ) {
+				$selected = array();
+			}
+			?>
 
-		<?php if( !empty($users) ) : ?>
-			<ul class="<?php echo esc_attr( $list_class ) ?>">
-				<?php foreach( $users as $user ) :
-					$checked = ( in_array($user->ID, $selected) ) ? 'checked="checked"' : '';
+			<?php if ( ! empty( $users ) ) : ?>
+			<ul class="<?php echo esc_attr( $list_class ); ?>">
+				<?php
+				foreach ( $users as $user ) :
+					$checked = ( in_array( $user->ID, $selected ) ) ? 'checked="checked"' : '';
 					// Add a class to checkbox of current user so we know not to add them in notified list during notifiedMessage() js function
 					$current_user_class = ( get_current_user_id() == $user->ID ) ? 'class="post_following_list-current_user" ' : '';
-				?>
+					?>
 					<li>
-						<label for="<?php echo esc_attr( $input_id .'-'. $user->ID ) ?>">
+						<label for="<?php echo esc_attr( $input_id . '-' . $user->ID ); ?>">
 							<div class="ef-user-subscribe-actions">
-								<?php do_action( 'ef_user_subscribe_actions', $user->ID, $checked ) ?>
-								<input type="checkbox" id="<?php echo esc_attr( $input_id .'-'. $user->ID ) ?>" name="<?php echo esc_attr( $input_id ) ?>[]" value="<?php echo esc_attr( $user->ID ); ?>" <?php echo $checked; echo $current_user_class; ?> />
+								<?php do_action( 'ef_user_subscribe_actions', $user->ID, $checked ); ?>
+								<input type="checkbox" id="<?php echo esc_attr( $input_id . '-' . $user->ID ); ?>" name="<?php echo esc_attr( $input_id ); ?>[]" value="<?php echo esc_attr( $user->ID ); ?>"
+																	  <?php
+																		echo esc_attr( $checked );
+																		echo esc_attr( $current_user_class );
+																		?>
+								/>
 							</div>
 
 							<span class="ef-user_displayname"><?php echo esc_html( $user->display_name ); ?></span>
@@ -507,95 +523,102 @@ function users_select_form( $selected = null, $args = null ) {
 				<?php endforeach; ?>
 			</ul>
 		<?php endif; ?>
-		<?php
-	}
+			<?php
+		}
 
-	/**
-	 * Adds an array of capabilities to a role.
-	 *
-	 * @since 0.7
-	 *
-	 * @param string $role A standard WP user role like 'administrator' or 'author'
-	 * @param array $caps One or more user caps to add
-	 */
-	function add_caps_to_role( $role, $caps ) {
-
-		// In some contexts, we don't want to add caps to roles
-		if ( apply_filters( 'ef_kill_add_caps_to_role', false, $role, $caps ) )
-			return;
-
-		global $wp_roles;
-
-		if ( $wp_roles->is_role( $role ) ) {
-			$role = get_role( $role );
-			foreach ( $caps as $cap ) {
-				$role->add_cap( $cap );
+		/**
+		 * Adds an array of capabilities to a role.
+		 *
+		 * @since 0.7
+		 *
+		 * @param string $role A standard WP user role like 'administrator' or 'author'
+		 * @param array $caps One or more user caps to add
+		 */
+		public function add_caps_to_role( $role, $caps ) {
+
+			// In some contexts, we don't want to add caps to roles
+			if ( apply_filters( 'ef_kill_add_caps_to_role', false, $role, $caps ) ) {
+				return;
+			}
+
+			global $wp_roles;
+
+			if ( $wp_roles->is_role( $role ) ) {
+				$role = get_role( $role );
+				foreach ( $caps as $cap ) {
+					$role->add_cap( $cap );
+				}
 			}
 		}
-	}
 
-	/**
-	 * Add settings help menus to our module screens if the values exist
-	 * Auto-registered in Edit_Flow::register_module()
-	 *
-	 * @since 0.7
-	 */
-	function action_settings_help_menu() {
+		/**
+		 * Add settings help menus to our module screens if the values exist
+		 * Auto-registered in Edit_Flow::register_module()
+		 *
+		 * @since 0.7
+		 */
+		public function action_settings_help_menu() {
 
-		$screen = get_current_screen();
+			$screen = get_current_screen();
 
-		if ( !method_exists( $screen, 'add_help_tab' ) )
-			return;
+			if ( ! method_exists( $screen, 'add_help_tab' ) ) {
+				return;
+			}
 
-		if ( $screen->id != 'edit-flow_page_' . $this->module->settings_slug )
-			return;
+			if ( 'edit-flow_page_' . $this->module->settings_slug != $screen->id ) {
+				return;
+			}
 
-		// Make sure we have all of the required values for our tab
-		if ( isset( $this->module->settings_help_tab['id'], $this->module->settings_help_tab['title'], $this->module->settings_help_tab['content'] ) ) {
-			$screen->add_help_tab( $this->module->settings_help_tab );
+			// Make sure we have all of the required values for our tab
+			if ( isset( $this->module->settings_help_tab['id'], $this->module->settings_help_tab['title'], $this->module->settings_help_tab['content'] ) ) {
+				$screen->add_help_tab( $this->module->settings_help_tab );
 
-			if ( isset( $this->module->settings_help_sidebar ) ) {
-				$screen->set_help_sidebar( $this->module->settings_help_sidebar );
+				if ( isset( $this->module->settings_help_sidebar ) ) {
+					$screen->set_help_sidebar( $this->module->settings_help_sidebar );
+				}
 			}
 		}
-	}
 
-	/**
-	 * Upgrade the term descriptions for all of the terms in a given taxonomy
-	 */
-	function upgrade_074_term_descriptions( $taxonomy ) {
-		$args = array(
-			'hide_empty' => false,
-		);
-		$terms = get_terms( $taxonomy, $args );
-		foreach( $terms as $term ) {
-			// If we can detect that this term already follows the new scheme, let's skip it
-			$maybe_serialized = base64_decode( $term->description );
-			if ( is_serialized( $maybe_serialized ) )
-				continue;
-
-			$description_args = array();
-			// This description has been JSON-encoded, so let's decode it
-			if ( 0 === strpos( $term->description, '{' ) ) {
-				$string_to_unencode = stripslashes( htmlspecialchars_decode( $term->description ) );
-				$unencoded_array = json_decode( $string_to_unencode, true );
-				// Only continue processing if it actually was an array. Otherwise, set to the original string
-				if ( is_array( $unencoded_array ) ) {
-					foreach( $unencoded_array as $key => $value ) {
-						// html_entity_decode only works on strings but sometimes we store nested arrays
-						if ( !is_array( $value ) )
-							$description_args[$key] = html_entity_decode( $value, ENT_QUOTES );
-						else
-							$description_args[$key] = $value;
+		/**
+		 * Upgrade the term descriptions for all of the terms in a given taxonomy
+		 */
+		public function upgrade_074_term_descriptions( $taxonomy ) {
+			$args = array(
+				'hide_empty' => false,
+			);
+			// This is migration code, so it's being left as is for now.
+			// phpcs:ignore WordPress.WP.DeprecatedParameters.Get_termsParam2Found
+			$terms = get_terms( $taxonomy, $args );
+			foreach ( $terms as $term ) {
+				// If we can detect that this term already follows the new scheme, let's skip it
+				$maybe_serialized = base64_decode( $term->description );
+				if ( is_serialized( $maybe_serialized ) ) {
+					continue;
+				}
+
+				$description_args = array();
+				// This description has been JSON-encoded, so let's decode it
+				if ( 0 === strpos( $term->description, '{' ) ) {
+					$string_to_unencode = stripslashes( htmlspecialchars_decode( $term->description ) );
+					$unencoded_array = json_decode( $string_to_unencode, true );
+					// Only continue processing if it actually was an array. Otherwise, set to the original string
+					if ( is_array( $unencoded_array ) ) {
+						foreach ( $unencoded_array as $key => $value ) {
+							// html_entity_decode only works on strings but sometimes we store nested arrays
+							if ( ! is_array( $value ) ) {
+								$description_args[ $key ] = html_entity_decode( $value, ENT_QUOTES );
+							} else {
+								$description_args[ $key ] = $value;
+							}
+						}
 					}
+				} else {
+					$description_args['description'] = $term->description;
 				}
-			} else {
-				$description_args['description'] = $term->description;
+				$new_description = $this->get_encoded_description( $description_args );
+				wp_update_term( $term->term_id, $taxonomy, array( 'description' => $new_description ) );
 			}
-			$new_description = $this->get_encoded_description( $description_args );
-			wp_update_term( $term->term_id, $taxonomy, array( 'description' => $new_description ) );
 		}
 	}
-}
 
 }
diff --git a/edit_flow.php b/edit_flow.php
index 09e50887..1f380de1 100644
--- a/edit_flow.php
+++ b/edit_flow.php
@@ -4,7 +4,7 @@
  * Plugin URI: http://editflow.org/
  * Description: Remixing the WordPress admin for better editorial workflow options.
  * Author: Daniel Bachhuber, Scott Bressler, Mohammad Jangda, Automattic, and others
- * Version: 0.9.9
+ * Version: 0.10.0
  * Requires at least: 6.0
  * Requires PHP: 8.0
  * License: GPL-3
@@ -32,7 +32,7 @@ function _ef_print_php_version_admin_notice() {
 }
 
 // Define contants
-define( 'EDIT_FLOW_VERSION', '0.9.9' );
+define( 'EDIT_FLOW_VERSION', '0.10.0' );
 define( 'EDIT_FLOW_ROOT', __DIR__ );
 define( 'EDIT_FLOW_FILE_PATH', EDIT_FLOW_ROOT . '/' . basename( __FILE__ ) );
 define( 'EDIT_FLOW_URL', plugins_url( '/', __FILE__ ) );
@@ -364,11 +364,11 @@ function get_module_by( $key, $value ) {
 		$module = false;
 		foreach ( $this->modules as $mod_name => $mod_data ) {
 
-			if ( $key == 'name' && $value == $mod_name ) {
+			if ( 'name' === $key && $value === $mod_name ) {
 				$module = $this->modules->$mod_name;
 			} else {
 				foreach ( $mod_data as $mod_data_key => $mod_data_value ) {
-					if ( $mod_data_key == $key && $mod_data_value == $value ) {
+					if ( $mod_data_key === $key && $mod_data_value === $value ) {
 						$module = $this->modules->$mod_name;
 					}
 				}
diff --git a/modules/settings/settings.php b/modules/settings/settings.php
index 133f52f3..c389ec12 100644
--- a/modules/settings/settings.php
+++ b/modules/settings/settings.php
@@ -1,377 +1,464 @@
 <?php
 
-if ( !class_exists('EF_Settings') ) {
-
-class EF_Settings extends EF_Module {
-	
-	var $module;
-	
-	/**
-	 * Register the module with Edit Flow but don't do anything else
-	 */
-	function __construct() {	
-		
-		// Register the module with Edit Flow
-		$this->module_url = $this->get_module_url( __FILE__ );
-		$args = array(
-			'title' => __( 'Edit Flow', 'edit-flow' ),
-			'short_description' => __( 'Edit Flow redefines your WordPress publishing workflow.', 'edit-flow' ),
-			'extended_description' => __( 'Enable any of the features below to take control of your workflow. Custom statuses, email notifications, editorial comments, and more help you and your team save time so everyone can focus on what matters most: the content.', 'edit-flow' ),
-			'module_url' => $this->module_url,
-			'img_url' => $this->module_url . 'lib/eflogo_s128.png',
-			'slug' => 'settings',
-			'settings_slug' => 'ef-settings',
-			'default_options' => array(
-				'enabled' => 'on',
-			),
-			'configure_page_cb' => 'print_default_settings',
-			'autoload' => true,
-		);
-		$this->module = EditFlow()->register_module( 'settings', $args );
-	}
-	
-	/**
-	 * Initialize the rest of the stuff in the class if the module is active
-	 */
-	function init() {
-		
-		add_action( 'admin_init', array( $this, 'helper_settings_validate_and_save' ), 100 );		
-		
-		add_action( 'admin_print_styles', array( $this, 'action_admin_print_styles' ) );
-		add_action( 'admin_print_scripts', array( $this, 'action_admin_print_scripts' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'action_admin_enqueue_scripts' ) );
-		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
-		
-		add_action( 'wp_ajax_change_edit_flow_module_state', array( $this, 'ajax_change_edit_flow_module_state' ) );
-		
-	}
-	
-	/**
-	 * Add necessary things to the admin menu
-	 */
-	function action_admin_menu() {
-		global $edit_flow;
-
-		$ef_logo = 'lib/eflogo_s32w.png';
-		
-		add_menu_page( $this->module->title, $this->module->title, 'manage_options', $this->module->settings_slug, array( $this, 'settings_page_controller' ), $this->module->module_url . $ef_logo ) ;
-		
-		foreach ( $edit_flow->modules as $mod_name => $mod_data ) {
-			if ( isset( $mod_data->options->enabled ) && $mod_data->options->enabled == 'on'
-				&& $mod_data->configure_page_cb && $mod_name != $this->module->name )
-				add_submenu_page( $this->module->settings_slug, $mod_data->title, $mod_data->title, 'manage_options', $mod_data->settings_slug, array( $this, 'settings_page_controller' ) ) ;
+if ( ! class_exists( 'EF_Settings' ) ) {
+
+	class EF_Settings extends EF_Module {
+
+		public $module;
+
+		/**
+		 * Register the module with Edit Flow but don't do anything else
+		 */
+		public function __construct() {
+			// Register the module with Edit Flow
+			$this->module_url = $this->get_module_url( __FILE__ );
+			$args = array(
+				'title' => __( 'Edit Flow', 'edit-flow' ),
+				'short_description' => __( 'Edit Flow redefines your WordPress publishing workflow.', 'edit-flow' ),
+				'extended_description' => __( 'Enable any of the features below to take control of your workflow. Custom statuses, email notifications, editorial comments, and more help you and your team save time so everyone can focus on what matters most: the content.', 'edit-flow' ),
+				'module_url' => $this->module_url,
+				'img_url' => $this->module_url . 'lib/eflogo_s128.png',
+				'slug' => 'settings',
+				'settings_slug' => 'ef-settings',
+				'default_options' => array(
+					'enabled' => 'on',
+					'vip_features' => $this->is_vip_site() ? 'on' : 'off',
+					'analytics' => $this->is_vip_site( true ) ? 'on' : 'off',
+				),
+				'configure_page_cb' => 'print_default_settings',
+				'autoload' => true,
+			);
+			$this->module = EditFlow()->register_module( 'settings', $args );
 		}
-	}
-	
-	function action_admin_enqueue_scripts() {
-		
-		if ( $this->is_whitelisted_settings_view() )
-			wp_enqueue_script( 'edit-flow-settings-js', $this->module_url . 'lib/settings.js', array( 'jquery' ), EDIT_FLOW_VERSION, true );
-			
-	}
-	
-	/**
-	 * Add settings styles to the settings page
-	 */
-	function action_admin_print_styles() {		
-		
-		if ( $this->is_whitelisted_settings_view() )
-			wp_enqueue_style( 'edit_flow-settings-css', $this->module_url . 'lib/settings.css', false, EDIT_FLOW_VERSION );
-		
-		
-	}
-	
-	/**
-	 * Extra data we need on the page for transitions, etc.
-	 *
-	 * @since 0.7
-	 */
-	function action_admin_print_scripts() {
-		?>
+
+		/**
+		 * Initialize the rest of the stuff in the class if the module is active
+		 */
+		public function init() {
+			add_action( 'admin_init', array( $this, 'helper_settings_validate_and_save' ), 100 );
+			add_action( 'admin_init', array( $this, 'register_settings' ) );
+
+			add_action( 'admin_print_styles', array( $this, 'action_admin_print_styles' ) );
+			add_action( 'admin_print_scripts', array( $this, 'action_admin_print_scripts' ) );
+			add_action( 'admin_enqueue_scripts', array( $this, 'action_admin_enqueue_scripts' ) );
+			add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
+
+			add_action( 'wp_ajax_change_edit_flow_module_state', array( $this, 'ajax_change_edit_flow_module_state' ) );
+		}
+
+		/**
+		 * Add necessary things to the admin menu
+		 */
+		public function action_admin_menu() {
+			global $edit_flow;
+
+			$ef_logo = 'lib/eflogo_s32w.png';
+
+			add_menu_page( $this->module->title, $this->module->title, 'manage_options', $this->module->settings_slug, array( $this, 'settings_page_controller' ), $this->module->module_url . $ef_logo );
+
+			foreach ( $edit_flow->modules as $mod_name => $mod_data ) {
+				if ( isset( $mod_data->options->enabled ) && 'on' == $mod_data->options->enabled
+				&& $mod_data->configure_page_cb && $mod_name != $this->module->name ) {
+					add_submenu_page( $this->module->settings_slug, $mod_data->title, $mod_data->title, 'manage_options', $mod_data->settings_slug, array( $this, 'settings_page_controller' ) );
+				}
+			}
+		}
+
+		public function action_admin_enqueue_scripts() {
+			if ( $this->is_whitelisted_settings_view() ) {
+				wp_enqueue_script( 'edit-flow-settings-js', $this->module_url . 'lib/settings.js', array( 'jquery' ), EDIT_FLOW_VERSION, true );
+			}
+		}
+
+		/**
+		 * Add settings styles to the settings page
+		 */
+		public function action_admin_print_styles() {
+			if ( $this->is_whitelisted_settings_view() ) {
+				wp_enqueue_style( 'edit_flow-settings-css', $this->module_url . 'lib/settings.css', false, EDIT_FLOW_VERSION );
+			}
+		}
+
+		/**
+		 * Extra data we need on the page for transitions, etc.
+		 *
+		 * @since 0.7
+		 */
+		public function action_admin_print_scripts() {
+			?>
 		<script type="text/javascript">
-			var ef_admin_url = '<?php echo get_admin_url(); ?>';
+			var ef_admin_url = '<?php echo esc_url( get_admin_url() ); ?>';
 		</script>
-		<?php
-	}
-	
-	function ajax_change_edit_flow_module_state() {
-		global $edit_flow;
-		
-		if ( !wp_verify_nonce( $_POST['change_module_nonce'], 'change-edit-flow-module-nonce' ) || !current_user_can( 'manage_options') )
-			wp_die( __( 'Cheatin&#8217; uh?' ) );
-	
-		if ( !isset( $_POST['module_action'], $_POST['slug'] ) )
-			die('-1');
-			
-		$module_action = sanitize_key( $_POST['module_action'] );
-		$slug = sanitize_key( $_POST['slug'] );
-		
-		$module = $edit_flow->get_module_by( 'slug', $slug );
-		
-		if ( !$module )
-			die('-1');
-		
-		if ( $module_action == 'enable' )
-			$return = $edit_flow->update_module_option( $module->name, 'enabled', 'on' );
-		else if ( $module_action == 'disable' )
-			$return = $edit_flow->update_module_option( $module->name, 'enabled', 'off' );
-	
-		if ( $return )
-			die('1');
-		else
-			die('-1');
-	}
-	
-	/**
-	 * Handles all settings and configuration page requests. Required element for Edit Flow
-	 */
-	function settings_page_controller() {
-		global $edit_flow;
-		
-		$requested_module = $edit_flow->get_module_by( 'settings_slug', $_GET['page'] );
-		if ( !$requested_module )
-			wp_die( __( 'Not a registered Edit Flow module', 'edit-flow' ) );
-		$configure_callback = $requested_module->configure_page_cb;
-		$requested_module_name = $requested_module->name;	
-		
-		// Don't show the settings page for the module if the module isn't activated
-		if ( !$this->module_enabled( $requested_module_name ) ) {
-			echo '<div class="message error"><p>' . sprintf( __( 'Module not enabled. Please enable it from the <a href="%1$s">Edit Flow settings page</a>.', 'edit-flow' ), EDIT_FLOW_SETTINGS_PAGE ) . '</p></div>';
-			return;
-		}	
-		
-		$this->print_default_header( $requested_module );
-		$edit_flow->$requested_module_name->$configure_callback();
-		$this->print_default_footer( $requested_module );
-		
-	}
-	
-	/**
-	 *
-	 */
-	function print_default_header( $current_module ) {
-		
-		// If there's been a message, let's display it
-		if ( isset( $_GET['message'] ) )
-			$message = $_GET['message'];
-		else if ( isset( $_REQUEST['message'] ) )
-			$message = $_REQUEST['message'];
-		else if ( isset( $_POST['message'] ) )
-			$message = $_POST['message'];
-		else
-			$message = false;
-		if ( $message && isset( $current_module->messages[$message] ) )
-			$display_text = '<span class="edit-flow-updated-message edit-flow-message">' . esc_html( $current_module->messages[$message] ) . '</span>';
-			
-		// If there's been an error, let's display it
-		if ( isset( $_GET['error'] ) )
-			$error = $_GET['error'];
-		else if ( isset( $_REQUEST['error'] ) )
-			$error = $_REQUEST['error'];
-		else if ( isset( $_POST['error'] ) )
-			$error = $_POST['error'];
-		else
-			$error = false;
-		if ( $error && isset( $current_module->messages[$error] ) )
-			$display_text = '<span class="edit-flow-error-message edit-flow-message">' . esc_html( $current_module->messages[$error] ) . '</span>';
-		
-		if ( $current_module->img_url )
-			$page_icon = '<img src="' . esc_url( $current_module->img_url ) . '" class="module-icon icon32" />';
-		else
-			$page_icon = '<div class="icon32" id="icon-options-general"><br/></div>';
-		?>
+			<?php
+		}
+
+		public function ajax_change_edit_flow_module_state() {
+			global $edit_flow;
+
+			if ( ! isset( $_POST['change_module_nonce'] ) || ! wp_verify_nonce( $_POST['change_module_nonce'], 'change-edit-flow-module-nonce' ) || ! current_user_can( 'manage_options' ) ) {
+				wp_die( esc_html__( 'Cheatin&#8217; uh?' ) );
+			}
+
+			if ( ! isset( $_POST['module_action'], $_POST['slug'] ) ) {
+				die( '-1' );
+			}
+
+			$module_action = sanitize_key( $_POST['module_action'] );
+			$slug = sanitize_key( $_POST['slug'] );
+
+			$module = $edit_flow->get_module_by( 'slug', $slug );
+
+			if ( ! $module ) {
+				die( '-1' );
+			}
+
+			if ( 'enable' == $module_action ) {
+				$return = $edit_flow->update_module_option( $module->name, 'enabled', 'on' );
+			} else if ( 'disable' == $module_action ) {
+				$return = $edit_flow->update_module_option( $module->name, 'enabled', 'off' );
+			}
+
+			if ( $return ) {
+				die( '1' );
+			} else {
+				die( '-1' );
+			}
+		}
+
+		/**
+		 * Handles all settings and configuration page requests. Required element for Edit Flow
+		 */
+		public function settings_page_controller() {
+			global $edit_flow;
+
+			$page_requested = isset( $_GET['page'] ) ? sanitize_key( $_GET['page'] ) : 'settings';
+			$requested_module = $edit_flow->get_module_by( 'settings_slug', $page_requested );
+			if ( ! $requested_module ) {
+				wp_die( esc_html__( 'Not a registered Edit Flow module', 'edit-flow' ) );
+			}
+
+			$configure_callback = $requested_module->configure_page_cb;
+			$requested_module_name = $requested_module->name;
+
+			// Don't show the settings page for the module if the module isn't activated
+			if ( ! $this->module_enabled( $requested_module_name ) ) {
+				/* translators: 1: link to the settings page for Edit Flow */
+				echo '<div class="message error"><p>' . wp_kses( sprintf( __( 'Module not enabled. Please enable it from the <a href="%1$s">Edit Flow settings page</a>.', 'edit-flow' ), esc_url( EDIT_FLOW_SETTINGS_PAGE ) ), 'a' ) . '</p></div>';
+				return;
+			}
+
+			$this->print_default_header( $requested_module );
+			$edit_flow->$requested_module_name->$configure_callback();
+			$this->print_default_footer( $requested_module );
+		}
+
+		/**
+		 * Register settings for notifications so we can partially use the Settings API
+		 * We use the Settings API for form generation, but not saving because we have our
+		 * own way of handling the data.
+		 *
+		 * @since 0.10.0
+		 */
+		public function register_settings() {
+			add_settings_section( $this->module->options_group_name . '_general', false, '__return_false', $this->module->options_group_name );
+			add_settings_field( 'analytics', __( 'Turn on analytics', 'edit-flow' ), array( $this, 'settings_analytics_option' ), $this->module->options_group_name, $this->module->options_group_name . '_general' );
+			add_settings_field( 'vip_features', __( 'Turn on WordPress VIP features', 'edit-flow' ), array( $this, 'settings_vip_features_option' ), $this->module->options_group_name, $this->module->options_group_name . '_general' );
+		}
+
+		/**
+		 * Disabling nonce verification because that is not available here, it's just rendering it. The actual save is done in helper_settings_validate_and_save and that's guarded well.
+		 * phpcs:disable:WordPress.Security.NonceVerification.Missing
+		 */
+		public function print_default_header( $current_module ) {
+			// If there's been a message, let's display it
+			if ( isset( $_GET['message'] ) ) {
+				$message = $_GET['message'];
+			} else if ( isset( $_REQUEST['message'] ) ) {
+				$message = $_REQUEST['message'];
+			} else if ( isset( $_POST['message'] ) ) {
+				$message = $_POST['message'];
+			} else {
+				$message = false;
+			}
+			if ( $message && isset( $current_module->messages[ $message ] ) ) {
+				$display_text = '<span class="edit-flow-updated-message edit-flow-message">' . esc_html( $current_module->messages[ $message ] ) . '</span>';
+			}
+
+			// If there's been an error, let's display it
+			if ( isset( $_GET['error'] ) ) {
+				$error = $_GET['error'];
+			} else if ( isset( $_REQUEST['error'] ) ) {
+				$error = $_REQUEST['error'];
+			} else if ( isset( $_POST['error'] ) ) {
+				$error = $_POST['error'];
+			} else {
+				$error = false;
+			}
+			if ( $error && isset( $current_module->messages[ $error ] ) ) {
+				$display_text = '<span class="edit-flow-error-message edit-flow-message">' . esc_html( $current_module->messages[ $error ] ) . '</span>';
+			}
+
+			if ( $current_module->img_url ) {
+				$page_icon = '<img src="' . esc_url( $current_module->img_url ) . '" class="module-icon icon32" />';
+			} else {
+				$page_icon = '<div class="icon32" id="icon-options-general"><br/></div>';
+			}
+			?>
 		<div class="wrap edit-flow-admin">
-			<?php if ( $current_module->name != 'settings' ): ?>
-			<?php echo $page_icon; ?>
-			<h2><a href="<?php echo EDIT_FLOW_SETTINGS_PAGE; ?>"><?php _e('Edit Flow', 'edit-flow') ?></a>:&nbsp;<?php echo $current_module->title; ?><?php if ( isset( $display_text ) ) { echo $display_text; } ?></h2>
-			<?php else: ?>
-			<?php echo $page_icon; ?>
-			<h2><?php _e('Edit Flow', 'edit-flow') ?><?php if ( isset( $display_text ) ) { echo $display_text; } ?></h2>
+			<?php if ( 'settings' != $current_module->name ) : ?>
+				<?php echo wp_kses_post( $page_icon ); ?>
+			<h2><a href="<?php echo esc_url( EDIT_FLOW_SETTINGS_PAGE ); ?>"><?php _e( 'Edit Flow', 'edit-flow' ); ?></a>:&nbsp;<?php echo esc_attr( $current_module->title ); ?>
+									<?php
+									if ( isset( $display_text ) ) {
+										echo wp_kses( $display_text, 'a' ); }
+									?>
+			</h2>
+			<?php else : ?>
+				<?php echo wp_kses_post( $page_icon ); ?>
+			<h2><?php _e( 'Edit Flow', 'edit-flow' ); ?>
+						  <?php
+							if ( isset( $display_text ) ) {
+								echo wp_kses( $display_text, 'a' ); }
+							?>
+			</h2>
 			<?php endif; ?>
-			
+
 			<div class="explanation">
-				<?php if ( $current_module->short_description ): ?>
-				<h3><?php echo $current_module->short_description; ?></h3>
+				<?php if ( $current_module->short_description ) : ?>
+				<h3><?php echo wp_kses( $current_module->short_description, 'a' ); ?></h3>
+				<?php endif; ?>
+				<?php if ( $current_module->extended_description ) : ?>
+				<p><?php echo wp_kses( $current_module->extended_description, 'a' ); ?></p>
 				<?php endif; ?>
-				<?php if ( $current_module->extended_description ): ?>
-				<p><?php echo $current_module->extended_description; ?></p>
-				<?php endif; ?>				
 			</div>
-		<?php
-	}
-	
-	/** 
-	 * Adds Settings page for Edit Flow.
-	 */
-	function print_default_settings() {
-		
-		?>
+			<?php
+		}
+		//phpcs:enable:WordPress.Security.NonceVerification.Missing
+
+		/**
+		 * Adds Settings page for Edit Flow.
+		 */
+		public function print_default_settings() {
+			?>
 		<div class="edit-flow-modules">
 			<?php $this->print_modules(); ?>
 		</div>
-		<?php 
-	}
-	
-	function print_default_footer( $current_module ) {
-		?>
-		<?php if ( $current_module->slug == 'settings' ): ?>
+		<form class="basic-settings" action="<?php echo esc_url( menu_page_url( $this->module->settings_slug, false ) ); ?>" method="post">
+			<?php settings_fields( $this->module->options_group_name ); ?>
+			<?php do_settings_sections( $this->module->options_group_name ); ?>
+			<?php
+				echo '<input id="edit_flow_module_name" name="edit_flow_module_name" type="hidden" value="' . esc_attr( $this->module->name ) . '" />';
+			?>
+			<p class="submit"><?php submit_button( null, 'primary', 'submit', false ); ?></p>
+		</form>
+			<?php
+		}
+
+		public function settings_vip_features_option() {
+			$options = array(
+				'off' => __( 'Disabled', 'edit-flow' ),
+				'on' => __( 'Enabled', 'edit-flow' ),
+			);
+			echo '<select id="vip_features" name="' . esc_attr( $this->module->options_group_name ) . '[vip_features]">';
+			foreach ( $options as $value => $label ) {
+				echo '<option value="' . esc_attr( $value ) . '"';
+				echo selected( $this->module->options->vip_features, $value );
+				echo '>' . esc_html( $label ) . '</option>';
+			}
+			echo '</select>';
+		}
+
+		public function settings_analytics_option() {
+			$options = array(
+				'off' => __( 'Disabled', 'edit-flow' ),
+				'on' => __( 'Enabled', 'edit-flow' ),
+			);
+			echo '<select id="analytics" name="' . esc_attr( $this->module->options_group_name ) . '[analytics]">';
+			foreach ( $options as $value => $label ) {
+				echo '<option value="' . esc_attr( $value ) . '"';
+				echo selected( $this->module->options->analytics, $value );
+				echo '>' . esc_html( $label ) . '</option>';
+			}
+			echo '</select>';
+		}
+
+		public function print_default_footer( $current_module ) {
+			?>
+			<?php if ( 'settings' == $current_module->slug ) : ?>
 		<div class="credits">
-		<p><?php echo __( '<a href="http://editflow.org/">Edit Flow</a> is produced by <a href="http://danielbachhuber.com/">Daniel Bachhuber</a>, <a href="http://digitalize.ca/">Mo Jangda</a>, and <a href="http://www.scottbressler.com/blog/">Scott Bressler</a>, with special help from <a href="http://andrewspittle.net">Andrew Spittle</a> and <a href="http://andrewwitherspoon.com/">Andrew Witherspoon</a>.', 'edit-flow' ); ?>
-		<br /><?php echo sprintf( __( 'You\'re using Edit Flow version %s.', 'edit-flow' ), EDIT_FLOW_VERSION ); ?>
-		<br /><?php echo __( 'Icons courtesy of the <a href="http://thenounproject.com/">Noun Project</a>.', 'edit-flow' ); ?>
-		<br /><?php echo __( '<a href="http://wordpress.org/tags/edit-flow?forum_id=10">Please give us your feedback, ideas, bug reports and comments</a> in the WordPress.org forums.', 'edit-flow' ); ?>
+		<p><?php echo wp_kses( __( '<a href="http://editflow.org/">Edit Flow</a> is produced by <a href="http://danielbachhuber.com/">Daniel Bachhuber</a>, <a href="http://digitalize.ca/">Mo Jangda</a>, and <a href="http://www.scottbressler.com/blog/">Scott Bressler</a>, with special help from <a href="http://andrewspittle.net">Andrew Spittle</a> and <a href="http://andrewwitherspoon.com/">Andrew Witherspoon</a>.', 'edit-flow' ), 'a' ); ?>
+				<?php /* translators: 1: installed version of Edit Flow */ ?>
+		<br /><?php echo esc_html( sprintf( __( 'You\'re using Edit Flow version %s.', 'edit-flow' ), EDIT_FLOW_VERSION ) ); ?>
+		<br /><?php echo wp_kses( __( 'Icons courtesy of the <a href="http://thenounproject.com/">Noun Project</a>.', 'edit-flow' ), 'a' ); ?>
+		<br /><?php echo wp_kses( __( '<a href="http://wordpress.org/tags/edit-flow?forum_id=10">Please give us your feedback, ideas, bug reports and comments</a> in the WordPress.org forums.', 'edit-flow' ), 'a' ); ?>
 		</div>
 		</div>
 		<?php endif; ?>
-		<?php
-	}
+			<?php
+		}
 
-	function print_modules() {
-		global $edit_flow;
+		public function print_modules() {
+			global $edit_flow;
 
-		if ( ! $edit_flow->modules_count ) {
-			echo '<div class="message error">' . __( 'There are no Edit Flow modules registered', 'edit-flow' ) . '</div>';
-		} else {
+			if ( ! $edit_flow->modules_count ) {
+				echo '<div class="message error">' . esc_html__( 'There are no Edit Flow modules registered', 'edit-flow' ) . '</div>';
+			} else {
 
-			foreach ( $edit_flow->modules as $mod_name => $mod_data ) {
-				if ( $mod_data->autoload )
-					continue;
-
-				$classes = array(
-					'edit-flow-module',
-				);
-				if ( $mod_data->options->enabled == 'on' )
-					$classes[] = 'module-enabled';
-				elseif ( $mod_data->options->enabled == 'off' )
-					$classes[] = 'module-disabled';
-				if ( $mod_data->configure_page_cb )
-					$classes[] = 'has-configure-link';
-				echo '<div class="' . implode( ' ', $classes ) . '" id="' . $mod_data->slug . '">';
-				if ( $mod_data->img_url )
-					echo '<img src="' . esc_url( $mod_data->img_url ) . '" height="24px" width="24px" class="float-right module-icon" />';
-				echo '<form method="get" action="' . get_admin_url( null, 'options.php' ) . '">';
-				echo '<h4>' . esc_html( $mod_data->title ) . '</h4>';
-				if ( 'on' == $mod_data->options->enabled )
-					echo '<p>' . wp_kses($mod_data->short_description, 'a') . '</p>';
-				else
-					echo '<p>' . strip_tags( $mod_data->short_description ) . '</p>';
-				echo '<p class="edit-flow-module-actions">';
-				if ( $mod_data->configure_page_cb ) {
-					$configure_url = add_query_arg( 'page', $mod_data->settings_slug, get_admin_url( null, 'admin.php' ) );
-					echo '<a href="' . $configure_url . '" class="configure-edit-flow-module button button-primary';
-					if ( $mod_data->options->enabled == 'off' ) echo ' hidden" style="display:none;';
-					echo '">' . $mod_data->configure_link_text . '</a>';
+				foreach ( $edit_flow->modules as $mod_name => $mod_data ) {
+					if ( $mod_data->autoload ) {
+						continue;
+					}
+
+					$classes = array(
+						'edit-flow-module',
+					);
+					if ( 'on' == $mod_data->options->enabled ) {
+						$classes[] = 'module-enabled';
+					} elseif ( 'off' == $mod_data->options->enabled ) {
+						$classes[] = 'module-disabled';
+					}
+					if ( $mod_data->configure_page_cb ) {
+						$classes[] = 'has-configure-link';
+					}
+					echo '<div class="' . esc_attr( implode( ' ', $classes ) ) . '" id="' . esc_attr( $mod_data->slug ) . '">';
+					if ( $mod_data->img_url ) {
+						echo '<img src="' . esc_url( $mod_data->img_url ) . '" height="24px" width="24px" class="float-right module-icon" />';
+					}
+					echo '<form method="get" action="' . esc_url( get_admin_url( null, 'options.php' ) ) . '">';
+					echo '<h4>' . esc_html( $mod_data->title ) . '</h4>';
+					if ( 'on' == $mod_data->options->enabled ) {
+						echo '<p>' . wp_kses( $mod_data->short_description, 'a' ) . '</p>';
+					} else {
+						echo '<p>' . esc_html( $mod_data->short_description ) . '</p>';
+					}
+					echo '<p class="edit-flow-module-actions">';
+					if ( $mod_data->configure_page_cb ) {
+						$configure_url = add_query_arg( 'page', $mod_data->settings_slug, get_admin_url( null, 'admin.php' ) );
+						echo '<a href="' . esc_url( $configure_url ) . '" class="configure-edit-flow-module button button-primary';
+						if ( 'off' == $mod_data->options->enabled ) {
+							echo ' hidden" style="display:none;';
+						}
+						// phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText
+						echo '">' . esc_html__( $mod_data->configure_link_text ) . '</a>';
+					}
+					echo '<input type="submit" class="button-primary button enable-disable-edit-flow-module"';
+					if ( 'on' == $mod_data->options->enabled ) {
+						echo ' style="display:none;"';
+					}
+					echo ' value="' . esc_textarea( __( 'Enable', 'edit-flow' ) ) . '" />';
+					echo '<input type="submit" class="button-secondary button-remove button enable-disable-edit-flow-module"';
+					if ( 'off' == $mod_data->options->enabled ) {
+						echo ' style="display:none;"';
+					}
+					echo ' value="' . esc_textarea( __( 'Disable', 'edit-flow' ) ) . '" />';
+					echo '</p>';
+					wp_nonce_field( 'change-edit-flow-module-nonce', 'change-module-nonce-' . $mod_data->slug, false );
+					echo '</form>';
+					echo '</div>';
 				}
-				echo '<input type="submit" class="button-primary button enable-disable-edit-flow-module"';
-				if ( $mod_data->options->enabled == 'on' ) echo ' style="display:none;"';	
-				echo ' value="' . __( 'Enable', 'edit-flow' ) . '" />';
-				echo '<input type="submit" class="button-secondary button-remove button enable-disable-edit-flow-module"';
-				if ( $mod_data->options->enabled == 'off' ) echo ' style="display:none;"';				
-				echo ' value="' . __( 'Disable', 'edit-flow' ) . '" />';
-				echo '</p>';
-				wp_nonce_field( 'change-edit-flow-module-nonce', 'change-module-nonce-' . $mod_data->slug, false );
-				echo '</form>';
-				echo '</div>';
 			}
-			
 		}
-		
-	}
-	
-	/**
-	 * Given a form field and a description, prints either the error associated with the field or the description.
-	 *
-	 * @since 0.7
-	 *
-	 * @param string $field The form field for which to check for an error
-	 * @param string $description Unlocalized string to display if there was no error with the given field
-	 */
-	function helper_print_error_or_description( $field, $description ) {
-		if ( isset( $_REQUEST['form-errors'][$field] ) ): ?>
+
+		/**
+		 * Given a form field and a description, prints either the error associated with the field or the description.
+		 *
+		 * @since 0.7
+		 *
+		 * @param string $field The form field for which to check for an error
+		 * @param string $description Unlocalized string to display if there was no error with the given field
+		 */
+		public function helper_print_error_or_description( $field, $description ) {
+			if ( isset( $_REQUEST['form-errors'][ $field ] ) ) :
+				?>
 			<div class="form-error">
-				<p><?php echo esc_html( $_REQUEST['form-errors'][$field] ); ?></p>	
+				<p><?php echo esc_html( $_REQUEST['form-errors'][ $field ] ); ?></p>
 			</div>
-		<?php else: ?>
+			<?php else : ?>
 			<p class="description"><?php echo esc_html( $description ); ?></p>
-		<?php endif;
-	}	
-	
-	/**
-	 * Generate an option field to turn post type support on/off for a given module
-	 *
-	 * @param object $module Edit Flow module we're generating the option field for
-	 * @param {missing}
-	 *
-	 * @since 0.7
-	 */
-	function helper_option_custom_post_type( $module, $args = array() ) {
-		
-		$all_post_types = array(
-			'post' => __( 'Posts' ),
-			'page' => __( 'Pages' ),
-		);
-		$custom_post_types = $this->get_supported_post_types_for_module();
-		if ( count( $custom_post_types ) ) {
-			foreach( $custom_post_types as $custom_post_type => $args ) {
-				$all_post_types[$custom_post_type] = $args->label;
-			}
+				<?php
+		endif;
 		}
 
-		foreach( $all_post_types as $post_type => $title ) {
-			echo '<label for="' . esc_attr( $post_type ) . '">';
-			echo '<input id="' . esc_attr( $post_type ) . '" name="'
-				. $module->options_group_name . '[post_types][' . esc_attr( $post_type ) . ']"';
-			if ( isset( $module->options->post_types[$post_type] ) ) 
-				checked( $module->options->post_types[$post_type], 'on' );
-			// Defining post_type_supports in the functions.php file or similar should disable the checkbox
-			disabled( post_type_supports( $post_type, $module->post_type_support ), true );
-			echo ' type="checkbox" />&nbsp;&nbsp;&nbsp;' . esc_html( $title ) . '</label>';
-			// Leave a note to the admin as a reminder that add_post_type_support has been used somewhere in their code
-			if ( post_type_supports( $post_type, $module->post_type_support ) )
-				echo '&nbsp&nbsp;&nbsp;<span class="description">' . sprintf( __( 'Disabled because add_post_type_support( \'%1$s\', \'%2$s\' ) is included in a loaded file.', 'edit-flow' ), $post_type, $module->post_type_support ) . '</span>';
-			echo '<br />';
+		/**
+		 * Generate an option field to turn post type support on/off for a given module
+		 *
+		 * @param object $module Edit Flow module we're generating the option field for
+		 * @param {missing}
+		 *
+		 * @since 0.7
+		 */
+		public function helper_option_custom_post_type( $module, $args = array() ) {
+
+			$all_post_types = array(
+				'post' => __( 'Posts' ),
+				'page' => __( 'Pages' ),
+			);
+			$custom_post_types = $this->get_supported_post_types_for_module();
+			if ( count( $custom_post_types ) ) {
+				foreach ( $custom_post_types as $custom_post_type => $args ) {
+					$all_post_types[ $custom_post_type ] = $args->label;
+				}
+			}
+
+			foreach ( $all_post_types as $post_type => $title ) {
+				echo '<label for="' . esc_attr( $post_type ) . '">';
+				echo '<input id="' . esc_attr( $post_type ) . '" name="'
+				. esc_attr( $module->options_group_name ) . '[post_types][' . esc_attr( $post_type ) . ']"';
+				if ( isset( $module->options->post_types[ $post_type ] ) ) {
+					checked( $module->options->post_types[ $post_type ], 'on' );
+				}
+				// Defining post_type_supports in the functions.php file or similar should disable the checkbox
+				disabled( post_type_supports( $post_type, $module->post_type_support ), true );
+				echo ' type="checkbox" />&nbsp;&nbsp;&nbsp;' . esc_html( $title ) . '</label>';
+				// Leave a note to the admin as a reminder that add_post_type_support has been used somewhere in their code
+				if ( post_type_supports( $post_type, $module->post_type_support ) ) {
+					/* translators: 1: post type, 2: post type support */
+					echo '&nbsp&nbsp;&nbsp;<span class="description">' . esc_html( sprintf( __( 'Disabled because add_post_type_support( \'%1$s\', \'%2$s\' ) is included in a loaded file.', 'edit-flow' ), $post_type, $module->post_type_support ) ) . '</span>';
+				}
+				echo '<br />';
+			}
 		}
-		
-	}
-	
-	/**
-	 * Validation and sanitization on the settings field
-	 * This method is called automatically/ doesn't need to be registered anywhere
-	 *
-	 * @since 0.7	
-	 */
-	function helper_settings_validate_and_save() {
-					
-		if ( !isset( $_POST['action'], $_POST['_wpnonce'], $_POST['option_page'], $_POST['_wp_http_referer'], $_POST['edit_flow_module_name'], $_POST['submit'] ) || !is_admin() )
-			return false;
-			
-		global $edit_flow;			
-		$module_name = sanitize_key( $_POST['edit_flow_module_name'] );
-				
-		if ( $_POST['action'] != 'update' 
-			|| $_POST['option_page'] != $edit_flow->$module_name->module->options_group_name )
-			return false;
-		
-		if ( !current_user_can( 'manage_options' ) || !wp_verify_nonce( $_POST['_wpnonce'], $edit_flow->$module_name->module->options_group_name . '-options' ) )
-			wp_die( __( 'Cheatin&#8217; uh?' ) );			
-	
-		$new_options = ( isset( $_POST[$edit_flow->$module_name->module->options_group_name] ) ) ? $_POST[$edit_flow->$module_name->module->options_group_name] : array();
-
-		// Only call the validation callback if it exists?
-		if ( method_exists( $edit_flow->$module_name, 'settings_validate' ) )
-			$new_options = $edit_flow->$module_name->settings_validate( $new_options );
-		
-		// Cast our object and save the data.
-		$new_options = (object)array_merge( (array)$edit_flow->$module_name->module->options, $new_options );
-		$edit_flow->update_all_module_options( $edit_flow->$module_name->module->name, $new_options );
-		
-		// Redirect back to the settings page that was submitted without any previous messages
-		$goback = add_query_arg( 'message', 'settings-updated',  remove_query_arg( array( 'message'), wp_get_referer() ) );
-		wp_safe_redirect( $goback );
-		exit;	
 
+		/**
+		 * Validation and sanitization on the settings field
+		 * This method is called automatically/ doesn't need to be registered anywhere
+		 *
+		 * @since 0.7
+		 */
+		public function helper_settings_validate_and_save() {
+
+			if ( ! isset( $_POST['action'], $_POST['_wpnonce'], $_POST['option_page'], $_POST['_wp_http_referer'], $_POST['edit_flow_module_name'], $_POST['submit'] ) || ! is_admin() ) {
+				return false;
+			}
+
+			global $edit_flow;
+			$module_name = sanitize_key( $_POST['edit_flow_module_name'] );
+
+			if ( 'update' != $_POST['action']
+			|| $_POST['option_page'] != $edit_flow->$module_name->module->options_group_name ) {
+				return false;
+			}
+
+			if ( ! current_user_can( 'manage_options' ) || ! wp_verify_nonce( $_POST['_wpnonce'], $edit_flow->$module_name->module->options_group_name . '-options' ) ) {
+				wp_die( esc_html__( 'Cheatin&#8217; uh?' ) );
+			}
+
+			$new_options = ( isset( $_POST[ $edit_flow->$module_name->module->options_group_name ] ) ) ? $_POST[ $edit_flow->$module_name->module->options_group_name ] : array();
+
+			// Only call the validation callback if it exists?
+			if ( method_exists( $edit_flow->$module_name, 'settings_validate' ) ) {
+				$new_options = $edit_flow->$module_name->settings_validate( $new_options );
+			}
+
+			// Cast our object and save the data.
+			$new_options = (object) array_merge( (array) $edit_flow->$module_name->module->options, $new_options );
+			$edit_flow->update_all_module_options( $edit_flow->$module_name->module->name, $new_options );
+
+			// Redirect back to the settings page that was submitted without any previous messages
+			$goback = add_query_arg( 'message', 'settings-updated', remove_query_arg( array( 'message' ), wp_get_referer() ) );
+			wp_safe_redirect( $goback );
+			exit;
+		}
 	}
-	
-}
 
 }
diff --git a/package.json b/package.json
index 5b6760dd..1a1113a7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "edit-flow",
-  "version": "2.0.0",
+  "version": "0.10.0",
   "description": "Edit Flow",
   "main": "dist/index.js",
   "directories": {