diff --git a/.github/workflows/plugin-tests.yml b/.github/workflows/plugin-tests.yml
index 4b272042..f58f1b64 100644
--- a/.github/workflows/plugin-tests.yml
+++ b/.github/workflows/plugin-tests.yml
@@ -8,7 +8,7 @@ on:
   pull_request:
 
 concurrency:
-  group: plugin-tests-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
+  group: tests-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.rubocop.yml b/.rubocop.yml
index d46296cf..69fcfc56 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,2 +1,8 @@
 inherit_gem:
   rubocop-discourse: default.yml
+
+RSpec/ContextWording:
+  Enabled: false
+
+RSpec/DescribeClass:
+  Enabled: false
diff --git a/app/controllers/custom_wizard/admin/admin.rb b/app/controllers/custom_wizard/admin/admin.rb
index c99954d6..867be56c 100644
--- a/app/controllers/custom_wizard/admin/admin.rb
+++ b/app/controllers/custom_wizard/admin/admin.rb
@@ -3,6 +3,13 @@ class CustomWizard::AdminController < ::Admin::AdminController
   before_action :ensure_admin
 
   def index
+    subcription = CustomWizard::Subscription.new
+    render_json_dump(
+      subscribed: subcription.subscribed?,
+      subscription_type: subcription.type,
+      subscription_attributes: CustomWizard::Subscription.attributes,
+      subscription_client_installed: subcription.client_installed?
+    )
   end
 
   private
diff --git a/app/controllers/custom_wizard/admin/custom_fields.rb b/app/controllers/custom_wizard/admin/custom_fields.rb
index c52759c9..111e9faf 100644
--- a/app/controllers/custom_wizard/admin/custom_fields.rb
+++ b/app/controllers/custom_wizard/admin/custom_fields.rb
@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 class CustomWizard::AdminCustomFieldsController < CustomWizard::AdminController
   def index
-    render_json_dump(custom_field_list)
+    render_json_dump(
+      custom_fields: custom_field_list
+    )
   end
 
   def update
diff --git a/app/controllers/custom_wizard/admin/logs.rb b/app/controllers/custom_wizard/admin/logs.rb
index 976814f8..7ca37bb2 100644
--- a/app/controllers/custom_wizard/admin/logs.rb
+++ b/app/controllers/custom_wizard/admin/logs.rb
@@ -1,9 +1,44 @@
 # frozen_string_literal: true
 class CustomWizard::AdminLogsController < CustomWizard::AdminController
+  before_action :find_wizard, except: [:index]
+
   def index
-    render_serialized(
-      CustomWizard::Log.list(params[:page].to_i, params[:limit].to_i),
-      CustomWizard::LogSerializer
+    render json: ActiveModel::ArraySerializer.new(
+      CustomWizard::Wizard.list(current_user),
+      each_serializer: CustomWizard::BasicWizardSerializer
     )
   end
+
+  def show
+    render_json_dump(
+      wizard: CustomWizard::BasicWizardSerializer.new(@wizard, root: false),
+      logs: ActiveModel::ArraySerializer.new(
+        log_list.logs,
+        each_serializer: CustomWizard::LogSerializer
+      ),
+      total: log_list.total
+    )
+  end
+
+  protected
+
+  def log_list
+    @log_list ||= begin
+      list = CustomWizard::Log.list(params[:page].to_i, params[:limit].to_i, params[:wizard_id])
+
+      if list.logs.any? && (usernames = list.logs.map(&:username)).present?
+        user_map = User.where(username: usernames)
+          .reduce({}) do |result, user|
+            result[user.username] = user
+            result
+          end
+
+        list.logs.each do |log_item|
+          log_item.user = user_map[log_item.username]
+        end
+      end
+
+      list
+    end
+  end
 end
diff --git a/app/controllers/custom_wizard/admin/submissions.rb b/app/controllers/custom_wizard/admin/submissions.rb
index 4cb2a0e4..c3bf809f 100644
--- a/app/controllers/custom_wizard/admin/submissions.rb
+++ b/app/controllers/custom_wizard/admin/submissions.rb
@@ -13,12 +13,16 @@ class CustomWizard::AdminSubmissionsController < CustomWizard::AdminController
   def show
     render_json_dump(
       wizard: CustomWizard::BasicWizardSerializer.new(@wizard, root: false),
-      submissions: ActiveModel::ArraySerializer.new(ordered_submissions, each_serializer: CustomWizard::SubmissionSerializer)
+      submissions: ActiveModel::ArraySerializer.new(
+        submission_list.submissions,
+        each_serializer: CustomWizard::SubmissionSerializer
+      ),
+      total: submission_list.total
     )
   end
 
   def download
-    send_data ordered_submissions.to_json,
+    send_data submission_list.submissions.to_json,
       filename: "#{Discourse.current_hostname}-wizard-submissions-#{@wizard.name}.json",
       content_type: "application/json",
       disposition: "attachment"
@@ -26,7 +30,7 @@ class CustomWizard::AdminSubmissionsController < CustomWizard::AdminController
 
   protected
 
-  def ordered_submissions
-    CustomWizard::Submission.list(@wizard, order_by: 'id')
+  def submission_list
+    CustomWizard::Submission.list(@wizard, page: params[:page].to_i)
   end
 end
diff --git a/app/jobs/refresh_api_access_token.rb b/app/jobs/regular/refresh_api_access_token.rb
similarity index 100%
rename from app/jobs/refresh_api_access_token.rb
rename to app/jobs/regular/refresh_api_access_token.rb
diff --git a/app/jobs/set_after_time_wizard.rb b/app/jobs/regular/set_after_time_wizard.rb
similarity index 100%
rename from app/jobs/set_after_time_wizard.rb
rename to app/jobs/regular/set_after_time_wizard.rb
diff --git a/app/serializers/custom_wizard/log_serializer.rb b/app/serializers/custom_wizard/log_serializer.rb
index e521c573..56c5fd8f 100644
--- a/app/serializers/custom_wizard/log_serializer.rb
+++ b/app/serializers/custom_wizard/log_serializer.rb
@@ -1,4 +1,10 @@
 # frozen_string_literal: true
+
 class CustomWizard::LogSerializer < ApplicationSerializer
-  attributes :message, :date
+  attributes :date,
+             :action,
+             :username,
+             :message
+
+  has_one :user, serializer: ::BasicUserSerializer, embed: :objects
 end
diff --git a/app/serializers/custom_wizard/submission_serializer.rb b/app/serializers/custom_wizard/submission_serializer.rb
index 52f0cb32..732d6743 100644
--- a/app/serializers/custom_wizard/submission_serializer.rb
+++ b/app/serializers/custom_wizard/submission_serializer.rb
@@ -1,16 +1,32 @@
 # frozen_string_literal: true
 class CustomWizard::SubmissionSerializer < ApplicationSerializer
   attributes :id,
-             :username,
              :fields,
-             :submitted_at,
-             :route_to,
-             :redirect_on_complete,
-             :redirect_to
+             :submitted_at
 
-  def username
-    object.user.present? ?
-    object.user.username :
-    I18n.t('admin.wizard.submission.no_user', user_id: object.user_id)
+  has_one :user, serializer: ::BasicUserSerializer, embed: :objects
+
+  def include_user?
+    object.user.present?
+  end
+
+  def fields
+    @fields ||= begin
+      result = {}
+
+     object.wizard.template['steps'].each do |step|
+       step['fields'].each do |field|
+         if value = object.fields[field['id']]
+           result[field['id']] = {
+             value: value,
+             type: field['type'],
+             label: field['label']
+           }
+         end
+       end
+     end
+
+     result
+    end
   end
 end
diff --git a/app/serializers/custom_wizard/wizard_field_serializer.rb b/app/serializers/custom_wizard/wizard_field_serializer.rb
index 70784f7f..d5f57060 100644
--- a/app/serializers/custom_wizard/wizard_field_serializer.rb
+++ b/app/serializers/custom_wizard/wizard_field_serializer.rb
@@ -42,13 +42,8 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
     object.value
   end
 
-  def i18n_key
-    @i18n_key ||= "wizard.step.#{object.step.id}.fields.#{object.id}".underscore
-  end
-
   def label
-    return object.label if object.label.present?
-    I18n.t("#{object.key || i18n_key}.label", default: '')
+    I18n.t("#{i18n_key}.label", default: object.label, base_url: Discourse.base_url)
   end
 
   def include_label?
@@ -56,14 +51,21 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
   end
 
   def description
-    return object.description if object.description.present?
-    I18n.t("#{object.key || i18n_key}.description", default: '', base_url: Discourse.base_url)
+    I18n.t("#{i18n_key}.description", default: object.description, base_url: Discourse.base_url)
   end
 
   def include_description?
     description.present?
   end
 
+  def placeholder
+    I18n.t("#{i18n_key}.placeholder", default: object.placeholder)
+  end
+
+  def include_placeholder?
+    placeholder.present?
+  end
+
   def image
     object.image
   end
@@ -72,15 +74,6 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
     object.image.present?
   end
 
-  def placeholder
-    return object.placeholder if object.placeholder.present?
-    I18n.t("#{object.key || i18n_key}.placeholder", default: '')
-  end
-
-  def include_placeholder?
-    placeholder.present?
-  end
-
   def file_types
     object.file_types
   end
@@ -127,4 +120,14 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
   def preview_template
     object.preview_template
   end
+
+  protected
+
+  def i18n_key
+    @i18n_key ||= "#{object.step.wizard.id}.#{object.step.id}.#{object.id}".underscore
+  end
+
+  def subscribed?
+    @subscribed ||= CustomWizard::Subscription.subscribed?
+  end
 end
diff --git a/app/serializers/custom_wizard/wizard_step_serializer.rb b/app/serializers/custom_wizard/wizard_step_serializer.rb
index 85f527bb..a2a314a4 100644
--- a/app/serializers/custom_wizard/wizard_step_serializer.rb
+++ b/app/serializers/custom_wizard/wizard_step_serializer.rb
@@ -39,13 +39,8 @@ class CustomWizard::StepSerializer < ::ApplicationSerializer
     object.previous.present?
   end
 
-  def i18n_key
-    @i18n_key ||= "wizard.step.#{object.id}".underscore
-  end
-
   def title
-    return PrettyText.cook(object.title) if object.title
-    PrettyText.cook(I18n.t("#{object.key || i18n_key}.title", default: ''))
+    I18n.t("#{i18n_key}.title", default: object.title, base_url: Discourse.base_url)
   end
 
   def include_title?
@@ -53,8 +48,7 @@ class CustomWizard::StepSerializer < ::ApplicationSerializer
   end
 
   def description
-    return object.description if object.description
-    PrettyText.cook(I18n.t("#{object.key || i18n_key}.description", default: '', base_url: Discourse.base_url))
+    I18n.t("#{i18n_key}.description", default: object.description, base_url: Discourse.base_url)
   end
 
   def include_description?
@@ -80,4 +74,10 @@ class CustomWizard::StepSerializer < ::ApplicationSerializer
   def final
     object.final?
   end
+
+  protected
+
+  def i18n_key
+    @i18n_key ||= "#{object.wizard.id}.#{object.id}".underscore
+  end
 end
diff --git a/app/views/layouts/qunit.html.erb b/app/views/layouts/qunit.html.erb
new file mode 100644
index 00000000..c2f5fb5e
--- /dev/null
+++ b/app/views/layouts/qunit.html.erb
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Custom Wizard QUnit Test Runner</title>
+    <%= discourse_stylesheet_link_tag(:test_helper, theme_id: nil) %>
+    <%= discourse_stylesheet_link_tag :wizard, theme_id: nil %>
+    <%= discourse_stylesheet_link_tag :wizard_custom %>
+    <%= preload_script "locales/en" %>
+    <%= preload_script "ember_jquery" %>
+    <%= preload_script "wizard-vendor" %>
+    <%= preload_script "wizard-custom" %>
+    <%= preload_script "wizard-raw-templates" %>
+    <%= preload_script "wizard-plugin" %>
+    <%= preload_script "pretty-text-bundle" %>
+    <%= preload_script "wizard-qunit" %>
+    <%= csrf_meta_tags %>
+
+    <script src="<%= ExtraLocalesController.url("wizard") %>"></script>
+
+    <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
+    <meta name="discourse_theme_id" content="">
+    <meta name="discourse-base-uri" content="<%= Discourse.base_path %>">
+  </head>
+  <body class="custom-wizard">
+    <div id="qunit"></div>
+    <div id="qunit-fixture"></div>
+  </body>
+</html>
diff --git a/assets/javascripts/discourse/components/custom-field-input.js.es6 b/assets/javascripts/discourse/components/custom-field-input.js.es6
index e49c6f1d..5d2d6c3b 100644
--- a/assets/javascripts/discourse/components/custom-field-input.js.es6
+++ b/assets/javascripts/discourse/components/custom-field-input.js.es6
@@ -3,27 +3,12 @@ import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { alias, equal, or } from "@ember/object/computed";
 import I18n from "I18n";
 
-const generateContent = function (array, type) {
-  return array.map((key) => ({
-    id: key,
-    name: I18n.t(`admin.wizard.custom_field.${type}.${key}`),
-  }));
-};
-
 export default Component.extend({
   tagName: "tr",
   topicSerializers: ["topic_view", "topic_list_item"],
   postSerializers: ["post"],
   groupSerializers: ["basic_group"],
   categorySerializers: ["basic_category"],
-  klassContent: generateContent(
-    ["topic", "post", "group", "category"],
-    "klass"
-  ),
-  typeContent: generateContent(
-    ["string", "boolean", "integer", "json"],
-    "type"
-  ),
   showInputs: or("field.new", "field.edit"),
   classNames: ["custom-field-input"],
   loading: or("saving", "destroying"),
@@ -40,9 +25,13 @@ export default Component.extend({
     const serializers = this.get(`${klass}Serializers`);
 
     if (serializers) {
-      return generateContent(serializers, "serializers");
-    } else {
-      return [];
+      return serializers.reduce((result, key) => {
+        result.push({
+          id: key,
+          name: I18n.t(`admin.wizard.custom_field.serializers.${key}`),
+        });
+        return result;
+      }, []);
     }
   },
 
diff --git a/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6 b/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6
deleted file mode 100644
index c6e1fd9c..00000000
--- a/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6
+++ /dev/null
@@ -1,21 +0,0 @@
-import { default as discourseComputed } from "discourse-common/utils/decorators";
-import Component from "@ember/component";
-
-export default Component.extend({
-  classNames: "wizard-advanced-toggle",
-
-  @discourseComputed("showAdvanced")
-  toggleClass(showAdvanced) {
-    let classes = "btn";
-    if (showAdvanced) {
-      classes += " btn-primary";
-    }
-    return classes;
-  },
-
-  actions: {
-    toggleAdvanced() {
-      this.toggleProperty("showAdvanced");
-    },
-  },
-});
diff --git a/assets/javascripts/discourse/components/wizard-custom-action.js.es6 b/assets/javascripts/discourse/components/wizard-custom-action.js.es6
index 83baafc7..48dfef48 100644
--- a/assets/javascripts/discourse/components/wizard-custom-action.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-action.js.es6
@@ -1,8 +1,8 @@
 import { default as discourseComputed } from "discourse-common/utils/decorators";
-import { and, empty, equal, or } from "@ember/object/computed";
+import { subscriptionSelectKitContent } from "discourse/plugins/discourse-custom-wizard/discourse/lib/wizard-subscription";
+import { empty, equal, or } from "@ember/object/computed";
 import { notificationLevels, selectKitContent } from "../lib/wizard";
 import { computed } from "@ember/object";
-import wizardSchema from "../lib/wizard-schema";
 import UndoChanges from "../mixins/undo-changes";
 import Component from "@ember/component";
 import I18n from "I18n";
@@ -25,8 +25,6 @@ export default Component.extend(UndoChanges, {
   createGroup: equal("action.type", "create_group"),
   apiEmpty: empty("action.api"),
   groupPropertyTypes: selectKitContent(["id", "name"]),
-  hasAdvanced: or("hasCustomFields", "routeTo"),
-  showAdvanced: and("hasAdvanced", "action.type"),
   hasCustomFields: or(
     "basicTopicFields",
     "updateProfile",
@@ -36,12 +34,6 @@ export default Component.extend(UndoChanges, {
   basicTopicFields: or("createTopic", "sendMessage", "openComposer"),
   publicTopicFields: or("createTopic", "openComposer"),
   showPostAdvanced: or("createTopic", "sendMessage"),
-  actionTypes: Object.keys(wizardSchema.action.types).map((type) => {
-    return {
-      id: type,
-      name: I18n.t(`admin.wizard.action.${type}.label`),
-    };
-  }),
   availableNotificationLevels: notificationLevels.map((type) => {
     return {
       id: type,
@@ -102,6 +94,11 @@ export default Component.extend(UndoChanges, {
     return apis.find((a) => a.name === api).endpoints;
   },
 
+  @discourseComputed
+  actionTypes() {
+    return subscriptionSelectKitContent("action", "types");
+  },
+
   @discourseComputed("fieldTypes")
   hasEventsField(fieldTypes) {
     return fieldTypes.map((ft) => ft.id).includes("event");
diff --git a/assets/javascripts/discourse/components/wizard-custom-field.js.es6 b/assets/javascripts/discourse/components/wizard-custom-field.js.es6
index 31c8dc66..ed66012a 100644
--- a/assets/javascripts/discourse/components/wizard-custom-field.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-field.js.es6
@@ -1,5 +1,5 @@
 import { default as discourseComputed } from "discourse-common/utils/decorators";
-import { alias, equal, or } from "@ember/object/computed";
+import { equal, or } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import { selectKitContent } from "../lib/wizard";
 import UndoChanges from "../mixins/undo-changes";
@@ -27,7 +27,6 @@ export default Component.extend(UndoChanges, {
   isTextType: or("isText", "isTextarea", "isComposer"),
   isComposerPreview: equal("field.type", "composer_preview"),
   categoryPropertyTypes: selectKitContent(["id", "slug"]),
-  showAdvanced: alias("field.type"),
   messageUrl: "https://discourse.pluginmanager.org/t/field-settings",
 
   @discourseComputed("field.type")
diff --git a/assets/javascripts/discourse/components/wizard-message.js.es6 b/assets/javascripts/discourse/components/wizard-message.js.es6
index b273e78b..686a7254 100644
--- a/assets/javascripts/discourse/components/wizard-message.js.es6
+++ b/assets/javascripts/discourse/components/wizard-message.js.es6
@@ -6,6 +6,7 @@ import I18n from "I18n";
 const icons = {
   error: "times-circle",
   success: "check-circle",
+  warn: "exclamation-circle",
   info: "info-circle",
 };
 
diff --git a/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6 b/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6
index 8332b86e..b1d8a0f5 100644
--- a/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6
+++ b/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6
@@ -6,7 +6,8 @@ import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "I18n";
 
 export default Component.extend({
-  classNames: ["realtime-validations"],
+  classNames: ["realtime-validations", "setting", "full", "subscription"],
+
   @discourseComputed
   timeUnits() {
     return ["days", "weeks", "months", "years"].map((unit) => {
diff --git a/assets/javascripts/discourse/components/wizard-subscription-badge.js.es6 b/assets/javascripts/discourse/components/wizard-subscription-badge.js.es6
new file mode 100644
index 00000000..301c618e
--- /dev/null
+++ b/assets/javascripts/discourse/components/wizard-subscription-badge.js.es6
@@ -0,0 +1,30 @@
+import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import Subscription from "../mixins/subscription";
+import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+
+export default Component.extend(Subscription, {
+  tagName: "a",
+  classNameBindings: [":wizard-subscription-badge", "subscriptionType"],
+  attributeBindings: ["title"],
+
+  @discourseComputed("subscriptionType")
+  i18nKey(type) {
+    return `admin.wizard.subscription.type.${type ? type : "none"}`;
+  },
+
+  @discourseComputed("i18nKey")
+  title(i18nKey) {
+    return I18n.t(`${i18nKey}.title`);
+  },
+
+  @discourseComputed("i18nKey")
+  label(i18nKey) {
+    return I18n.t(`${i18nKey}.label`);
+  },
+
+  click() {
+    DiscourseURL.routeTo(this.subscriptionLink);
+  },
+});
diff --git a/assets/javascripts/discourse/components/wizard-subscription-container.js.es6 b/assets/javascripts/discourse/components/wizard-subscription-container.js.es6
new file mode 100644
index 00000000..5cc6b17c
--- /dev/null
+++ b/assets/javascripts/discourse/components/wizard-subscription-container.js.es6
@@ -0,0 +1,26 @@
+import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import Subscription from "../mixins/subscription";
+
+export default Component.extend(Subscription, {
+  classNameBindings: [":wizard-subscription-container", "subscribed"],
+
+  @discourseComputed("subscribed")
+  subscribedIcon(subscribed) {
+    return subscribed ? "check" : "dash";
+  },
+
+  @discourseComputed("subscribed")
+  subscribedLabel(subscribed) {
+    return `admin.wizard.subscription.${
+      subscribed ? "subscribed" : "not_subscribed"
+    }.label`;
+  },
+
+  @discourseComputed("subscribed")
+  subscribedTitle(subscribed) {
+    return `admin.wizard.subscription.${
+      subscribed ? "subscribed" : "not_subscribed"
+    }.title`;
+  },
+});
diff --git a/assets/javascripts/discourse/components/wizard-subscription-cta.js.es6 b/assets/javascripts/discourse/components/wizard-subscription-cta.js.es6
new file mode 100644
index 00000000..f483fbe8
--- /dev/null
+++ b/assets/javascripts/discourse/components/wizard-subscription-cta.js.es6
@@ -0,0 +1,36 @@
+import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import Subscription from "../mixins/subscription";
+import I18n from "I18n";
+
+export default Component.extend(Subscription, {
+  tagName: "a",
+  classNameBindings: [":btn", ":btn-pavilion-support", "subscriptionType"],
+  attributeBindings: ["title"],
+
+  @discourseComputed("subscribed")
+  i18nKey(subscribed) {
+    return `admin.wizard.subscription.cta.${
+      subscribed ? "subscribed" : "none"
+    }`;
+  },
+
+  @discourseComputed("subscribed")
+  icon(subscribed) {
+    return subscribed ? "far-life-ring" : "external-link-alt";
+  },
+
+  @discourseComputed("i18nKey")
+  title(i18nKey) {
+    return I18n.t(`${i18nKey}.title`);
+  },
+
+  @discourseComputed("i18nKey")
+  label(i18nKey) {
+    return I18n.t(`${i18nKey}.label`);
+  },
+
+  click() {
+    window.open(this.subscriptionCtaLink, "_blank").focus();
+  },
+});
diff --git a/assets/javascripts/discourse/components/wizard-subscription-selector.js.es6 b/assets/javascripts/discourse/components/wizard-subscription-selector.js.es6
new file mode 100644
index 00000000..53f7d19c
--- /dev/null
+++ b/assets/javascripts/discourse/components/wizard-subscription-selector.js.es6
@@ -0,0 +1,96 @@
+import SingleSelectComponent from "select-kit/components/single-select";
+import Subscription from "../mixins/subscription";
+import wizardSchema from "discourse/plugins/discourse-custom-wizard/discourse/lib/wizard-schema";
+import discourseComputed from "discourse-common/utils/decorators";
+import I18n from "I18n";
+
+const nameKey = function (feature, attribute, value) {
+  if (feature === "action") {
+    return `admin.wizard.action.${value}.label`;
+  } else {
+    return `admin.wizard.${feature}.${attribute}.${value}`;
+  }
+};
+
+export default SingleSelectComponent.extend(Subscription, {
+  classNames: ["combo-box", "wizard-subscription-selector"],
+
+  selectKitOptions: {
+    autoFilterable: false,
+    filterable: false,
+    showFullTitle: true,
+    headerComponent:
+      "wizard-subscription-selector/wizard-subscription-selector-header",
+    caretUpIcon: "caret-up",
+    caretDownIcon: "caret-down",
+  },
+
+  allowedSubscriptionTypes(feature, attribute, value) {
+    let attributes = this.subscriptionAttributes[feature];
+    if (!attributes || !attributes[attribute]) {
+      return ["none"];
+    }
+    let allowedTypes = [];
+    Object.keys(attributes[attribute]).forEach((subscriptionType) => {
+      let values = attributes[attribute][subscriptionType];
+      if (values[0] === "*" || values.includes(value)) {
+        allowedTypes.push(subscriptionType);
+      }
+    });
+    return allowedTypes;
+  },
+
+  @discourseComputed("feature", "attribute")
+  content(feature, attribute) {
+    return wizardSchema[feature][attribute]
+      .map((value) => {
+        let allowedSubscriptionTypes = this.allowedSubscriptionTypes(
+          feature,
+          attribute,
+          value
+        );
+
+        let subscriptionRequired =
+          allowedSubscriptionTypes.length &&
+          !allowedSubscriptionTypes.includes("none");
+
+        let attrs = {
+          id: value,
+          name: I18n.t(nameKey(feature, attribute, value)),
+          subscriptionRequired,
+        };
+
+        if (subscriptionRequired) {
+          let subscribed = allowedSubscriptionTypes.includes(
+            this.subscriptionType
+          );
+          let selectorKey = subscribed ? "subscribed" : "not_subscribed";
+          let selectorLabel = `admin.wizard.subscription.${selectorKey}.selector`;
+
+          attrs.disabled = !subscribed;
+          attrs.selectorLabel = selectorLabel;
+        }
+
+        return attrs;
+      })
+      .sort(function (a, b) {
+        if (a.subscriptionType && !b.subscriptionType) {
+          return 1;
+        }
+        if (!a.subscriptionType && b.subscriptionType) {
+          return -1;
+        }
+        if (a.subscriptionType === b.subscriptionType) {
+          return a.subscriptionType
+            ? a.subscriptionType.localeCompare(b.subscriptionType)
+            : 0;
+        } else {
+          return a.subscriptionType === "standard" ? -1 : 0;
+        }
+      });
+  },
+
+  modifyComponentForRow() {
+    return "wizard-subscription-selector/wizard-subscription-selector-row";
+  },
+});
diff --git a/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-header.js.es6 b/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-header.js.es6
new file mode 100644
index 00000000..74f29f08
--- /dev/null
+++ b/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-header.js.es6
@@ -0,0 +1,17 @@
+import SingleSelectHeaderComponent from "select-kit/components/select-kit/single-select-header";
+import { computed } from "@ember/object";
+import { reads } from "@ember/object/computed";
+
+export default SingleSelectHeaderComponent.extend({
+  classNames: ["combo-box-header", "wizard-subscription-selector-header"],
+  caretUpIcon: reads("selectKit.options.caretUpIcon"),
+  caretDownIcon: reads("selectKit.options.caretDownIcon"),
+  caretIcon: computed(
+    "selectKit.isExpanded",
+    "caretUpIcon",
+    "caretDownIcon",
+    function () {
+      return this.selectKit.isExpanded ? this.caretUpIcon : this.caretDownIcon;
+    }
+  ),
+});
diff --git a/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-row.js.es6 b/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-row.js.es6
new file mode 100644
index 00000000..1d43047a
--- /dev/null
+++ b/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-row.js.es6
@@ -0,0 +1,20 @@
+import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
+import { default as discourseComputed } from "discourse-common/utils/decorators";
+
+export default SelectKitRowComponent.extend({
+  classNameBindings: ["isDisabled:disabled"],
+
+  @discourseComputed("item")
+  isDisabled() {
+    return this.item.disabled;
+  },
+
+  click(event) {
+    event.preventDefault();
+    event.stopPropagation();
+    if (!this.item.disabled) {
+      this.selectKit.select(this.rowValue, this.item);
+    }
+    return false;
+  },
+});
diff --git a/assets/javascripts/discourse/components/wizard-table-field.js.es6 b/assets/javascripts/discourse/components/wizard-table-field.js.es6
new file mode 100644
index 00000000..049b4d40
--- /dev/null
+++ b/assets/javascripts/discourse/components/wizard-table-field.js.es6
@@ -0,0 +1,139 @@
+import Component from "@ember/component";
+import { action } from "@ember/object";
+import { equal, notEmpty } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
+import I18n from "I18n";
+
+export default Component.extend({
+  classNameBindings: ["value.type"],
+  isText: equal("value.type", "text"),
+  isComposer: equal("value.type", "composer"),
+  isDate: equal("value.type", "date"),
+  isTime: equal("value.type", "time"),
+  isDateTime: equal("value.type", "date_time"),
+  isNumber: equal("value.type", "number"),
+  isCheckbox: equal("value.type", "checkbox"),
+  isUrl: equal("value.type", "url"),
+  isUpload: equal("value.type", "upload"),
+  isDropdown: equal("value.type", "dropdown"),
+  isTag: equal("value.type", "tag"),
+  isCategory: equal("value.type", "category"),
+  isGroup: equal("value.type", "group"),
+  isUserSelector: equal("value.type", "user_selector"),
+  isSubmittedAt: equal("field", "submitted_at"),
+  isComposerPreview: equal("value.type", "composer_preview"),
+  textState: "text-collapsed",
+  toggleText: I18n.t("admin.wizard.expand_text"),
+
+  @discourseComputed("value", "isUser")
+  hasValue(value, isUser) {
+    if (isUser) {
+      return value;
+    }
+    return value && value.value;
+  },
+
+  @discourseComputed("field", "value.type")
+  isUser(field, type) {
+    return field === "username" || field === "user" || type === "user";
+  },
+
+  @discourseComputed("value.type")
+  isLongtext(type) {
+    return type === "textarea" || type === "long_text";
+  },
+
+  @discourseComputed("value")
+  checkboxValue(value) {
+    const isCheckbox = this.get("isCheckbox");
+    if (isCheckbox) {
+      if (value.value.includes("true")) {
+        return true;
+      } else if (value.value.includes("false")) {
+        return false;
+      }
+    }
+  },
+
+  @action
+  expandText() {
+    const state = this.get("textState");
+
+    if (state === "text-collapsed") {
+      this.set("textState", "text-expanded");
+      this.set("toggleText", I18n.t("admin.wizard.collapse_text"));
+    } else if (state === "text-expanded") {
+      this.set("textState", "text-collapsed");
+      this.set("toggleText", I18n.t("admin.wizard.expand_text"));
+    }
+  },
+
+  @discourseComputed("value")
+  file(value) {
+    const isUpload = this.get("isUpload");
+    if (isUpload) {
+      return value.value;
+    }
+  },
+
+  @discourseComputed("value")
+  submittedUsers(value) {
+    const isUserSelector = this.get("isUserSelector");
+    const users = [];
+
+    if (isUserSelector) {
+      const userData = value.value;
+      const usernames = [];
+
+      if (userData.indexOf(",")) {
+        usernames.push(...userData.split(","));
+
+        usernames.forEach((u) => {
+          const user = {
+            username: u,
+            url: `/u/${u}`,
+          };
+          users.push(user);
+        });
+      }
+    }
+    return users;
+  },
+
+  @discourseComputed("isUser", "field", "value")
+  username(isUser, field, value) {
+    if (isUser) {
+      return value.username;
+    }
+    if (field === "username") {
+      return value.value;
+    }
+    return null;
+  },
+
+  showUsername: notEmpty("username"),
+
+  @discourseComputed("username")
+  userProfileUrl(username) {
+    if (username) {
+      return `/u/${username}`;
+    }
+    return "/";
+  },
+
+  @discourseComputed("value")
+  categoryUrl(value) {
+    const isCategory = this.get("isCategory");
+    if (isCategory) {
+      return `/c/${value.value}`;
+    }
+  },
+
+  @discourseComputed("value")
+  groupUrl(value) {
+    const isGroup = this.get("isGroup");
+    if (isGroup) {
+      return `/g/${value.value}`;
+    }
+  },
+});
diff --git a/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs b/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs
index f76722fc..f893d4ac 100644
--- a/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs
+++ b/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs
@@ -1,3 +1,7 @@
 {{#if currentUser.admin}}
   {{nav-item route="adminWizards" label="admin.wizard.nav_label"}}
+
+  {{#if wizardErrorNotice}}
+    {{d-icon "exclaimation-circle"}}
+  {{/if}}
 {{/if}}
diff --git a/assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.hbs b/assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.hbs
index 4b5d673d..5ce96f2f 100644
--- a/assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.hbs
+++ b/assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.hbs
@@ -6,11 +6,11 @@
   </label>
   <div class="controls">
     {{combo-box
-    value=wizardListVal
-    content=wizardList
-    onChange=(action "changeWizard")
-    options=(hash
-      none="admin.wizard.select"
-    )}}
+      value=wizardListVal
+      content=wizardList
+      onChange=(action "changeWizard")
+      options=(hash
+        none="admin.wizard.select"
+      )}}
   </div>
 </section>
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
index a71557c2..b89cc447 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
@@ -11,7 +11,7 @@ export default Controller.extend({
   queryParams: ["refresh_list"],
   loadingSubscriptions: false,
   notAuthorized: not("api.authorized"),
-  endpointMethods: selectKitContent(["GET", "PUT", "POST", "PATCH", "DELETE"]),
+  endpointMethods: selectKitContent(["PUT", "POST", "PATCH", "DELETE"]),
   showRemove: not("isNew"),
   showRedirectUri: and("threeLeggedOauth", "api.name"),
   responseIcon: null,
@@ -88,6 +88,11 @@ export default Controller.extend({
   twoLeggedOauth: equal("api.authType", "oauth_2"),
   threeLeggedOauth: equal("api.authType", "oauth_3"),
 
+  @discourseComputed("api.isNew")
+  nameClass(isNew) {
+    return isNew ? "new" : "saved";
+  },
+
   actions: {
     addParam() {
       this.get("api.authParams").pushObject({});
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-columns.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-columns.js.es6
new file mode 100644
index 00000000..4754c577
--- /dev/null
+++ b/assets/javascripts/discourse/controllers/admin-wizards-columns.js.es6
@@ -0,0 +1,14 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+
+export default Controller.extend(ModalFunctionality, {
+  actions: {
+    save() {
+      this.send("closeModal");
+    },
+
+    resetToDefault() {
+      this.get("model.reset")();
+    },
+  },
+});
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-logs-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-logs-show.js.es6
new file mode 100644
index 00000000..7e3fdff1
--- /dev/null
+++ b/assets/javascripts/discourse/controllers/admin-wizards-logs-show.js.es6
@@ -0,0 +1,52 @@
+import discourseComputed from "discourse-common/utils/decorators";
+import { notEmpty } from "@ember/object/computed";
+import CustomWizardLogs from "../models/custom-wizard-logs";
+import Controller from "@ember/controller";
+
+export default Controller.extend({
+  refreshing: false,
+  hasLogs: notEmpty("logs"),
+  page: 0,
+  canLoadMore: true,
+  logs: [],
+  messageKey: "viewing",
+
+  loadLogs() {
+    if (!this.canLoadMore) {
+      return;
+    }
+    const page = this.get("page");
+    const wizardId = this.get("wizard.id");
+
+    this.set("refreshing", true);
+
+    CustomWizardLogs.list(wizardId, page)
+      .then((result) => {
+        this.set("logs", this.logs.concat(result.logs));
+      })
+      .finally(() => this.set("refreshing", false));
+  },
+
+  @discourseComputed("hasLogs", "refreshing")
+  noResults(hasLogs, refreshing) {
+    return !hasLogs && !refreshing;
+  },
+
+  actions: {
+    loadMore() {
+      if (!this.loadingMore && this.logs.length < this.total) {
+        this.set("page", (this.page += 1));
+        this.loadLogs();
+      }
+    },
+
+    refresh() {
+      this.setProperties({
+        canLoadMore: true,
+        page: 0,
+        logs: [],
+      });
+      this.loadLogs();
+    },
+  },
+});
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
index 9559b01b..7388a8d6 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
@@ -1,50 +1,34 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { notEmpty } from "@ember/object/computed";
-import CustomWizardLogs from "../models/custom-wizard-logs";
 import Controller from "@ember/controller";
+import { default as discourseComputed } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  refreshing: false,
-  hasLogs: notEmpty("logs"),
-  page: 0,
-  canLoadMore: true,
-  logs: [],
+  documentationUrl: "https://thepavilion.io/t/2818",
 
-  loadLogs() {
-    if (!this.canLoadMore) {
-      return;
+  @discourseComputed("wizardId")
+  wizardName(wizardId) {
+    let currentWizard = this.wizardList.find(
+      (wizard) => wizard.id === wizardId
+    );
+    if (currentWizard) {
+      return currentWizard.name;
+    }
+  },
+
+  @discourseComputed("wizardName")
+  messageOpts(wizardName) {
+    return {
+      wizardName,
+    };
+  },
+
+  @discourseComputed("wizardId")
+  messageKey(wizardId) {
+    let key = "select";
+
+    if (wizardId) {
+      key = "viewing";
     }
 
-    this.set("refreshing", true);
-
-    CustomWizardLogs.list()
-      .then((result) => {
-        if (!result || result.length === 0) {
-          this.set("canLoadMore", false);
-        }
-        this.set("logs", this.logs.concat(result));
-      })
-      .finally(() => this.set("refreshing", false));
-  },
-
-  @discourseComputed("hasLogs", "refreshing")
-  noResults(hasLogs, refreshing) {
-    return !hasLogs && !refreshing;
-  },
-
-  actions: {
-    loadMore() {
-      this.set("page", (this.page += 1));
-      this.loadLogs();
-    },
-
-    refresh() {
-      this.setProperties({
-        canLoadMore: true,
-        page: 0,
-        logs: [],
-      });
-      this.loadLogs();
-    },
+    return key;
   },
 });
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6
index f5f9926d..10621cd3 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6
@@ -1,6 +1,69 @@
 import Controller from "@ember/controller";
+import { empty } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
+import showModal from "discourse/lib/show-modal";
+import CustomWizard from "../models/custom-wizard";
 
 export default Controller.extend({
   downloadUrl: fmt("wizard.id", "/admin/wizards/submissions/%@/download"),
+  noResults: empty("submissions"),
+  page: 0,
+  total: 0,
+
+  loadMoreSubmissions() {
+    const page = this.get("page");
+    const wizardId = this.get("wizard.id");
+
+    this.set("loadingMore", true);
+    CustomWizard.submissions(wizardId, page)
+      .then((result) => {
+        if (result.submissions) {
+          this.get("submissions").pushObjects(result.submissions);
+        }
+      })
+      .finally(() => {
+        this.set("loadingMore", false);
+      });
+  },
+
+  @discourseComputed("submissions", "fields.@each.enabled")
+  displaySubmissions(submissions, fields) {
+    let result = [];
+
+    submissions.forEach((submission) => {
+      let sub = {};
+
+      Object.keys(submission).forEach((fieldId) => {
+        if (fields.some((f) => f.id === fieldId && f.enabled)) {
+          sub[fieldId] = submission[fieldId];
+        }
+      });
+      result.push(sub);
+    });
+
+    return result;
+  },
+
+  actions: {
+    loadMore() {
+      if (!this.loadingMore && this.submissions.length < this.total) {
+        this.set("page", this.get("page") + 1);
+        this.loadMoreSubmissions();
+      }
+    },
+
+    showEditColumnsModal() {
+      return showModal("admin-wizards-columns", {
+        model: {
+          columns: this.get("fields"),
+          reset: () => {
+            this.get("fields").forEach((field) => {
+              field.set("enabled", true);
+            });
+          },
+        },
+      });
+    },
+  },
 });
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-submissions.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-submissions.js.es6
new file mode 100644
index 00000000..7388a8d6
--- /dev/null
+++ b/assets/javascripts/discourse/controllers/admin-wizards-submissions.js.es6
@@ -0,0 +1,34 @@
+import Controller from "@ember/controller";
+import { default as discourseComputed } from "discourse-common/utils/decorators";
+
+export default Controller.extend({
+  documentationUrl: "https://thepavilion.io/t/2818",
+
+  @discourseComputed("wizardId")
+  wizardName(wizardId) {
+    let currentWizard = this.wizardList.find(
+      (wizard) => wizard.id === wizardId
+    );
+    if (currentWizard) {
+      return currentWizard.name;
+    }
+  },
+
+  @discourseComputed("wizardName")
+  messageOpts(wizardName) {
+    return {
+      wizardName,
+    };
+  },
+
+  @discourseComputed("wizardId")
+  messageKey(wizardId) {
+    let key = "select";
+
+    if (wizardId) {
+      key = "viewing";
+    }
+
+    return key;
+  },
+});
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
index 1eeb62e6..e6b0ad04 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
@@ -92,7 +92,11 @@ export default Controller.extend({
       wizard
         .save(opts)
         .then((result) => {
-          this.send("afterSave", result.wizard_id);
+          if (result.wizard_id) {
+            this.send("afterSave", result.wizard_id);
+          } else if (result.errors) {
+            this.set("error", result.errors.join(", "));
+          }
         })
         .catch((result) => {
           this.set("error", this.getErrorMessage(result));
@@ -118,10 +122,6 @@ export default Controller.extend({
       controller.setup();
     },
 
-    toggleAdvanced() {
-      this.toggleProperty("wizard.showAdvanced");
-    },
-
     copyUrl() {
       const $copyRange = $('<p id="copy-range"></p>');
       $copyRange.html(this.wizardUrl);
diff --git a/assets/javascripts/discourse/controllers/admin-wizards.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards.js.es6
new file mode 100644
index 00000000..518893b6
--- /dev/null
+++ b/assets/javascripts/discourse/controllers/admin-wizards.js.es6
@@ -0,0 +1,9 @@
+import Controller from "@ember/controller";
+import { equal, or } from "@ember/object/computed";
+
+export default Controller.extend({
+  businessSubscription: equal("subscriptionType", "business"),
+  communitySubscription: equal("subscriptionType", "community"),
+  standardSubscription: equal("subscriptionType", "standard"),
+  showApi: or("businessSubscription", "communitySubscription"),
+});
diff --git a/assets/javascripts/discourse/custom-wizard-admin-route-map.js.es6 b/assets/javascripts/discourse/custom-wizard-admin-route-map.js.es6
index 90ab5359..272e276e 100644
--- a/assets/javascripts/discourse/custom-wizard-admin-route-map.js.es6
+++ b/assets/javascripts/discourse/custom-wizard-admin-route-map.js.es6
@@ -43,7 +43,16 @@ export default {
           }
         );
 
-        this.route("adminWizardsLogs", { path: "/logs", resetNamespace: true });
+        this.route(
+          "adminWizardsLogs",
+          { path: "/logs", resetNamespace: true },
+          function () {
+            this.route("adminWizardsLogsShow", {
+              path: "/:wizardId/",
+              resetNamespace: true,
+            });
+          }
+        );
 
         this.route("adminWizardsManager", {
           path: "/manager",
diff --git a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
index d4b2c57d..2d13e703 100644
--- a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
+++ b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
@@ -20,7 +20,7 @@ export default {
       return existing.apply(this, [path, opts]);
     };
 
-    withPluginApi("0.8.7", (api) => {
+    withPluginApi("0.8.36", (api) => {
       api.modifyClass("component:d-navigation", {
         pluginId: "custom-wizard",
         actions: {
diff --git a/assets/javascripts/discourse/lib/wizard-json.js.es6 b/assets/javascripts/discourse/lib/wizard-json.js.es6
index 79da60cb..95eaba49 100644
--- a/assets/javascripts/discourse/lib/wizard-json.js.es6
+++ b/assets/javascripts/discourse/lib/wizard-json.js.es6
@@ -97,11 +97,6 @@ function buildObjectArray(json, type) {
   if (present(json)) {
     json.forEach((objJson, objectIndex) => {
       let object = buildObject(objJson, type, objectIndex);
-
-      if (hasAdvancedProperties(object, type)) {
-        object.set("showAdvanced", true);
-      }
-
       array.pushObject(object);
     });
   }
@@ -112,21 +107,11 @@ function buildObjectArray(json, type) {
 function buildBasicProperties(json, type, props, objectIndex = null) {
   listProperties(type).forEach((p) => {
     props[p] = buildProperty(json, p, type, objectIndex);
-
-    if (hasAdvancedProperties(json, type)) {
-      props.showAdvanced = true;
-    }
   });
 
   return props;
 }
 
-function hasAdvancedProperties(object, type) {
-  return Object.keys(object).some((p) => {
-    return wizardSchema[type].advanced.indexOf(p) > -1 && present(object[p]);
-  });
-}
-
 /// to be removed: necessary due to action array being moved from step to wizard
 function actionPatch(json) {
   let actions = json.actions || [];
diff --git a/assets/javascripts/discourse/lib/wizard-schema.js.es6 b/assets/javascripts/discourse/lib/wizard-schema.js.es6
index 4953e59c..e9622c45 100644
--- a/assets/javascripts/discourse/lib/wizard-schema.js.es6
+++ b/assets/javascripts/discourse/lib/wizard-schema.js.es6
@@ -19,7 +19,6 @@ const wizard = {
     permitted: null,
   },
   mapped: ["permitted"],
-  advanced: ["restart_on_revisit"],
   required: ["id"],
   dependent: {
     after_time: "after_time_scheduled",
@@ -41,7 +40,6 @@ const step = {
     id: null,
     index: null,
     title: null,
-    key: null,
     banner: null,
     banner_upload_id: null,
     raw_description: null,
@@ -52,7 +50,6 @@ const step = {
     force_final: false,
   },
   mapped: ["required_data", "permitted_params", "condition", "index"],
-  advanced: ["required_data", "permitted_params", "condition", "index"],
   required: ["id"],
   dependent: {},
   objectArrays: {
@@ -71,14 +68,13 @@ const field = {
     image: null,
     image_upload_id: null,
     description: null,
+    property: null,
     required: null,
-    key: null,
     type: null,
     condition: null,
   },
   types: {},
   mapped: ["prefill", "content", "condition", "index"],
-  advanced: ["property", "key", "condition", "index"],
   required: ["id", "type"],
   dependent: {},
   objectArrays: {},
@@ -201,22 +197,24 @@ const action = {
     "members_visibility_level",
     "add_event",
   ],
-  advanced: [
-    "code",
-    "custom_fields",
-    "skip_redirect",
-    "suppress_notifications",
-    "required",
-  ],
   required: ["id", "type"],
   dependent: {},
   objectArrays: {},
 };
 
+const custom_field = {
+  klass: ["topic", "post", "group", "category"],
+  type: ["string", "boolean", "integer", "json"],
+};
+
+field.type = Object.keys(field.types);
+action.type = Object.keys(action.types);
+
 const wizardSchema = {
   wizard,
   step,
   field,
+  custom_field,
   action,
 };
 
diff --git a/assets/javascripts/discourse/mixins/subscription.js.es6 b/assets/javascripts/discourse/mixins/subscription.js.es6
new file mode 100644
index 00000000..34276c3f
--- /dev/null
+++ b/assets/javascripts/discourse/mixins/subscription.js.es6
@@ -0,0 +1,53 @@
+import Mixin from "@ember/object/mixin";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { readOnly } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
+
+const PRODUCT_PAGE = "https://custom-wizard.pavilion.tech";
+const SUPPORT_MESSAGE =
+  "https://coop.pavilion.tech/new-message?username=support&title=Custom%20Wizard%20Support";
+const MANAGER_CATEGORY =
+  "https://discourse.pluginmanager.org/c/discourse-custom-wizard";
+
+export default Mixin.create({
+  subscriptionLandingUrl: PRODUCT_PAGE,
+  subscriptionClientUrl: "/admin/plugins/subscription-client",
+
+  @discourseComputed
+  adminWizards() {
+    return getOwner(this).lookup("controller:admin-wizards");
+  },
+
+  subscribed: readOnly("adminWizards.subscribed"),
+  subscriptionType: readOnly("adminWizards.subscriptionType"),
+  businessSubscription: readOnly("adminWizards.businessSubscription"),
+  communitySubscription: readOnly("adminWizards.communitySubscription"),
+  standardSubscription: readOnly("adminWizards.standardSubscription"),
+  subscriptionAttributes: readOnly("adminWizards.subscriptionAttributes"),
+  subscriptionClientInstalled: readOnly(
+    "adminWizards.subscriptionClientInstalled"
+  ),
+
+  @discourseComputed("subscriptionClientInstalled")
+  subscriptionLink(subscriptionClientInstalled) {
+    return subscriptionClientInstalled
+      ? this.subscriptionClientUrl
+      : this.subscriptionLandingUrl;
+  },
+
+  @discourseComputed("subscriptionType")
+  subscriptionCtaLink(subscriptionType) {
+    switch (subscriptionType) {
+      case "none":
+        return PRODUCT_PAGE;
+      case "standard":
+        return SUPPORT_MESSAGE;
+      case "business":
+        return SUPPORT_MESSAGE;
+      case "community":
+        return MANAGER_CATEGORY;
+      default:
+        return PRODUCT_PAGE;
+    }
+  },
+});
diff --git a/assets/javascripts/discourse/models/custom-wizard-logs.js.es6 b/assets/javascripts/discourse/models/custom-wizard-logs.js.es6
index e2de8a07..23565e2c 100644
--- a/assets/javascripts/discourse/models/custom-wizard-logs.js.es6
+++ b/assets/javascripts/discourse/models/custom-wizard-logs.js.es6
@@ -3,14 +3,54 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import EmberObject from "@ember/object";
 
 const CustomWizardLogs = EmberObject.extend();
+const logItemTypes = {
+  date: "date_time",
+  action: "text",
+  message: "long_text",
+  user: "user",
+  username: "text",
+};
+
+function logItem(item, attr) {
+  return {
+    value: item[attr],
+    type: logItemTypes[attr],
+  };
+}
 
 CustomWizardLogs.reopenClass({
-  list(page = 0) {
-    return ajax("/admin/wizards/logs", {
-      data: {
-        page,
-      },
-    }).catch(popupAjaxError);
+  list(wizardId, page = 0) {
+    let data = {
+      page,
+    };
+
+    return ajax(`/admin/wizards/logs/${wizardId}`, { data })
+      .catch(popupAjaxError)
+      .then((result) => {
+        if (result.logs) {
+          result.logs = result.logs.map((item) => {
+            let map = {};
+
+            if (item.date) {
+              map.date = logItem(item, "date");
+            }
+            if (item.action) {
+              map.action = logItem(item, "action");
+            }
+            if (item.user) {
+              map.user = item.user;
+            } else {
+              map.user = logItem(item, "username");
+            }
+            if (item.message) {
+              map.message = logItem(item, "message");
+            }
+
+            return map;
+          });
+        }
+        return result;
+      });
   },
 });
 
diff --git a/assets/javascripts/discourse/routes/admin-wizards-custom-fields.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-custom-fields.js.es6
index a1c625ad..a04d36f9 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-custom-fields.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-custom-fields.js.es6
@@ -8,7 +8,10 @@ export default DiscourseRoute.extend({
   },
 
   setupController(controller, model) {
-    const customFields = A(model || []);
-    controller.set("customFields", customFields);
+    const customFields = A(model.custom_fields || []);
+
+    controller.setProperties({
+      customFields,
+    });
   },
 });
diff --git a/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6
new file mode 100644
index 00000000..474360ec
--- /dev/null
+++ b/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6
@@ -0,0 +1,17 @@
+import CustomWizardLogs from "../models/custom-wizard-logs";
+import DiscourseRoute from "discourse/routes/discourse";
+import { A } from "@ember/array";
+
+export default DiscourseRoute.extend({
+  model(params) {
+    return CustomWizardLogs.list(params.wizardId);
+  },
+
+  setupController(controller, model) {
+    controller.setProperties({
+      wizard: model.wizard,
+      logs: A(model.logs),
+      total: model.total,
+    });
+  },
+});
diff --git a/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6
index 56b91350..a1575050 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6
@@ -1,12 +1,24 @@
-import CustomWizardLogs from "../models/custom-wizard-logs";
 import DiscourseRoute from "discourse/routes/discourse";
+import { ajax } from "discourse/lib/ajax";
 
 export default DiscourseRoute.extend({
   model() {
-    return CustomWizardLogs.list();
+    return ajax(`/admin/wizards/wizard`);
   },
 
   setupController(controller, model) {
-    controller.set("logs", model);
+    const showParams = this.paramsFor("adminWizardsLogsShow");
+
+    controller.setProperties({
+      wizardId: showParams.wizardId,
+      wizardList: model.wizard_list,
+    });
+  },
+
+  actions: {
+    changeWizard(wizardId) {
+      this.controllerFor("adminWizardsLogs").set("wizardId", wizardId);
+      this.transitionTo("adminWizardsLogsShow", wizardId);
+    },
   },
 });
diff --git a/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6
index 64847a9f..5a9d6046 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6
@@ -1,42 +1,24 @@
+import { A } from "@ember/array";
+import EmberObject from "@ember/object";
 import CustomWizardAdmin from "../models/custom-wizard-admin";
 import DiscourseRoute from "discourse/routes/discourse";
 
-const excludedMetaFields = ["route_to", "redirect_on_complete", "redirect_to"];
-
 export default DiscourseRoute.extend({
   model(params) {
     return CustomWizardAdmin.submissions(params.wizardId);
   },
 
   setupController(controller, model) {
-    if (model && model.submissions) {
-      let fields = ["username"];
-      model.submissions.forEach((s) => {
-        Object.keys(s.fields).forEach((k) => {
-          if (!excludedMetaFields.includes(k) && fields.indexOf(k) < 0) {
-            fields.push(k);
-          }
-        });
-      });
-
-      let submissions = [];
-      model.submissions.forEach((s) => {
-        let submission = {
-          username: s.username,
-        };
-        Object.keys(s.fields).forEach((f) => {
-          if (fields.includes(f)) {
-            submission[f] = s.fields[f];
-          }
-        });
-        submissions.push(submission);
-      });
-
-      controller.setProperties({
-        wizard: model.wizard,
-        submissions,
-        fields,
-      });
-    }
+    const fields = model.fields.map((f) => {
+      const fieldsObject = EmberObject.create(f);
+      fieldsObject.enabled = true;
+      return fieldsObject;
+    });
+    controller.setProperties({
+      wizard: model.wizard,
+      fields: A(fields),
+      submissions: A(model.submissions),
+      total: model.total,
+    });
   },
 });
diff --git a/assets/javascripts/discourse/routes/admin-wizards.js.es6 b/assets/javascripts/discourse/routes/admin-wizards.js.es6
index 5de271a8..1fa786d3 100644
--- a/assets/javascripts/discourse/routes/admin-wizards.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards.js.es6
@@ -1,7 +1,21 @@
 import DiscourseRoute from "discourse/routes/discourse";
+import { ajax } from "discourse/lib/ajax";
 
 export default DiscourseRoute.extend({
-  beforeModel(transition) {
+  model() {
+    return ajax("/admin/wizards");
+  },
+
+  setupController(controller, model) {
+    controller.setProperties({
+      subscribed: model.subscribed,
+      subscriptionType: model.subscription_type,
+      subscriptionAttributes: model.subscription_attributes,
+      subscriptionClientInstalled: model.subscription_client_installed,
+    });
+  },
+
+  afterModel(model, transition) {
     if (transition.targetName === "adminWizards.index") {
       this.transitionTo("adminWizardsWizard");
     }
diff --git a/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs
index 4d3def3d..303b3f6d 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs
@@ -21,11 +21,11 @@
     {{/if}}
   </div>
 
-  <div class="wizard-header">
+  <div class="wizard-header large">
     {{#if api.isNew}}
       {{i18n "admin.wizard.api.new"}}
     {{else}}
-      {{api.title}}
+      <span>{{api.title}}</span>
     {{/if}}
   </div>
 
@@ -35,12 +35,12 @@
       {{input value=api.title placeholder=(i18n "admin.wizard.api.title_placeholder")}}
     </div>
 
-    <div class="name">
+    <div class="name {{nameClass}}">
       <label>{{i18n "admin.wizard.api.name"}}</label>
       {{#if api.isNew}}
         {{input value=api.name placeholder=(i18n "admin.wizard.api.name_placeholder")}}
       {{else}}
-        {{api.name}}
+        <span>{{api.name}}</span>
       {{/if}}
     </div>
   </div>
@@ -63,7 +63,7 @@
     {{/if}}
   </div>
 
-  <div class="wizard-header">
+  <div class="wizard-header medium">
     {{i18n "admin.wizard.api.auth.label"}}
   </div>
 </div>
@@ -71,7 +71,7 @@
 <div class="wizard-api-authentication">
   <div class="settings">
 
-    <div class="wizard-header medium">
+    <div class="wizard-header small">
       {{i18n "admin.wizard.api.auth.settings"}}
     </div>
 
@@ -174,7 +174,7 @@
         {{/if}}
       </div>
 
-      <div class="wizard-header medium">
+      <div class="wizard-header small">
         {{i18n "admin.wizard.api.status.label"}}
       </div>
 
@@ -220,7 +220,7 @@
   {{/if}}
 </div>
 
-<div class="wizard-header">
+<div class="wizard-header medium">
   {{i18n "admin.wizard.api.endpoint.label"}}
 </div>
 
@@ -277,11 +277,15 @@
   {{/if}}
 </div>
 
-<div class="wizard-header">
+<div class="wizard-header medium">
   {{i18n "admin.wizard.api.log.label"}}
-  {{d-button action=(action "clearLogs")
-             icon="trash-alt"
-             class="clear-logs"}}
+
+  <div class="controls">
+    {{d-button
+      action=(action "clearLogs")
+      class="clear-logs"
+      label="admin.wizard.api.log.clear"}}
+  </div>
 </div>
 
 <div class="wizard-api-log">
@@ -300,7 +304,7 @@
             <td>{{logentry.time}}</td>
             <td class="user-image">
               <div class="user-image-inner">
-                <a href={{logentry.userpath}} data-user-card={{logentry.username}}>{{avatar logentry imageSize="large"}}</a>
+                <a href={{logentry.userpath}} data-user-card={{logentry.username}}>{{avatar logentry imageSize="medium"}}</a>
               </div>
             </td>
             <td>{{logentry.status}}</td>
diff --git a/assets/javascripts/discourse/templates/admin-wizards-api.hbs b/assets/javascripts/discourse/templates/admin-wizards-api.hbs
index 00d8ad60..af91d0fb 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-api.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-api.hbs
@@ -8,7 +8,7 @@
     )}}
 
   {{d-button
-    action="createApi"
+    action=(route-action "createApi")
     label="admin.wizard.api.create"
     icon="plus"}}
 </div>
diff --git a/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs b/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs
index 10501498..a90f6299 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs
@@ -5,7 +5,7 @@
     {{d-button
       label="admin.wizard.custom_field.add"
       icon="plus"
-      action="addField"}}
+      action=(action "addField")}}
   </div>
 </div>
 
diff --git a/assets/javascripts/discourse/templates/admin-wizards-logs-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-logs-show.hbs
new file mode 100644
index 00000000..270d5c21
--- /dev/null
+++ b/assets/javascripts/discourse/templates/admin-wizards-logs-show.hbs
@@ -0,0 +1,45 @@
+{{#if logs}}
+  <div class="wizard-header large">
+    <label>
+      {{i18n "admin.wizard.log.title" name=wizard.name}}
+    </label>
+
+    <div class="controls">
+      {{d-button
+        label="refresh"
+        icon="sync"
+        action=(action "refresh")
+        class="refresh"}}
+    </div>
+  </div>
+
+  <div class="wizard-table">
+    {{#load-more selector=".wizard-table tr" action=(action "loadMore")}}
+      {{#if noResults}}
+        <p>{{i18n "search.no_results"}}</p>
+      {{else}}
+        <table>
+          <thead>
+            <tr>
+              <th class="date">{{i18n "admin.wizard.log.date"}}</th>
+              <th>{{i18n "admin.wizard.log.action"}}</th>
+              <th>{{i18n "admin.wizard.log.user"}}</th>
+              <th>{{i18n "admin.wizard.log.message"}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            {{#each logs as |log|}}
+              <tr>
+                {{#each-in log as |field value|}}
+                  <td class="small">{{wizard-table-field field=field value=value}}</td>
+                {{/each-in}}
+              </tr>
+            {{/each}}
+          </tbody>
+        </table>
+      {{/if}}
+
+      {{conditional-loading-spinner condition=refreshing}}
+    {{/load-more}}
+  </div>
+{{/if}}
diff --git a/assets/javascripts/discourse/templates/admin-wizards-logs.hbs b/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
index b0dd3de6..45738a9f 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
@@ -1,34 +1,19 @@
-<div class="admin-wizard-controls">
-  <h3>{{i18n "admin.wizard.log.nav_label"}}</h3>
-
-  {{d-button
-    label="refresh"
-    icon="sync"
-    action="refresh"
-    class="refresh"}}
+<div class="admin-wizard-select admin-wizard-controls">
+  {{combo-box
+    value=wizardId
+    content=wizardList
+    onChange=(route-action "changeWizard")
+    options=(hash
+      none="admin.wizard.select"
+    )}}
 </div>
 
-{{#load-more selector=".log-list tr" action=(action "loadMore") class="wizard-logs"}}
-  {{#if noResults}}
-    <p>{{i18n "search.no_results"}}</p>
-  {{else}}
-    <table class="table grid">
-      <thead>
-        <tr>
-          <th>Message</th>
-          <th class="date">Date</th>
-        </tr>
-      </thead>
-      <tbody>
-        {{#each logs as |log|}}
-          <tr>
-            <td>{{log.message}}</td>
-            <td class="date">{{bound-date log.date}}</td>
-          </tr>
-        {{/each}}
-      </tbody>
-    </table>
-  {{/if}}
+{{wizard-message
+  key=messageKey
+  opts=messageOpts
+  url=documentationUrl
+  component="logs"}}
 
-  {{conditional-loading-spinner condition=refreshing}}
-{{/load-more}}
+<div class="admin-wizard-container">
+  {{outlet}}
+</div>
diff --git a/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs
index 6d1f255b..72ec7c38 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs
@@ -1,8 +1,24 @@
 {{#if submissions}}
   <div class="wizard-header large">
-    <label>{{i18n "admin.wizard.submissions.title" name=wizard.name}}</label>
+    <label>
+      {{i18n "admin.wizard.submissions.title" name=wizard.name}}
+    </label>
 
-    <a class="btn btn-default download-link" href={{downloadUrl}} target="_blank" rel="noopener noreferrer">
+    <div class="controls">
+      {{d-button
+        icon="sliders-h"
+        label="admin.wizard.edit_columns"
+        action=(action "showEditColumnsModal")
+        class="btn-default open-edit-columns-btn download-link"
+      }}
+    </div>
+
+    <a
+      class="btn btn-default download-link"
+      href={{downloadUrl}}
+      target="_blank"
+      rel="noopener noreferrer"
+    >
       {{d-icon "download"}}
       <span class="d-button-label">
         {{i18n "admin.wizard.submissions.download"}}
@@ -10,24 +26,36 @@
     </a>
   </div>
 
-  <div class="wizard-submissions">
-    <table>
-      <thead>
-        <tr>
-          {{#each fields as |f|}}
-            <th>{{f}}</th>
-          {{/each}}
-        </tr>
-      </thead>
-      <tbody>
-        {{#each submissions as |s|}}
-          <tr>
-            {{#each-in s as |k v|}}
-              <td>{{v}}</td>
-            {{/each-in}}
-          </tr>
-        {{/each}}
-      </tbody>
-    </table>
+  <div class="wizard-table">
+    {{#load-more selector=".wizard-table tr" action=(action "loadMore")}}
+      {{#if noResults}}
+        <p>{{i18n "search.no_results"}}</p>
+      {{else}}
+        <table>
+          <thead>
+            <tr>
+              {{#each fields as |field|}}
+                {{#if field.enabled}}
+                  <th>
+                    {{field.label}}
+                  </th>
+                {{/if}}
+              {{/each}}
+            </tr>
+          </thead>
+          <tbody>
+            {{#each displaySubmissions as |submission|}}
+              <tr>
+                {{#each-in submission as |field value|}}
+                  <td>{{wizard-table-field field=field value=value}}</td>
+                {{/each-in}}
+              </tr>
+            {{/each}}
+          </tbody>
+        </table>
+      {{/if}}
+
+      {{conditional-loading-spinner condition=loadingMore}}
+    {{/load-more}}
   </div>
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs b/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs
index d843485a..07dd1682 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs
@@ -1,4 +1,4 @@
-<div class="admin-wizard-select">
+<div class="admin-wizard-select admin-wizard-controls">
   {{combo-box
     value=wizardId
     content=wizardList
@@ -8,6 +8,12 @@
     )}}
 </div>
 
+{{wizard-message
+  key=messageKey
+  opts=messageOpts
+  url=documentationUrl
+  component="submissions"}}
+
 <div class="admin-wizard-container">
   {{outlet}}
 </div>
diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs
index b1281a6a..96d773cf 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs
@@ -101,7 +101,7 @@
         {{input type="checkbox" checked=wizard.after_time}}
         <span>{{i18n "admin.wizard.after_time_label"}}</span>
         {{d-button
-          action="setNextSessionScheduled"
+          action=(action "setNextSessionScheduled")
           translatedLabel=nextSessionScheduledLabel
           class="btn-after-time"
           icon="far-calendar"}}
@@ -126,43 +126,27 @@
       </div>
     </div>
 
-    {{wizard-advanced-toggle showAdvanced=wizard.showAdvanced}}
-
-    {{#if wizard.showAdvanced}}
-      <div class="advanced-settings">
-
-        <div class="setting">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.save_submissions"}}</label>
-          </div>
-          <div class="setting-value">
-            {{input type="checkbox" checked=wizard.save_submissions}}
-            <span>{{i18n "admin.wizard.save_submissions_label"}}</span>
-          </div>
+    {{#wizard-subscription-container}}
+      <div class="setting">
+        <div class="setting-label">
+          <label>{{i18n "admin.wizard.save_submissions"}}</label>
         </div>
-
-        <div class="setting">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.restart_on_revisit"}}</label>
-          </div>
-          <div class="setting-value">
-            {{input type="checkbox" checked=wizard.restart_on_revisit}}
-            <span>{{i18n "admin.wizard.restart_on_revisit_label"}}</span>
-          </div>
+        <div class="setting-value">
+          {{input type="checkbox" checked=wizard.save_submissions}}
+          <span>{{i18n "admin.wizard.save_submissions_label"}}</span>
         </div>
-
-        <div class="setting">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.resume_on_revisit"}}</label>
-          </div>
-          <div class="setting-value">
-            {{input type="checkbox" checked=wizard.resume_on_revisit}}
-            <span>{{i18n "admin.wizard.resume_on_revisit_label"}}</span>
-          </div>
-        </div>
-
       </div>
-    {{/if}}
+
+      <div class="setting">
+        <div class="setting-label">
+          <label>{{i18n "admin.wizard.restart_on_revisit"}}</label>
+        </div>
+        <div class="setting-value">
+          {{input type="checkbox" checked=wizard.restart_on_revisit}}
+          <span>{{i18n "admin.wizard.restart_on_revisit_label"}}</span>
+        </div>
+      </div>
+    {{/wizard-subscription-container}}
   </div>
 
   {{wizard-links
@@ -176,7 +160,8 @@
       wizard=wizard
       currentField=currentField
       wizardFields=wizardFields
-      fieldTypes=fieldTypes}}
+      fieldTypes=fieldTypes
+      subscribed=subscribed}}
   {{/if}}
 
   {{wizard-links
@@ -185,9 +170,9 @@
     items=wizard.actions
     generateLabels=true}}
 
-  {{#each wizard.actions as |action|}}
+  {{#each wizard.actions as |wizardAction|}}
     {{wizard-custom-action
-      action=action
+      action=wizardAction
       currentActionId=currentAction.id
       wizard=wizard
       apis=apis
diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs
index 081cd5f3..c96f8009 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs
@@ -8,7 +8,7 @@
     )}}
 
   {{d-button
-    action="createWizard"
+    action=(route-action "createWizard")
     label="admin.wizard.create"
     icon="plus"}}
 </div>
diff --git a/assets/javascripts/discourse/templates/admin-wizards.hbs b/assets/javascripts/discourse/templates/admin-wizards.hbs
index 21da3421..cea77942 100644
--- a/assets/javascripts/discourse/templates/admin-wizards.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards.hbs
@@ -2,17 +2,15 @@
   {{nav-item route="adminWizardsWizard" label="admin.wizard.nav_label"}}
   {{nav-item route="adminWizardsCustomFields" label="admin.wizard.custom_field.nav_label"}}
   {{nav-item route="adminWizardsSubmissions" label="admin.wizard.submissions.nav_label"}}
-  {{#if siteSettings.wizard_apis_enabled}}
+  {{#if showApi}}
     {{nav-item route="adminWizardsApi" label="admin.wizard.api.nav_label"}}
   {{/if}}
   {{nav-item route="adminWizardsLogs" label="admin.wizard.log.nav_label"}}
   {{nav-item route="adminWizardsManager" label="admin.wizard.manager.nav_label"}}
 
-  <div class="announcement">
-    <a href="https://custom-wizard.pavilion.tech/subscriptions" target="_blank" title="Click to learn more about Custom Wizard Subscriptions">
-      <img src='/images/emoji/twitter/man_mage.png?v=12'>
-      <span>Custom Wizard Subscriptions Are Coming!</span>
-    </a>
+  <div class="admin-actions">
+    {{wizard-subscription-badge}}
+    {{wizard-subscription-cta}}
   </div>
 {{/admin-nav}}
 
diff --git a/assets/javascripts/discourse/templates/components/custom-field-input.hbs b/assets/javascripts/discourse/templates/components/custom-field-input.hbs
index 43a97be8..c0bdaaff 100644
--- a/assets/javascripts/discourse/templates/components/custom-field-input.hbs
+++ b/assets/javascripts/discourse/templates/components/custom-field-input.hbs
@@ -1,17 +1,23 @@
 {{#if showInputs}}
   <td>
-    {{combo-box
+    {{wizard-subscription-selector
       value=field.klass
-      content=klassContent
-      none="admin.wizard.custom_field.klass.select"
-      onChange=(action (mut field.klass))}}
+      feature="custom_field"
+      attribute="klass"
+      onChange=(action (mut field.klass))
+      options=(hash
+        none="admin.wizard.custom_field.klass.select"
+      )}}
   </td>
   <td>
-    {{combo-box
+    {{wizard-subscription-selector
       value=field.type
-      content=typeContent
-      none="admin.wizard.custom_field.type.select"
-      onChange=(action (mut field.type))}}
+      feature="custom_field"
+      attribute="type"
+      onChange=(action (mut field.type))
+      options=(hash
+        none="admin.wizard.custom_field.type.select"
+      )}}
   </td>
   <td class="input">
     {{input
@@ -22,8 +28,10 @@
     {{multi-select
       value=field.serializers
       content=serializerContent
-      none="admin.wizard.custom_field.serializers.select"
-      onChange=(action (mut field.serializers))}}
+      onChange=(action (mut field.serializers))
+      options=(hash
+        none="admin.wizard.custom_field.serializers.select"
+      )}}
   </td>
   <td class="actions">
     {{#if loading}}
@@ -34,17 +42,17 @@
       {{/if}}
     {{/if}}
     {{d-button
-      action="destroy"
+      action=(action "destroy")
       icon="trash-alt"
       class="destroy"
       disabled=destroyDisabled}}
     {{d-button
       icon="save"
-      action="save"
+      action=(action "save")
       disabled=saveDisabled
       class="save"}}
     {{d-button
-      action="close"
+      action=(action "close")
       icon="times"
       disabled=closeDisabled}}
   </td>
@@ -69,7 +77,7 @@
     </td>
   {{else}}
     <td class="actions">
-      {{d-button action="edit" icon="pencil-alt"}}
+      {{d-button action=(action "edit") icon="pencil-alt"}}
     </td>
   {{/if}}
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-advanced-toggle.hbs b/assets/javascripts/discourse/templates/components/wizard-advanced-toggle.hbs
deleted file mode 100644
index ec2bcb76..00000000
--- a/assets/javascripts/discourse/templates/components/wizard-advanced-toggle.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-{{d-button
-  action="toggleAdvanced"
-  label="admin.wizard.advanced"
-  class=toggleClass}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
index 03aee3f4..3b2222a0 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
@@ -1,6 +1,6 @@
 {{#if showUndo}}
   {{d-button
-    action="undoChanges"
+    action=(action "undoChanges")
     icon=undoIcon
     label=undoKey
     class="undo-changes"}}
@@ -12,13 +12,15 @@
   </div>
 
   <div class="setting-value">
-    {{combo-box
+    {{wizard-subscription-selector
       value=action.type
-      content=actionTypes
+      feature="action"
+      attribute="type"
       onChange=(action "changeType")
       options=(hash
         none="admin.wizard.select_type"
-      )}}
+      )
+    }}
   </div>
 </div>
 
@@ -733,99 +735,90 @@
   </div>
 {{/if}}
 
-{{#if showAdvanced}}
-  {{wizard-advanced-toggle showAdvanced=action.showAdvanced}}
-
-  {{#if action.showAdvanced}}
-    <div class="advanced-settings">
-
-      {{#if hasCustomFields}}
-        <div class="setting full field-mapper-setting">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.action.custom_fields.label"}}</label>
-          </div>
-
-          <div class="setting-value">
-            {{wizard-mapper
-              inputs=action.custom_fields
-              property="custom_fields"
-              onUpdate=(action "mappedFieldUpdated")
-              options=(hash
-                inputTypes="association"
-                customFieldSelection="key"
-                wizardFieldSelection="value"
-                wizardActionSelection="value"
-                userFieldSelection="value"
-                keyPlaceholder="admin.wizard.action.custom_fields.key"
-                context=customFieldsContext
-              )}}
-          </div>
-        </div>
-      {{/if}}
-
-      {{#if sendMessage}}
-        <div class="setting full field-mapper-setting">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.required"}}</label>
-          </div>
-
-          <div class="setting-value">
-            {{wizard-mapper
-              inputs=action.required
-              property="required"
-              onUpdate=(action "mappedFieldUpdated")
-              options=(hash
-                textSelection="value"
-                wizardFieldSelection=true
-                userFieldSelection=true
-                groupSelection=true
-                context="action"
-              )}}
-          </div>
-        </div>
-      {{/if}}
-
-      {{#if showPostAdvanced}}
-        <div class="setting full">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.action.skip_redirect.label"}}</label>
-          </div>
-
-          <div class="setting-value">
-            {{input type="checkbox" checked=action.skip_redirect}}
-
-            <span>
-              {{i18n "admin.wizard.action.skip_redirect.description" type="topic"}}
-            </span>
-          </div>
-        </div>
-
-        <div class="setting full">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.action.suppress_notifications.label"}}</label>
-          </div>
-
-          <div class="setting-value">
-            {{input type="checkbox" checked=action.suppress_notifications}}
-
-            <span>
-              {{i18n "admin.wizard.action.suppress_notifications.description" type="topic"}}
-            </span>
-          </div>
-        </div>
-      {{/if}}
-
-      {{#if routeTo}}
-        <div class="setting">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.action.route_to.code"}}</label>
-          </div>
-
-          <div class="setting-value">
-            {{input value=action.code}}
-          </div>
-        </div>
-      {{/if}}
+{{#if hasCustomFields}}
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.action.custom_fields.label"}}</label>
     </div>
-  {{/if}}
+
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=action.custom_fields
+        property="custom_fields"
+        onUpdate=(action "mappedFieldUpdated")
+        options=(hash
+          inputTypes="association"
+          customFieldSelection="key"
+          wizardFieldSelection="value"
+          wizardActionSelection="value"
+          userFieldSelection="value"
+          keyPlaceholder="admin.wizard.action.custom_fields.key"
+          context=customFieldsContext
+        )}}
+    </div>
+  </div>
+{{/if}}
+
+{{#if sendMessage}}
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.required"}}</label>
+    </div>
+
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=action.required
+        property="required"
+        onUpdate=(action "mappedFieldUpdated")
+        options=(hash
+          textSelection="value"
+          wizardFieldSelection=true
+          userFieldSelection=true
+          groupSelection=true
+          context="action"
+        )}}
+    </div>
+  </div>
+{{/if}}
+
+{{#if showPostAdvanced}}
+  <div class="setting full">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.action.skip_redirect.label"}}</label>
+    </div>
+
+    <div class="setting-value">
+      {{input type="checkbox" checked=action.skip_redirect}}
+
+      <span>
+        {{i18n "admin.wizard.action.skip_redirect.description" type="topic"}}
+      </span>
+    </div>
+  </div>
+
+  <div class="setting full">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.action.suppress_notifications.label"}}</label>
+    </div>
+
+    <div class="setting-value">
+      {{input type="checkbox" checked=action.suppress_notifications}}
+
+      <span>
+        {{i18n "admin.wizard.action.suppress_notifications.description" type="topic"}}
+      </span>
+    </div>
+  </div>
+{{/if}}
+
+{{#if routeTo}}
+  <div class="setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.action.route_to.code"}}</label>
+    </div>
+
+    <div class="setting-value">
+      {{input value=action.code}}
+    </div>
+  </div>
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
index dbf59e32..6e524fe3 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
@@ -1,6 +1,6 @@
 {{#if showUndo}}
   {{d-button
-    action="undoChanges"
+    action=(action "undoChanges")
     icon=undoIcon
     label=undoKey
     class="undo-changes"}}
@@ -224,70 +224,50 @@
   </div>
 {{/if}}
 
-{{#if showAdvanced}}
-  {{wizard-advanced-toggle showAdvanced=field.showAdvanced}}
+{{#wizard-subscription-container}}
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.condition"}}</label>
+    </div>
 
-  {{#if field.showAdvanced}}
-    <div class="advanced-settings">
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=field.condition
+        options=fieldConditionOptions}}
+    </div>
+  </div>
 
-      <div class="setting full field-mapper-setting">
-        <div class="setting-label">
-          <label>{{i18n "admin.wizard.condition"}}</label>
-        </div>
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.index"}}</label>
+    </div>
 
-        <div class="setting-value">
-          {{wizard-mapper
-            inputs=field.condition
-            options=fieldConditionOptions}}
-        </div>
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=field.index
+        options=fieldIndexOptions}}
+    </div>
+  </div>
+
+  {{#if isCategory}}
+    <div class="setting">
+      <div class="setting-label">
+        <label>{{i18n "admin.wizard.field.property"}}</label>
       </div>
 
-      <div class="setting full field-mapper-setting">
-        <div class="setting-label">
-          <label>{{i18n "admin.wizard.index"}}</label>
-        </div>
-
-        <div class="setting-value">
-          {{wizard-mapper
-            inputs=field.index
-            options=fieldIndexOptions}}
-        </div>
+      <div class="setting-value">
+        {{combo-box
+          value=field.property
+          content=categoryPropertyTypes
+          onChange=(action (mut field.property))
+          options=(hash
+            none="admin.wizard.selector.placeholder.property"
+          )}}
       </div>
-
-      {{#if isCategory}}
-        <div class="setting">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.field.property"}}</label>
-          </div>
-
-          <div class="setting-value">
-            {{combo-box
-              value=field.property
-              content=categoryPropertyTypes
-              onChange=(action (mut field.property))
-              options=(hash
-                none="admin.wizard.selector.placeholder.property"
-              )}}
-          </div>
-        </div>
-      {{/if}}
-
-      <div class="setting">
-        <div class="setting-label">
-          <label>{{i18n "admin.wizard.translation"}}</label>
-        </div>
-        <div class="setting-value medium">
-          {{input
-            name="key"
-            value=field.key
-            class="medium"
-            placeholderKey="admin.wizard.translation_placeholder"}}
-        </div>
-      </div>
-
-      {{#if validations}}
-        {{wizard-realtime-validations field=field validations=validations}}
-      {{/if}}
     </div>
   {{/if}}
-{{/if}}
+
+  {{#if validations}}
+    {{wizard-realtime-validations field=field validations=validations}}
+  {{/if}}
+{{/wizard-subscription-container}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
index 9d7ae5af..40ac09e0 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
@@ -34,88 +34,72 @@
   </div>
 </div>
 
-{{wizard-advanced-toggle showAdvanced=step.showAdvanced}}
-
-{{#if step.showAdvanced}}
-  <div class="advanced-settings">
-
-    <div class="setting full field-mapper-setting">
-      <div class="setting-label">
-        <label>{{i18n "admin.wizard.condition"}}</label>
-      </div>
-
-      <div class="setting-value">
-        {{wizard-mapper
-          inputs=step.condition
-          options=stepConditionOptions}}
-      </div>
+{{#wizard-subscription-container}}
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.condition"}}</label>
     </div>
 
-    <div class="setting full">
-      <div class="setting-label"></div>
-      <div class="setting-value force-final">
-        <h4>{{i18n "admin.wizard.step.force_final.label"}}</h4>
-        {{input type="checkbox" checked=step.force_final}}
-        <span>{{i18n "admin.wizard.step.force_final.description"}}</span>
-      </div>
-    </div>
-
-    <div class="setting full field-mapper-setting">
-      <div class="setting-label">
-        <label>{{i18n "admin.wizard.step.required_data.label"}}</label>
-      </div>
-      <div class="setting-value">
-        {{wizard-mapper
-          inputs=step.required_data
-          options=(hash
-            inputTypes="validation"
-            inputConnector="and"
-            wizardFieldSelection="value"
-            userFieldSelection="value"
-            keyPlaceholder="admin.wizard.submission_key"
-            context="step"
-          )}}
-        {{#if step.required_data}}
-          <div class="required-data-message">
-            <div class="label">
-              {{i18n "admin.wizard.step.required_data.not_permitted_message"}}
-            </div>
-            {{input value=step.required_data_message}}
-          </div>
-        {{/if}}
-      </div>
-    </div>
-
-    <div class="setting full field-mapper-setting">
-      <div class="setting-label">
-        <label>{{i18n "admin.wizard.step.permitted_params.label"}}</label>
-      </div>
-      <div class="setting-value">
-        {{wizard-mapper
-          inputs=step.permitted_params
-          options=(hash
-            pairConnector="set"
-            inputTypes="association"
-            keyPlaceholder="admin.wizard.param_key"
-            valuePlaceholder="admin.wizard.submission_key"
-            context="step"
-          )}}
-      </div>
-    </div>
-
-    <div class="setting">
-      <div class="setting-label">
-        <label>{{i18n "admin.wizard.translation"}}</label>
-      </div>
-      <div class="setting-value">
-        {{input
-          name="key"
-          value=step.key
-          placeholderKey="admin.wizard.translation_placeholder"}}
-      </div>
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=step.condition
+        options=stepConditionOptions}}
     </div>
   </div>
-{{/if}}
+
+  <div class="setting full">
+    <div class="setting-label"></div>
+    <div class="setting-value force-final">
+      <h4>{{i18n "admin.wizard.step.force_final.label"}}</h4>
+      {{input type="checkbox" checked=step.force_final}}
+      <span>{{i18n "admin.wizard.step.force_final.description"}}</span>
+    </div>
+  </div>
+
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.step.required_data.label"}}</label>
+    </div>
+
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=step.required_data
+        options=(hash
+          inputTypes="validation"
+          inputConnector="and"
+          wizardFieldSelection="value"
+          userFieldSelection="value"
+          keyPlaceholder="admin.wizard.submission_key"
+          context="step"
+        )}}
+      {{#if step.required_data}}
+        <div class="required-data-message">
+          <div class="label">
+            {{i18n "admin.wizard.step.required_data.not_permitted_message"}}
+          </div>
+          {{input value=step.required_data_message}}
+        </div>
+      {{/if}}
+    </div>
+  </div>
+
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.step.permitted_params.label"}}</label>
+    </div>
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=step.permitted_params
+        options=(hash
+          pairConnector="set"
+          inputTypes="association"
+          keyPlaceholder="admin.wizard.param_key"
+          valuePlaceholder="admin.wizard.submission_key"
+          context="step"
+        )}}
+    </div>
+  </div>
+{{/wizard-subscription-container}}
 
 {{wizard-links
   itemType="field"
@@ -130,5 +114,6 @@
     currentFieldId=currentField.id
     fieldTypes=fieldTypes
     removeField="removeField"
-    wizardFields=wizardFields}}
+    wizardFields=wizardFields
+    subscribed=subscribed}}
 {{/each}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-links.hbs b/assets/javascripts/discourse/templates/components/wizard-links.hbs
index a7a7662e..368acd35 100644
--- a/assets/javascripts/discourse/templates/components/wizard-links.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-links.hbs
@@ -4,17 +4,16 @@
   {{#if anyLinks}}
     {{#each links as |link|}}
       <div data-id={{link.id}}>
-        {{d-button action="change" actionParam=link.id translatedLabel=link.label class=link.classes}}
+        {{d-button action=(action "change") actionParam=link.id translatedLabel=link.label class=link.classes}}
         {{#unless link.first}}
-          {{d-button action="back" actionParam=link icon="arrow-left" class="back"}}
+          {{d-button action=(action "back") actionParam=link icon="arrow-left" class="back"}}
         {{/unless}}
         {{#unless link.last}}
-          {{d-button action="forward" actionParam=link icon="arrow-right" class="forward"}}
+          {{d-button action=(action "forward") actionParam=link icon="arrow-right" class="forward"}}
         {{/unless}}
-        {{d-button action="remove" actionParam=link.id icon="times" class="remove"}}
+        {{d-button action=(action "remove") actionParam=link.id icon="times" class="remove"}}
       </div>
     {{/each}}
   {{/if}}
-  {{d-button action="add" label="admin.wizard.add" icon="plus"}}
+  {{d-button action=(action "add") label="admin.wizard.add" icon="plus"}}
 </div>
-
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper.hbs
index 2de35e0d..c0cc6818 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper.hbs
@@ -15,6 +15,6 @@
 
 {{#if canAdd}}
   <span class="add-mapper-input">
-    {{d-button action="add" label="admin.wizard.add" icon="plus"}}
+    {{d-button action=(action "add") label="admin.wizard.add" icon="plus"}}
   </span>
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs b/assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs
index cd1298a9..8269d6ca 100644
--- a/assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs
@@ -1,50 +1,53 @@
-<h3>{{i18n "admin.wizard.field.validations.header"}}</h3>
-
-<ul>
-  {{#each-in field.validations as |type props|}}
-    <li>
-      <span class="setting-title">
-        <h4>{{i18n (concat "admin.wizard.field.validations." type)}}</h4>
-        {{input type="checkbox" checked=props.status}}
-        {{i18n "admin.wizard.field.validations.enabled"}}
-      </span>
-      <div class="validation-container">
-        <div class="validation-section">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.field.validations.categories"}}</label>
+<div class="setting-label">
+  <label>{{i18n "admin.wizard.field.validations.header"}}</label>
+</div>
+<div class="setting-value full">
+  <ul>
+    {{#each-in field.validations as |type props|}}
+      <li>
+        <span class="setting-title">
+          <h4>{{i18n (concat "admin.wizard.field.validations." type)}}</h4>
+          {{input type="checkbox" checked=props.status}}
+          {{i18n "admin.wizard.field.validations.enabled"}}
+        </span>
+        <div class="validation-container">
+          <div class="validation-section">
+            <div class="setting-label">
+              <label>{{i18n "admin.wizard.field.validations.categories"}}</label>
+            </div>
+            <div class="setting-value">
+              {{category-selector
+                  categories=(get this (concat "validationBuffer." type ".categories"))
+                  onChange=(action "updateValidationCategories" type props)
+                  class="wizard"}}
+            </div>
           </div>
-          <div class="setting-value">
-            {{category-selector
-                categories=(get this (concat "validationBuffer." type ".categories"))
-                onChange=(action "updateValidationCategories" type props)
-                class="wizard"}}
+          <div class="validation-section">
+            <div class="setting-label">
+              <label>{{i18n "admin.wizard.field.validations.max_topic_age"}}</label>
+            </div>
+            <div class="setting-value">
+              {{input type="number" class="time-n-value" value=props.time_n_value}}
+              {{combo-box
+                  value=(readonly props.time_unit)
+                  content=timeUnits
+                  class="time-unit-selector"
+                  onChange=(action (mut props.time_unit))}}
+            </div>
+          </div>
+          <div class="validation-section">
+            <div class="setting-label">
+              <label>{{i18n "admin.wizard.field.validations.position"}}</label>
+            </div>
+            <div class="setting-value">
+              {{radio-button name=(concat type field.id) value="above" selection=props.position}}
+              <span>{{i18n "admin.wizard.field.validations.above"}}</span>
+              {{radio-button name=(concat type field.id) value="below" selection=props.position}}
+              <span>{{i18n "admin.wizard.field.validations.below"}}</span>
+            </div>
           </div>
         </div>
-        <div class="validation-section">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.field.validations.max_topic_age"}}</label>
-          </div>
-          <div class="setting-value">
-            {{input type="number" class="time-n-value" value=props.time_n_value}}
-            {{combo-box
-                value=(readonly props.time_unit)
-                content=timeUnits
-                class="time-unit-selector"
-                onChange=(action (mut props.time_unit))}}
-          </div>
-        </div>
-        <div class="validation-section">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.field.validations.position"}}</label>
-          </div>
-          <div class="setting-value">
-            {{radio-button name=(concat type field.id) value="above" selection=props.position}}
-            {{i18n "admin.wizard.field.validations.above"}}
-            {{radio-button name=(concat type field.id) value="below" selection=props.position}}
-            {{i18n "admin.wizard.field.validations.below"}}
-          </div>
-        </div>
-      </div>
-    </li>
-  {{/each-in}}
-</ul>
+      </li>
+    {{/each-in}}
+  </ul>
+</div>
diff --git a/assets/javascripts/discourse/templates/components/wizard-subscription-badge.hbs b/assets/javascripts/discourse/templates/components/wizard-subscription-badge.hbs
new file mode 100644
index 00000000..b2ce05bc5
--- /dev/null
+++ b/assets/javascripts/discourse/templates/components/wizard-subscription-badge.hbs
@@ -0,0 +1,6 @@
+<svg width="300px" height="300px" viewBox="0 0 300 300" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g id="pavilion-logo" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <path id="Combined-Shape" stroke="currentColor" stroke-width="35" d="M41.1381822,291.00006 L40.5778853,130.009744 M258.850727,291.638415 L259.290397,130.37133 M36.0002279,140.721678 L139.995368,36.2122772 M263.350577,141.009083 L138.927245,16.2478517"></path>
+  </g>
+</svg>
+<span>{{label}}</span>
diff --git a/assets/javascripts/discourse/templates/components/wizard-subscription-container.hbs b/assets/javascripts/discourse/templates/components/wizard-subscription-container.hbs
new file mode 100644
index 00000000..01d436f5
--- /dev/null
+++ b/assets/javascripts/discourse/templates/components/wizard-subscription-container.hbs
@@ -0,0 +1,12 @@
+<div class="subscription-header">
+  <h4>{{i18n "admin.wizard.subscription.title"}}</h4>
+
+  <a href={{subscriptionLink}} title={{i18n subscribedTitle}}>
+    {{d-icon subscribedIcon}}
+    {{i18n subscribedLabel}}
+  </a>
+</div>
+
+<div class="subscription-settings">
+  {{yield}}
+</div>
diff --git a/assets/javascripts/discourse/templates/components/wizard-subscription-cta.hbs b/assets/javascripts/discourse/templates/components/wizard-subscription-cta.hbs
new file mode 100644
index 00000000..00569756
--- /dev/null
+++ b/assets/javascripts/discourse/templates/components/wizard-subscription-cta.hbs
@@ -0,0 +1 @@
+{{d-icon icon}}{{label}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-header.hbs b/assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-header.hbs
new file mode 100644
index 00000000..d91e90f1
--- /dev/null
+++ b/assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-header.hbs
@@ -0,0 +1,15 @@
+<div class="select-kit-header-wrapper">
+
+  {{component selectKit.options.selectedNameComponent
+    tabindex=tabindex
+    item=selectedContent
+    selectKit=selectKit
+    shouldDisplayClearableButton=shouldDisplayClearableButton
+  }}
+
+  {{#if subscriptionRequired}}
+    <span class="subscription-label">{{i18n selectorLabel}}</span>
+  {{/if}}
+
+  {{d-icon caretIcon class="caret-icon"}}
+</div>
diff --git a/assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-row.hbs b/assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-row.hbs
new file mode 100644
index 00000000..de24fd75
--- /dev/null
+++ b/assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-row.hbs
@@ -0,0 +1,15 @@
+{{#if icons}}
+  <div class="icons">
+    <span class="selection-indicator"></span>
+    {{#each icons as |icon|}}
+      {{d-icon icon translatedtitle=(dasherize title)}}
+    {{/each}}
+  </div>
+{{/if}}
+
+<div class="texts">
+  <span class="name">{{html-safe label}}</span>
+  {{#if item.subscriptionRequired}}
+    <span class="subscription-label">{{i18n item.selectorLabel}}</span>
+  {{/if}}
+</div>
diff --git a/assets/javascripts/discourse/templates/components/wizard-table-field.hbs b/assets/javascripts/discourse/templates/components/wizard-table-field.hbs
new file mode 100644
index 00000000..bd7da5c4
--- /dev/null
+++ b/assets/javascripts/discourse/templates/components/wizard-table-field.hbs
@@ -0,0 +1,161 @@
+{{#if hasValue}}
+  {{#if isText}}
+    {{value.value}}
+  {{/if}}
+
+  {{#if isLongtext}}
+    <div class="wizard-table-long-text">
+      <p class="wizard-table-long-text-content {{textState}}">
+        {{value.value}}
+      </p>
+      <a href {{action "expandText"}}>
+        {{toggleText}}
+      </a>
+    </div>
+  {{/if}}
+
+  {{#if isComposer}}
+    <div class="wizard-table-long-text">
+      <p class="wizard-table-composer-text wizard-table-long-text-content {{textState}}">
+        {{value.value}}
+      </p>
+      <a href {{action "expandText"}}>
+        {{toggleText}}
+      </a>
+    </div>
+  {{/if}}
+
+  {{#if isComposerPreview}}
+    {{d-icon "comment-alt"}}
+    <span class="wizard-table-composer-text">
+      {{i18n "admin.wizard.submissions.composer_preview"}}: {{value.value}}
+    </span>
+  {{/if}}
+
+  {{#if isTextOnly}}
+    {{value.value}}
+  {{/if}}
+
+  {{#if isDate}}
+    <span class="wizard-table-icon-item">
+      {{d-icon "calendar"}}{{value.value}}
+    </span>
+  {{/if}}
+
+  {{#if isTime}}
+    <span class="wizard-table-icon-item">
+      {{d-icon "clock"}}{{value.value}}
+    </span>
+  {{/if}}
+
+  {{#if isDateTime}}
+    <span class="wizard-table-icon-item" title={{value.value}}>
+      {{d-icon "calendar"}}{{format-date value.value format="medium"}}
+    </span>
+  {{/if}}
+
+  {{#if isNumber}}
+    {{value.value}}
+  {{/if}}
+
+  {{#if isCheckbox}}
+    {{#if checkboxValue}}
+      <span class="wizard-table-icon-item checkbox-true">
+        {{d-icon "check"}}{{value.value}}
+      </span>
+    {{else}}
+      <span class="wizard-table-icon-item checkbox-false">
+        {{d-icon "times"}}{{value.value}}
+      </span>
+    {{/if}}
+  {{/if}}
+
+  {{#if isUrl}}
+    <span class="wizard-table-icon-item url">
+      {{d-icon "link"}}
+      <a target="_blank" rel="noopener noreferrer" href={{value.value}}>
+        {{value.value}}
+      </a>
+    </span>
+  {{/if}}
+
+  {{#if isUpload}}
+    <a
+      target="_blank"
+      rel="noopener noreferrer"
+      class="attachment"
+      href={{file.url}}
+      download
+    >
+      {{file.original_filename}}
+    </a>
+  {{/if}}
+
+  {{#if isDropdown}}
+    <span class="wizard-table-icon-item">
+      {{d-icon "check-square"}}
+      {{value.value}}
+    </span>
+  {{/if}}
+
+  {{#if isTag}}
+    {{#each value.value as |tag|}}
+      {{discourse-tag tag}}
+    {{/each}}
+  {{/if}}
+
+  {{#if isCategory}}
+    <strong>
+      {{i18n "admin.wizard.submissions.category_id"}}:
+    </strong>
+    <a
+      target="_blank"
+      rel="noopener noreferrer"
+      href={{categoryUrl}}
+      title={{value.value}}
+    >
+      {{value.value}}
+    </a>
+  {{/if}}
+
+  {{#if isGroup}}
+    <strong>
+      {{i18n "admin.wizard.submissions.group_id"}}:
+    </strong>
+    {{value.value}}
+  {{/if}}
+
+  {{#if isUserSelector}}
+    {{#each submittedUsers as |user|}}
+      {{d-icon "user"}}
+      <a
+        target="_blank"
+        rel="noopener noreferrer"
+        href={{user.url}}
+        title={{user.username}}
+      >
+        {{user.username}}
+      </a>
+    {{/each}}
+  {{/if}}
+
+  {{#if isUser}}
+    {{#link-to "user" value}}
+      {{avatar value imageSize="tiny"}}
+    {{/link-to}}
+  {{/if}}
+
+  {{#if showUsername}}
+    <a target="_blank" rel="noopener noreferrer" href={{userProfileUrl}} title={{username}}>
+      {{username}}
+    </a>
+  {{/if}}
+
+  {{#if isSubmittedAt}}
+    <span class="date" title={{value.value}}>
+      {{d-icon "clock"}}{{format-date value format="tiny"}}
+    </span>
+  {{/if}}
+{{else}}
+  &mdash;
+{{/if}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs b/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
index c657049d..37a3e549 100644
--- a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
@@ -6,13 +6,13 @@
 <div class="wizard-editor-gutter">
   {{#if previewEnabled}}
     {{d-button
-      action="togglePreview"
+      action=(action "togglePreview")
       translatedLabel=previewLabel}}
   {{/if}}
 
   {{#if fieldsEnabled}}
     {{d-button
-      action="togglePopover"
+      action=(action "togglePopover")
       translatedLabel=popoverLabel}}
 
     {{#if showPopover}}
diff --git a/assets/javascripts/discourse/templates/modal/admin-wizards-columns.hbs b/assets/javascripts/discourse/templates/modal/admin-wizards-columns.hbs
new file mode 100644
index 00000000..eb5218b1
--- /dev/null
+++ b/assets/javascripts/discourse/templates/modal/admin-wizards-columns.hbs
@@ -0,0 +1,32 @@
+{{#d-modal-body title="admin.wizard.edit_columns"}}
+  {{#if loading}}
+    {{loading-spinner size="large"}}
+  {{else}}
+    <div class="edit-directory-columns-container">
+      {{#each model.columns as |column|}}
+        <div class="edit-directory-column">
+          <div class="left-content">
+            <label class="column-name">
+              {{input type="checkbox" checked=column.enabled}}
+              {{directory-table-header-title field=column.label translated=true}}
+            </label>
+          </div>
+        </div>
+      {{/each}}
+    </div>
+  {{/if}}
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button
+    class="btn-primary"
+    label="directory.edit_columns.save"
+    action=(action "save")
+  }}
+
+  {{d-button
+    class="btn-secondary reset-to-default"
+    label="directory.edit_columns.reset_to_default"
+    action=(action "resetToDefault")
+  }}
+</div>
diff --git a/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs b/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs
index 1b138360..cbc9d610 100644
--- a/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs
+++ b/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs
@@ -9,7 +9,7 @@
 
 <div class="modal-footer">
   {{d-button
-    action="submit"
+    action=(action "submit")
     class="btn-primary"
     label="admin.wizard.after_time_modal.done"
     disabled=submitDisabled}}
diff --git a/assets/stylesheets/common/wizard-admin.scss b/assets/stylesheets/common/admin.scss
similarity index 70%
rename from assets/stylesheets/common/wizard-admin.scss
rename to assets/stylesheets/common/admin.scss
index 5aa98db8..9c23d498 100644
--- a/assets/stylesheets/common/wizard-admin.scss
+++ b/assets/stylesheets/common/admin.scss
@@ -1,7 +1,13 @@
-@import "wizard-mapper";
-@import "wizard-manager";
-@import "wizard-api";
+@import "admin/mapper";
+@import "admin/manager";
+@import "admin/api";
 @import "common/components/buttons";
+@import "admin/variables";
+
+$expired: #339b18;
+$info: #038ae7;
+$warning: #d47e00;
+$error: #ef1700;
 
 .announcement {
   margin-left: auto;
@@ -25,11 +31,24 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-bottom: 20px;
+  margin-bottom: 10px;
+  min-height: 34px;
 
   & + .wizard-message + div {
     margin-top: 20px;
   }
+
+  h3 {
+    margin-bottom: 0;
+  }
+}
+
+.admin-wizards .admin-actions {
+  display: flex;
+
+  .btn-pavilion-support {
+    margin-left: 10px;
+  }
 }
 
 .wizard-message {
@@ -78,35 +97,68 @@
     }
   }
 
-  & + div {
+  & + div,
+  & + div + div {
     margin-top: 30px;
   }
 }
 
-.wizard-submissions {
+.wizard-table {
   overflow: scroll;
 
-  table td {
+  table td:not(.small) {
     min-width: 150px;
   }
-}
 
-.admin-wizards-logs {
-  .admin-wizard-controls {
-    h3 {
-      margin: 0 7px;
+  table thead th {
+    text-transform: capitalize;
+  }
+
+  .wizard-table-icon-item {
+    display: flex;
+    align-items: center;
+
+    svg {
+      margin-right: 5px;
     }
   }
 
-  .wizard-logs {
-    .date {
-      width: 100px;
+  .wizard-table-checkbox-true {
+    text-transform: capitalize;
+    color: var(--success);
+  }
+
+  .wizard-table-checkbox-false {
+    text-transform: capitalize;
+    color: var(--danger);
+  }
+
+  .wizard-table-long-text {
+    &-content {
+      white-space: nowrap;
+      word-wrap: break-word;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      width: 250px;
+      margin-bottom: 0;
+
+      &.text-expanded {
+        white-space: normal;
+      }
     }
+
+    a {
+      font-size: var(--font-down-1);
+    }
+  }
+
+  .wizard-table-composer-text {
+    font-family: monospace;
   }
 }
 
 .wizard-settings-parent {
-  padding: 20px;
+  padding: 1em;
   border: 1px solid var(--primary-low);
 }
 
@@ -127,10 +179,20 @@
 
 .wizard-basic-details,
 .wizard-custom-field,
-.advanced-settings {
+.subscription-settings {
   @extend .wizard-settings-group;
 }
 
+.admin-wizard-container.settings {
+  .wizard-settings {
+    .wizard-subscription-container {
+      [class~="setting"] {
+        margin-bottom: 0;
+      }
+    }
+  }
+}
+
 .wizard-custom-field {
   background: transparent;
   background-color: var(--primary-very-low);
@@ -169,6 +231,7 @@
 
 .wizard-header {
   margin-bottom: 20px;
+  display: flex;
 
   &.large {
     font-size: 1.5em;
@@ -187,6 +250,10 @@
       margin-bottom: 0;
     }
 
+    button {
+      font-size: 1rem;
+    }
+
     .download-link {
       font-size: 1rem;
       line-height: 20px;
@@ -202,25 +269,28 @@
         font-size: 1rem;
         background-color: var(--primary-low);
       }
-
-      button {
-        font-size: 1rem;
-      }
     }
   }
 
   &.medium {
-    font-size: 1.3em;
+    font-size: 1.2em;
   }
 
   &.small {
     font-size: 1em;
+    font-weight: 700;
     margin-bottom: 5px;
   }
 
   &.underline {
     text-decoration: underline;
   }
+
+  .controls {
+    font-size: 1rem;
+    display: flex;
+    margin-left: auto;
+  }
 }
 
 .admin-wizard-buttons {
@@ -261,7 +331,7 @@
         font-size: 0.85em;
       }
 
-      span {
+      > span {
         font-size: 0.929em;
       }
 
@@ -394,14 +464,16 @@
     .setting-gutter {
       margin-top: 5px;
     }
-  }
 
-  .advanced-settings {
-    width: 100%;
-    margin-top: 30px;
+    &.subscription {
+      .setting-label {
+        display: flex;
+        flex-direction: column;
 
-    [class~="setting"]:first-of-type {
-      border-top: none;
+        label {
+          margin: 0;
+        }
+      }
     }
   }
 
@@ -699,27 +771,59 @@
   }
 }
 
-.realtime-validations > ul {
+.admin-wizard-container.settings .realtime-validations .setting-value > ul {
   list-style: none;
   margin: 0;
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
 
   > li {
-    background-color: var(--primary-low);
+    border: 1px solid var(--primary);
     padding: 1em;
     margin: 0 0 1em 0;
 
-    input {
-      margin-bottom: 0;
+    .setting-title {
+      display: flex;
+      align-items: center;
+
+      h4 {
+        margin: 0 15px 0 0;
+      }
+
+      input[type="checkbox"] {
+        margin: 0 5px 0 0;
+      }
+    }
+
+    .setting-label {
+      width: 100px;
+    }
+
+    .setting-value {
+      display: flex;
+      align-items: center;
+
+      .input .select-kit,
+      > .select-kit {
+        max-width: unset !important;
+      }
+
+      > span {
+        margin-right: 1em;
+      }
     }
   }
 }
 
 .validation-container {
   display: flex;
+  flex-direction: column;
   padding: 1em 0;
 
   .validation-section {
-    width: 250px;
+    min-width: 250px;
+    margin: 0.5em 0;
   }
 }
 
@@ -736,3 +840,113 @@
   width: 80px;
   vertical-align: middle;
 }
+
+.btn.btn-pavilion-support {
+  background: var(--pavilion-primary);
+  color: var(--pavilion-secondary);
+
+  .d-icon {
+    color: var(--pavilion-secondary);
+  }
+
+  &:hover,
+  &:focus {
+    background: darken($pavilion_primary, 5%);
+
+    &[href],
+    svg.d-icon {
+      color: darken($pavilion_secondary, 10%);
+    }
+  }
+}
+
+.wizard-subscription-container {
+  width: 100%;
+  padding: 1em;
+  background-color: rgba($pavilion_primary, 0.1);
+
+  .subscription-header {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 0.25em;
+
+    h3 {
+      margin: 0;
+    }
+
+    a {
+      color: var(--primary);
+    }
+  }
+
+  &:not(.subscribed) .subscription-settings {
+    filter: blur(1px);
+    pointer-events: none;
+  }
+}
+
+.wizard-subscription-badge {
+  display: inline-flex;
+  align-items: center;
+  max-height: 34px;
+  box-sizing: border-box;
+  position: relative;
+  cursor: pointer;
+  padding: 0.5em 0.65em;
+  background-color: rgba($primary-medium, 0.05);
+  border: 1.5px solid rgba($primary-medium, 0.5);
+  color: $primary-medium;
+
+  &:hover {
+    color: $primary-medium;
+  }
+
+  svg {
+    width: 15px;
+    height: 15px;
+    margin-right: 0.45em;
+    margin-bottom: 0.15em;
+  }
+
+  &.standard {
+    background-color: rgba($subscription_standard, 0.05);
+    border: 1.5px solid rgba($subscription_standard, 0.5);
+    color: $subscription_standard;
+  }
+
+  &.business {
+    background-color: $subscription_business;
+    border: 1.5px solid $subscription_business;
+    color: $secondary;
+  }
+
+  &.community {
+    background-color: $subscription_community;
+    border: 1.5px solid $pavilion_primary;
+    color: $pavilion_primary;
+  }
+
+  .d-icon {
+    margin-right: 0.75em;
+  }
+}
+
+.wizard-subscription-selector.select-kit.single-select {
+  .select-kit-row {
+    .texts {
+      display: flex;
+      align-items: center;
+    }
+    &.disabled {
+      background: var(--primary-low);
+      cursor: unset;
+    }
+  }
+
+  .subscription-label {
+    margin-left: 0.75em;
+    padding-top: 0.25em;
+    color: var(--pavilion-primary);
+    font-size: 0.75em;
+  }
+}
diff --git a/assets/stylesheets/common/wizard-api.scss b/assets/stylesheets/common/admin/api.scss
similarity index 90%
rename from assets/stylesheets/common/wizard-api.scss
rename to assets/stylesheets/common/admin/api.scss
index 9d0ad261..29aff22d 100644
--- a/assets/stylesheets/common/wizard-api.scss
+++ b/assets/stylesheets/common/admin/api.scss
@@ -40,9 +40,18 @@
     float: right;
   }
 
-  .wizard-header {
-    overflow: hidden;
-    font-size: 1.3em;
+  .metadata {
+    display: flex;
+
+    .title {
+      margin-right: 1em;
+    }
+
+    .name.saved span {
+      display: inline-block;
+      padding: 6px 12px;
+      background-color: var(--primary-low);
+    }
   }
 }
 
@@ -74,10 +83,6 @@
     width: 50%;
     max-width: 50%;
 
-    .wizard-header {
-      overflow: hidden;
-    }
-
     .authorization {
       float: right;
     }
diff --git a/assets/stylesheets/common/wizard-manager.scss b/assets/stylesheets/common/admin/manager.scss
similarity index 96%
rename from assets/stylesheets/common/wizard-manager.scss
rename to assets/stylesheets/common/admin/manager.scss
index b8df732f..4ad56a78 100644
--- a/assets/stylesheets/common/wizard-manager.scss
+++ b/assets/stylesheets/common/admin/manager.scss
@@ -2,10 +2,6 @@
   display: flex;
   justify-content: flex-start;
 
-  h3 {
-    margin-bottom: 0;
-  }
-
   .buttons {
     display: flex;
     margin-left: auto;
diff --git a/assets/stylesheets/common/wizard-mapper.scss b/assets/stylesheets/common/admin/mapper.scss
similarity index 100%
rename from assets/stylesheets/common/wizard-mapper.scss
rename to assets/stylesheets/common/admin/mapper.scss
diff --git a/assets/stylesheets/common/admin/variables.scss b/assets/stylesheets/common/admin/variables.scss
new file mode 100644
index 00000000..33a67c2d
--- /dev/null
+++ b/assets/stylesheets/common/admin/variables.scss
@@ -0,0 +1,16 @@
+$pavilion_primary: #3c1c8c;
+$pavilion_secondary: #ffffff;
+$pavilion_warning: rgb(243, 163, 61);
+
+$subscription_standard: $pavilion_primary;
+$subscription_business: #333;
+$subscription_community: #fff;
+
+:root {
+  --pavilion-primary: #{$pavilion_primary};
+  --pavilion-secondary: #{$pavilion_secondary};
+  --pavilion-warning: #{$pavilion_warning};
+  --subscription-standard: #{$subscription_standard};
+  --subscription-business: #{$subscription_business};
+  --subscription-community: #{$subscription_community};
+}
diff --git a/assets/stylesheets/common/wizard-custom.scss b/assets/stylesheets/common/wizard-custom.scss
deleted file mode 100644
index bcf05477..00000000
--- a/assets/stylesheets/common/wizard-custom.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-@import "custom/base";
-@import "custom/wizard";
-@import "custom/header";
-@import "custom/step";
-@import "custom/badges";
-@import "custom/buttons";
-@import "custom/field";
-@import "custom/validators";
-@import "custom/mobile";
-@import "custom/autocomplete";
-@import "custom/composer";
-@import "custom/events";
-@import "custom/locations";
-@import "custom/mentionables";
diff --git a/assets/stylesheets/common/wizard.scss b/assets/stylesheets/common/wizard.scss
new file mode 100644
index 00000000..391c3a78
--- /dev/null
+++ b/assets/stylesheets/common/wizard.scss
@@ -0,0 +1,14 @@
+@import "wizard/base";
+@import "wizard/wizard";
+@import "wizard/header";
+@import "wizard/step";
+@import "wizard/badges";
+@import "wizard/buttons";
+@import "wizard/field";
+@import "wizard/validators";
+@import "wizard/mobile";
+@import "wizard/autocomplete";
+@import "wizard/composer";
+@import "wizard/events";
+@import "wizard/locations";
+@import "wizard/mentionables";
diff --git a/assets/stylesheets/common/custom/autocomplete.scss b/assets/stylesheets/common/wizard/autocomplete.scss
similarity index 100%
rename from assets/stylesheets/common/custom/autocomplete.scss
rename to assets/stylesheets/common/wizard/autocomplete.scss
diff --git a/assets/stylesheets/common/custom/badges.scss b/assets/stylesheets/common/wizard/badges.scss
similarity index 100%
rename from assets/stylesheets/common/custom/badges.scss
rename to assets/stylesheets/common/wizard/badges.scss
diff --git a/assets/stylesheets/common/custom/base.scss b/assets/stylesheets/common/wizard/base.scss
similarity index 100%
rename from assets/stylesheets/common/custom/base.scss
rename to assets/stylesheets/common/wizard/base.scss
diff --git a/assets/stylesheets/common/custom/buttons.scss b/assets/stylesheets/common/wizard/buttons.scss
similarity index 100%
rename from assets/stylesheets/common/custom/buttons.scss
rename to assets/stylesheets/common/wizard/buttons.scss
diff --git a/assets/stylesheets/common/custom/composer.scss b/assets/stylesheets/common/wizard/composer.scss
similarity index 100%
rename from assets/stylesheets/common/custom/composer.scss
rename to assets/stylesheets/common/wizard/composer.scss
diff --git a/assets/stylesheets/common/custom/events.scss b/assets/stylesheets/common/wizard/events.scss
similarity index 100%
rename from assets/stylesheets/common/custom/events.scss
rename to assets/stylesheets/common/wizard/events.scss
diff --git a/assets/stylesheets/common/custom/field.scss b/assets/stylesheets/common/wizard/field.scss
similarity index 97%
rename from assets/stylesheets/common/custom/field.scss
rename to assets/stylesheets/common/wizard/field.scss
index b1b15bfe..f710632b 100644
--- a/assets/stylesheets/common/custom/field.scss
+++ b/assets/stylesheets/common/wizard/field.scss
@@ -67,6 +67,10 @@ body.custom-wizard {
       margin-top: 0;
       order: 2;
     }
+
+    & > .field-label + .field-description {
+      margin-left: 0.5em;
+    }
   }
 
   .url-field input {
diff --git a/assets/stylesheets/common/custom/header.scss b/assets/stylesheets/common/wizard/header.scss
similarity index 100%
rename from assets/stylesheets/common/custom/header.scss
rename to assets/stylesheets/common/wizard/header.scss
diff --git a/assets/stylesheets/common/custom/locations.scss b/assets/stylesheets/common/wizard/locations.scss
similarity index 100%
rename from assets/stylesheets/common/custom/locations.scss
rename to assets/stylesheets/common/wizard/locations.scss
diff --git a/assets/stylesheets/common/custom/mentionables.scss b/assets/stylesheets/common/wizard/mentionables.scss
similarity index 100%
rename from assets/stylesheets/common/custom/mentionables.scss
rename to assets/stylesheets/common/wizard/mentionables.scss
diff --git a/assets/stylesheets/common/custom/mobile.scss b/assets/stylesheets/common/wizard/mobile.scss
similarity index 100%
rename from assets/stylesheets/common/custom/mobile.scss
rename to assets/stylesheets/common/wizard/mobile.scss
diff --git a/assets/stylesheets/common/custom/step.scss b/assets/stylesheets/common/wizard/step.scss
similarity index 100%
rename from assets/stylesheets/common/custom/step.scss
rename to assets/stylesheets/common/wizard/step.scss
diff --git a/assets/stylesheets/common/custom/validators.scss b/assets/stylesheets/common/wizard/validators.scss
similarity index 100%
rename from assets/stylesheets/common/custom/validators.scss
rename to assets/stylesheets/common/wizard/validators.scss
diff --git a/assets/stylesheets/common/custom/wizard.scss b/assets/stylesheets/common/wizard/wizard.scss
similarity index 100%
rename from assets/stylesheets/common/custom/wizard.scss
rename to assets/stylesheets/common/wizard/wizard.scss
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ba6d4f17..f140dea7 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -114,8 +114,6 @@ en:
         key: "Key"
         value: "Value"
         profile: "profile"
-        translation: "Translation"
-        translation_placeholder: "key"
         type: "Type"
         none: "Make a selection"
         submission_key: 'submission key'
@@ -128,6 +126,9 @@ en:
         select_type: "Select a type"
         condition: "Condition"
         index: "Index"
+        edit_columns: "Edit Columns"
+        expand_text: "Read More"
+        collapse_text: "Show Less"
         category_settings:
           custom_wizard:
             title: "Custom Wizard"
@@ -160,11 +161,30 @@ en:
             no_file: Please choose a file to import
             file_size_error: The file size must be 512kb or less
             file_format_error: The file must be a .json file
-            server_error: "Error: {{message}}"
             importing: Importing wizards...
             destroying: Destroying wizards...
             import_complete: Import complete
             destroy_complete: Destruction complete
+          subscription:
+            documentation: Check out the subscription documentation
+            authorize: "Authorize this forum to use your Custom Wizard subscription plan on %{server}."
+            not_subscribed: "You've authorized, but are not currently subscribed to a Custom Wizard plan on %{server}."
+            subscription_expiring: "Your subscription is active, but will expire in the next 48 hours."
+            subscription_active: "Your subscription is active."
+            subscription_inactive: "Your subscription is inactive on this forum. Read more in <a href='https://thepavilion.io/t/3652'>the documentation</a>."
+            unauthorized: "You're unauthorized. If you have a subscription, it will become inactive in the next 48 hours."
+            unauthorize_failed: Failed to unauthorize.
+          submissions:
+            select: "Select a wizard to see its submissions"
+            viewing: "You're viewing the submissions of the %{wizardName}"
+            documentation: "Check out the submissions documentation"
+          logs:
+            select: "Select a wizard to see its logs"
+            viewing: "View recent logs for wizards on the forum"
+            documentation: "Check out the logs documentation"
+          notices:
+            info: "Plugin status and subscription notices"
+            documentation: Check out the notices documentation
 
         editor:
           show: "Show"
@@ -227,10 +247,10 @@ en:
           banner: "Banner"
           description: "Description"
           required_data:
-            label: "Required"
+            label: "Required Data"
             not_permitted_message: "Message shown when required data not present"
           permitted_params:
-            label: "Params"
+            label: "Permitted Params"
           force_final:
             label: "Conditional Final Step"
             description: "Display this step as the final step if conditions on later steps have not passed when the user reaches this step."
@@ -247,9 +267,9 @@ en:
           min_length_placeholder: "Minimum length in characters"
           max_length: "Max Length"
           max_length_placeholder: "Maximum length in characters"
-          char_counter: "Character Counter"
+          char_counter: "Counter"
           char_counter_placeholder: "Display Character Counter"
-          field_placeholder: "Field Placeholder"
+          field_placeholder: "Placeholder"
           file_types: "File Types"
           preview_template: "Template"
           limit: "Limit"
@@ -261,7 +281,7 @@ en:
             label: "Format"
             instructions: "<a href='https://momentjs.com/docs/#/displaying/format/' target='_blank'>Moment.js format</a>"
           validations:
-            header: "Realtime Validations"
+            header: "Validations"
             enabled: "Enabled"
             similar_topics: "Similar Topics"
             position: "Position"
@@ -438,6 +458,9 @@ en:
           nav_label: "Submissions"
           title: "{{name}} Submissions"
           download: "Download"
+          group_id: "Group ID"
+          category_id: "Category ID"
+          composer_preview: "Composer Preview"
 
         api:
           label: "API"
@@ -491,9 +514,15 @@ en:
 
           log:
             label: "Logs"
+            clear: clear
 
         log:
           nav_label: "Logs"
+          title: "{{name}} Logs"
+          date: Date
+          action: Action
+          user: User
+          message: Message
 
         manager:
           nav_label: Manager
@@ -505,6 +534,38 @@ en:
           destroy: Destroy
           destroyed: destroyed
 
+        subscription:
+          title: Subscriber Features
+          subscribed:
+            label: Subscribed
+            title: You're subscribed and can use these features
+            selector: subscribed
+          not_subscribed:
+            label: Not Subscribed
+            title: Subscribe to use these features
+            selector: not subscribed
+          type:
+            none:
+              label: Not Subscribed
+              title: There is no Custom Wizard subscription active on this forum.
+            business:
+              label: Business
+              title: There is a Custom Wizard Business subscription active on this forum.
+            standard:
+              label: Standard
+              title: There is a Custom Wizard Standard subscription active on this forum.
+            community:
+              label: Community
+              title: There is a Custom Wizard Community subscription active on this forum.
+          cta:
+            none:
+              label: Get a Subscription
+              title: Get a subscription for this forum.
+            subscribed:
+              label: Support
+              title: Get support for your subscription.
+
+
   wizard_js:
     group:
       select: "Select a group"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 81697e43..08cf5336 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -6,7 +6,7 @@ en:
 
   wizard:
     custom_title: "Wizard"
-    
+
     custom_field:
       error:
         required_attribute: "'%{attr}' is a required attribute"
@@ -17,7 +17,8 @@ en:
         name_too_short: "'%{name}' is too short for a custom field name (min length is #{min_length})"
         name_already_taken: "'%{name}' is already taken as a custom field name"
         save_default: "Failed to save custom field '%{name}'"
-    
+        subscription_type: "%{type} custom fields require a subscription"
+
     field:
       too_short: "%{label} must be at least %{min} characters"
       too_long: "%{label} must not be more than %{max} characters"
@@ -26,25 +27,25 @@ en:
       invalid_file: "%{label} must be a %{types}"
       invalid_date: "Invalid date"
       invalid_time: "Invalid time"
-    
+
     none: "We couldn't find a wizard at that address."
     no_skip: "Wizard can't be skipped"
     export:
       error:
         select_one: "Please select at least one valid wizard"
         invalid_wizards: "No valid wizards selected"
-    
+
     import:
       error:
         no_file: "No file selected"
         file_large: "File too large"
         invalid_json: "File is not a valid json file"
-    
+
     destroy:
       error:
         no_template: No template found
         default: Error destroying wizard
-    
+
     validation:
       required: "%{property} is required"
       conflict: "Wizard with id '%{wizard_id}' already exists"
@@ -52,9 +53,11 @@ en:
       after_signup_after_time: "You can't use 'after time' and 'after signup' on the same wizard."
       after_time: "After time setting is invalid."
       liquid_syntax_error: "Liquid syntax error in %{attribute}: %{message}"
+      subscription: "%{type} %{property} is subscription only" 
 
   site_settings:
     custom_wizard_enabled: "Enable custom wizards."
     wizard_redirect_exclude_paths: "Routes excluded from wizard redirects."
     wizard_recognised_image_upload_formats: "File types which will result in upload displaying an image preview"
     wizard_apis_enabled: "Enable API features (experimental)."
+    wizard_critical_notices_on_dashboard: "Show critical notices about the custom wizard plugin on the admin dashboard."
diff --git a/config/routes.rb b/config/routes.rb
index ee721fad..607a87ac 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -38,6 +38,7 @@ Discourse::Application.routes.append do
     get 'admin/wizards/api/:name/authorize' => 'admin_api#authorize'
 
     get 'admin/wizards/logs' => 'admin_logs#index'
+    get 'admin/wizards/logs/:wizard_id' => 'admin_logs#show'
 
     get 'admin/wizards/manager' => 'admin_manager#index'
     get 'admin/wizards/manager/export' => 'admin_manager#export'
diff --git a/config/settings.yml b/config/settings.yml
index 0d93524d..514462d5 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1,5 +1,5 @@
 plugins:
-  custom_wizard_enabled: 
+  custom_wizard_enabled:
     default: true
     client: true
   wizard_redirect_exclude_paths:
@@ -15,6 +15,6 @@ plugins:
     refresh: true
     type: list
     list_type: compact
-  wizard_apis_enabled:
+  wizard_important_notices_on_dashboard:
     client: true
-    default: false
\ No newline at end of file
+    default: true
diff --git a/db/migrate/20210806135416_split_custom_wizard_log_fields.rb b/db/migrate/20210806135416_split_custom_wizard_log_fields.rb
new file mode 100644
index 00000000..8107bc07
--- /dev/null
+++ b/db/migrate/20210806135416_split_custom_wizard_log_fields.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+class SplitCustomWizardLogFields < ActiveRecord::Migration[6.1]
+  KEY_MAP = {
+    wizard: "wizard_id",
+    action: "action",
+    user: "username",
+    date: "date",
+    message: "message"
+  }
+
+  def change
+    reversible do |dir|
+      dir.up do
+        # separate wizard/action/user into their own keys
+
+        wizard_logs = PluginStoreRow.where("plugin_name = 'custom_wizard_log'")
+
+        if wizard_logs.exists?
+          wizard_logs.each do |row|
+            begin
+              log_json = JSON.parse(row.value)
+            rescue TypeError, JSON::ParserError
+              next
+            end
+
+            if log_json.key?('message') && log_json['message'].is_a?(String)
+
+              attr_strs = []
+
+              # assumes no whitespace in the values
+              attr_strs << log_json['message'].slice!(/(wizard: \S*; )/, 1)
+              attr_strs << log_json['message'].slice!(/(action: \S*; )/, 1)
+              attr_strs << log_json['message'].slice!(/(user: \S*; )/, 1)
+
+              attr_strs.each do |attr_str|
+                if attr_str.is_a? String
+                  attr_str.gsub!(/[;]/ , "")
+                  key, value = attr_str.split(': ')
+                  value.strip! if value
+                  key = KEY_MAP[key.to_sym] ? KEY_MAP[key.to_sym] : key
+                  log_json[key] = value ? value : ''
+                end
+              end
+
+              row.value = log_json.to_json
+              row.save
+            end
+          end
+        end
+      end
+
+      dir.down do
+        wizard_logs = PluginStoreRow.where("plugin_name = 'custom_wizard_log'")
+
+        if wizard_logs.exists?
+          wizard_logs.each do |row|
+            begin
+              log_json = JSON.parse(row.value)
+            rescue TypeError, JSON::ParserError
+              next
+            end
+
+            # concatenate wizard/action/user to start of message
+            prefixes = log_json.extract!('wizard_id', 'action', 'username')
+            message_prefix = ""
+
+            if prefixes.present?
+              message_prefix = prefixes.map do |k, v|
+                key = KEY_MAP.key(k) ? KEY_MAP.key(k) : k
+                "#{key.to_s}: #{v};"
+              end.join(' ')
+            end
+
+            if log_json.key?('message')
+              message = log_json['message']
+              message = "#{message_prefix} #{message}" if message_prefix.present?
+              log_json['message'] = message
+            else
+              log_json['message'] = message_prefix
+            end
+
+            row.value = log_json.to_json
+            row.save
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/custom_wizard/action.rb b/lib/custom_wizard/action.rb
index 8eed64b2..5917a1bc 100644
--- a/lib/custom_wizard/action.rb
+++ b/lib/custom_wizard/action.rb
@@ -763,14 +763,11 @@ class CustomWizard::Action
   end
 
   def save_log
-    log = "wizard: #{@wizard.id}; action: #{action['type']}; user: #{user.username}"
-
-    if @log.any?
-      @log.each do |item|
-        log += "; #{item.to_s}"
-      end
-    end
-
-    CustomWizard::Log.create(log)
+    CustomWizard::Log.create(
+      @wizard.id,
+      action['type'],
+      user.username,
+      @log.join('; ')
+    )
   end
 end
diff --git a/lib/custom_wizard/api/endpoint.rb b/lib/custom_wizard/api/endpoint.rb
index 9dbbc590..97fc1127 100644
--- a/lib/custom_wizard/api/endpoint.rb
+++ b/lib/custom_wizard/api/endpoint.rb
@@ -74,7 +74,7 @@ class CustomWizard::Api::Endpoint
     headers["Authorization"] = auth_string if auth_string
     headers["Content-Type"] = content_type if content_type
 
-    connection = Excon.new(UrlHelper.encode_and_parse(endpoint.url), headers: headers)
+    connection = Excon.new(endpoint.url, headers: headers)
 
     params = { method: endpoint.method }
 
diff --git a/lib/custom_wizard/api/log_entry.rb b/lib/custom_wizard/api/log_entry.rb
index 3fe2969e..31af514e 100644
--- a/lib/custom_wizard/api/log_entry.rb
+++ b/lib/custom_wizard/api/log_entry.rb
@@ -27,7 +27,7 @@ class CustomWizard::Api::LogEntry
       log_id = new_data['log_id']
     else
       data = {}
-      log_id = SecureRandom.hex(3)
+      log_id = SecureRandom.hex(8)
     end
 
     new_data.each do |k, v|
diff --git a/lib/custom_wizard/builder.rb b/lib/custom_wizard/builder.rb
index 91f8671e..251ec1e5 100644
--- a/lib/custom_wizard/builder.rb
+++ b/lib/custom_wizard/builder.rb
@@ -21,13 +21,6 @@ class CustomWizard::Builder
     @sorted_handlers.sort_by! { |h| -h[:priority] }
   end
 
-  def mapper
-    CustomWizard::Mapper.new(
-      user: @wizard.user,
-      data: @wizard.current_submission&.fields_and_meta
-    )
-  end
-
   def build(build_opts = {}, params = {})
     return nil if !SiteSetting.custom_wizard_enabled || !@wizard
     return @wizard if !@wizard.can_access? && !build_opts[:force]
@@ -79,6 +72,32 @@ class CustomWizard::Builder
     @wizard
   end
 
+  def check_condition(template)
+    if template['condition'].present?
+      result = CustomWizard::Mapper.new(
+        inputs: template['condition'],
+        user: @wizard.user,
+        data: @wizard.current_submission&.fields_and_meta,
+        opts: {
+          multiple: true
+        }
+      ).perform
+
+      result.any?
+    else
+      true
+    end
+  end
+
+  private
+
+  def mapper
+    CustomWizard::Mapper.new(
+      user: @wizard.user,
+      data: @wizard.current_submission&.fields_and_meta
+    )
+  end
+
   def append_field(step, step_template, field_template, build_opts)
     params = {
       id: field_template['id'],
@@ -201,23 +220,6 @@ class CustomWizard::Builder
     end
   end
 
-  def check_condition(template)
-    if template['condition'].present?
-      result = CustomWizard::Mapper.new(
-        inputs: template['condition'],
-        user: @wizard.user,
-        data: @wizard.current_submission&.fields_and_meta,
-        opts: {
-          multiple: true
-        }
-      ).perform
-
-      result.any?
-    else
-      true
-    end
-  end
-
   def check_if_permitted(step, step_template)
     step.permitted = true
 
diff --git a/lib/custom_wizard/custom_field.rb b/lib/custom_wizard/custom_field.rb
index 9cc185ba..29423ec6 100644
--- a/lib/custom_wizard/custom_field.rb
+++ b/lib/custom_wizard/custom_field.rb
@@ -17,6 +17,7 @@ class ::CustomWizard::CustomField
     category: ["basic_category"],
     post: ["post"]
   }
+
   TYPES ||= ["string", "boolean", "integer", "json"]
   LIST_CACHE_KEY ||= 'custom_field_list'
 
@@ -37,6 +38,8 @@ class ::CustomWizard::CustomField
         send("#{attr}=", value)
       end
     end
+
+    @subscription = CustomWizard::Subscription.new
   end
 
   def save
@@ -81,6 +84,10 @@ class ::CustomWizard::CustomField
         next
       end
 
+      if attr == 'klass' && !@subscription.includes?(:custom_field, :klass, value)
+        add_error(I18n.t("wizard.custom_field.error.subscription_type", type: value))
+      end
+
       if attr == 'serializers' && (unsupported = value - CLASSES[klass.to_sym]).length > 0
         add_error(I18n.t("#{i18n_key}.unsupported_serializers",
           class: klass,
@@ -92,6 +99,10 @@ class ::CustomWizard::CustomField
         add_error(I18n.t("#{i18n_key}.unsupported_type", type: value))
       end
 
+      if attr == 'type' && !@subscription.includes?(:custom_field, :type, value)
+        add_error(I18n.t("wizard.custom_field.error.subscription_type", type: value))
+      end
+
       if attr == 'name'
         unless value.is_a?(String)
           add_error(I18n.t("#{i18n_key}.name_invalid", name: value))
diff --git a/lib/custom_wizard/field.rb b/lib/custom_wizard/field.rb
index c39c2753..600f685e 100644
--- a/lib/custom_wizard/field.rb
+++ b/lib/custom_wizard/field.rb
@@ -12,7 +12,6 @@ class CustomWizard::Field
               :description,
               :image,
               :image_upload_id,
-              :key,
               :validations,
               :min_length,
               :max_length,
@@ -38,7 +37,6 @@ class CustomWizard::Field
     @value = attrs[:value] || default_value
     @description = attrs[:description]
     @image = attrs[:image]
-    @key = attrs[:key]
     @validations = attrs[:validations]
     @min_length = attrs[:min_length]
     @max_length = attrs[:max_length]
diff --git a/lib/custom_wizard/log.rb b/lib/custom_wizard/log.rb
index fc747440..cb5b78c7 100644
--- a/lib/custom_wizard/log.rb
+++ b/lib/custom_wizard/log.rb
@@ -2,40 +2,51 @@
 class CustomWizard::Log
   include ActiveModel::Serialization
 
-  attr_accessor :message, :date
+  attr_reader :date, :wizard_id, :action, :username, :message
+  attr_accessor :user
 
   PAGE_LIMIT = 100
 
   def initialize(attrs)
-    @message = attrs['message']
     @date = attrs['date']
+    @action = attrs['action']
+    @message = attrs['message']
+    @wizard_id = attrs['wizard_id']
+    @username = attrs['username']
   end
 
-  def self.create(message)
+  def self.create(wizard_id, action, username, message)
     log_id = SecureRandom.hex(12)
 
     PluginStore.set('custom_wizard_log',
       log_id.to_s,
       {
         date: Time.now,
+        wizard_id: wizard_id,
+        action: action,
+        username: username,
         message: message
       }
     )
   end
 
-  def self.list_query
-    PluginStoreRow.where("
-      plugin_name = 'custom_wizard_log' AND
-      (value::json->'date') IS NOT NULL
-    ").order("value::json->>'date' DESC")
+  def self.list_query(wizard_id = nil)
+    query = PluginStoreRow.where("plugin_name = 'custom_wizard_log' AND (value::json->'date') IS NOT NULL")
+    query = query.where("(value::json->>'wizard_id') = ?", wizard_id) if wizard_id
+    query.order("value::json->>'date' DESC")
   end
 
-  def self.list(page = 0, limit = nil)
+  def self.list(page = 0, limit = nil, wizard_id = nil)
     limit = limit.to_i > 0 ? limit.to_i : PAGE_LIMIT
     page = page.to_i
+    logs = self.list_query(wizard_id)
 
-    self.list_query.limit(limit)
+    result = OpenStruct.new(logs: [], total: nil)
+    result.total = logs.size
+    result.logs = logs.limit(limit)
       .offset(page * limit)
       .map { |r| self.new(JSON.parse(r.value)) }
+
+    result
   end
 end
diff --git a/lib/custom_wizard/mapper.rb b/lib/custom_wizard/mapper.rb
index 0ded76cf..aa444de1 100644
--- a/lib/custom_wizard/mapper.rb
+++ b/lib/custom_wizard/mapper.rb
@@ -251,7 +251,7 @@ class CustomWizard::Mapper
       end
     end
 
-    if opts[:template]
+    if opts[:template] && CustomWizard::Subscription.subscribed?
       template = Liquid::Template.parse(string)
       string = template.render(data)
     end
diff --git a/lib/custom_wizard/step.rb b/lib/custom_wizard/step.rb
index b6ba5910..4bc7c68b 100644
--- a/lib/custom_wizard/step.rb
+++ b/lib/custom_wizard/step.rb
@@ -9,7 +9,6 @@ class CustomWizard::Step
   attr_accessor :index,
                 :title,
                 :description,
-                :key,
                 :permitted,
                 :permitted_message,
                 :fields,
diff --git a/lib/custom_wizard/submission.rb b/lib/custom_wizard/submission.rb
index 61bb008a..89de50bf 100644
--- a/lib/custom_wizard/submission.rb
+++ b/lib/custom_wizard/submission.rb
@@ -2,6 +2,7 @@
 class CustomWizard::Submission
   include ActiveModel::SerializerSupport
 
+  PAGE_LIMIT = 50
   KEY ||= "submissions"
   META ||= %w(updated_at submitted_at route_to redirect_on_complete redirect_to)
 
@@ -44,7 +45,7 @@ class CustomWizard::Submission
     validate
 
     submission_list = self.class.list(wizard, user_id: user.id)
-    submissions = submission_list.select { |submission| submission.id != self.id }
+    submissions = submission_list.submissions.select { |submission| submission.id != self.id }
     self.updated_at = Time.now.iso8601
     submissions.push(self)
 
@@ -93,7 +94,7 @@ class CustomWizard::Submission
   end
 
   def self.get(wizard, user_id)
-    data = PluginStore.get("#{wizard.id}_#{KEY}", user_id).first
+    data = PluginStore.get("#{wizard.id}_#{KEY}", user_id).last
     new(wizard, data, user_id)
   end
 
@@ -111,7 +112,7 @@ class CustomWizard::Submission
   def self.cleanup_incomplete_submissions(wizard)
     user_id = wizard.user.id
     all_submissions = list(wizard, user_id: user_id)
-    sorted_submissions = all_submissions.sort_by do |submission|
+    sorted_submissions = all_submissions.submissions.sort_by do |submission|
       zero_epoch_time = DateTime.strptime("0", '%s')
       [
         submission.submitted_at ? Time.iso8601(submission.submitted_at) : zero_epoch_time,
@@ -131,23 +132,34 @@ class CustomWizard::Submission
     PluginStore.set("#{wizard.id}_#{KEY}", user_id, valid_data)
   end
 
-  def self.list(wizard, user_id: nil, order_by: nil)
+  def self.list(wizard, user_id: nil, order_by: nil, page: nil)
     params = { plugin_name: "#{wizard.id}_#{KEY}" }
     params[:key] = user_id if user_id.present?
 
     query = PluginStoreRow.where(params)
-    query = query.order("#{order_by} DESC") if order_by.present?
-
-    result = []
+    result = OpenStruct.new(submissions: [], total: nil)
 
     query.each do |record|
       if (submission_data = ::JSON.parse(record.value)).any?
         submission_data.each do |data|
-          result.push(new(wizard, data, record.key))
+          result.submissions.push(new(wizard, data, record.key))
         end
       end
     end
 
+    result.total = result.submissions.size
+
+    if !page.nil?
+      start = page * PAGE_LIMIT
+      length = PAGE_LIMIT
+
+      if result.submissions.length > start
+        result.submissions = result.submissions[start, length]
+      else
+        result.submissions = []
+      end
+    end
+
     result
   end
 end
diff --git a/lib/custom_wizard/subscription.rb b/lib/custom_wizard/subscription.rb
new file mode 100644
index 00000000..06e8bd76
--- /dev/null
+++ b/lib/custom_wizard/subscription.rb
@@ -0,0 +1,193 @@
+# frozen_string_literal: true
+class CustomWizard::Subscription
+  STANDARD_PRODUCT_ID = 'prod_MH11woVoZU5AWb'
+  BUSINESS_PRODUCT_ID = 'prod_MH0wT627okh3Ef'
+  COMMUNITY_PRODUCT_ID = 'prod_MU7l9EjxhaukZ7'
+
+  def self.attributes
+    {
+      wizard: {
+        required: {
+          none: [],
+          standard: ['*'],
+          business: ['*'],
+          community: ['*']
+        },
+        permitted: {
+          none: [],
+          standard: ['*'],
+          business: ['*'],
+          community: ['*']
+        }
+      },
+      step: {
+        condition: {
+          none: [],
+          standard: ['*'],
+          business: ['*'],
+          community: ['*']
+        },
+        index: {
+          none: [],
+          standard: ['*'],
+          business: ['*'],
+          community: ['*']
+        },
+        required_data: {
+          none: [],
+          standard: ['*'],
+          business: ['*'],
+          community: ['*']
+        },
+        permitted_params: {
+          none: [],
+          standard: ['*'],
+          business: ['*'],
+          community: ['*']
+        }
+      },
+      field: {
+        condition: {
+          none: [],
+          standard: ['*'],
+          business: ['*'],
+          community: ['*']
+        },
+        index: {
+          none: [],
+          standard: ['*'],
+          business: ['*'],
+          community: ['*']
+        },
+        type: {
+          none: ['text', 'textarea', 'text_only', 'date', 'time', 'date_time', 'number', 'checkbox', 'dropdown', 'upload'],
+          standard: ['*'],
+          business: ['*'],
+          community: ['*']
+        },
+        realtime_validations: {
+          none: [],
+          standard: ['*'],
+          business: ['*'],
+          community: ['*']
+        }
+      },
+      action: {
+        type: {
+          none: ['create_topic', 'update_profile', 'open_composer', 'route_to'],
+          standard: ['create_topic', 'update_profile', 'open_composer', 'route_to', 'send_message', 'watch_categories', 'add_to_group'],
+          business: ['*'],
+          community: ['*']
+        }
+      },
+      custom_field: {
+        klass: {
+          none: ['topic', 'post'],
+          standard: ['topic', 'post'],
+          business: ['*'],
+          community: ['*']
+        },
+        type: {
+          none: ['string', 'boolean', 'integer'],
+          standard: ['string', 'boolean', 'integer'],
+          business: ['*'],
+          community: ['*']
+        }
+      }
+    }
+  end
+
+  def initialize
+    @subscription = find_subscription
+  end
+
+  def includes?(feature, attribute, value)
+    attributes = self.class.attributes[feature]
+
+    ## Attribute is not part of a subscription
+    return true unless attributes.present? && attributes.key?(attribute)
+
+    values = attributes[attribute][type]
+
+    ## Subscription type does not support the attribute.
+    return false if values.blank?
+
+    ## Subscription type supports all values of the attribute.
+    return true if values.first === "*"
+
+    ## Subscription type supports some values of the attributes.
+    values.include?(value)
+  end
+
+  def type
+    return :none unless subscribed?
+    return :standard if standard?
+    return :business if business?
+    return :community if community?
+  end
+
+  def subscribed?
+    standard? || business? || community?
+  end
+
+  def standard?
+    @subscription.product_id === STANDARD_PRODUCT_ID
+  end
+
+  def business?
+    @subscription.product_id === BUSINESS_PRODUCT_ID
+  end
+
+  def community?
+    @subscription.product_id === COMMUNITY_PRODUCT_ID
+  end
+
+  def client_installed?
+    defined?(SubscriptionClient) == 'constant' && SubscriptionClient.class == Module
+  end
+
+  def find_subscription
+    subscription = nil
+
+    if client_installed?
+      subscription = SubscriptionClientSubscription.active
+        .where(product_id: [STANDARD_PRODUCT_ID, BUSINESS_PRODUCT_ID, COMMUNITY_PRODUCT_ID])
+        .order("product_id = '#{BUSINESS_PRODUCT_ID}' DESC")
+        .first
+    end
+
+    unless subscription
+      subscription = OpenStruct.new(product_id: nil)
+    end
+
+    subscription
+  end
+
+  def self.subscribed?
+    new.subscribed?
+  end
+
+  def self.business?
+    new.business?
+  end
+
+  def self.community?
+    new.community?
+  end
+
+  def self.standard?
+    new.standard?
+  end
+
+  def self.type
+    new.type
+  end
+
+  def self.client_installed?
+    new.client_installed?
+  end
+
+  def self.includes?(feature, attribute, value)
+    new.includes?(feature, attribute, value)
+  end
+end
diff --git a/lib/custom_wizard/validators/template.rb b/lib/custom_wizard/validators/template.rb
index e2820c97..079f9884 100644
--- a/lib/custom_wizard/validators/template.rb
+++ b/lib/custom_wizard/validators/template.rb
@@ -6,6 +6,7 @@ class CustomWizard::TemplateValidator
   def initialize(data, opts = {})
     @data = data
     @opts = opts
+    @subscription = CustomWizard::Subscription.new
   end
 
   def perform
@@ -15,15 +16,18 @@ class CustomWizard::TemplateValidator
     check_required(data, :wizard)
     validate_after_signup
     validate_after_time
+    validate_subscription(data, :wizard)
 
     return false if errors.any?
 
     data[:steps].each do |step|
       check_required(step, :step)
+      validate_subscription(step, :step)
       validate_liquid_template(step, :step)
 
       if step[:fields].present?
         step[:fields].each do |field|
+          validate_subscription(field, :field)
           check_required(field, :field)
           validate_liquid_template(field, :field)
         end
@@ -32,6 +36,7 @@ class CustomWizard::TemplateValidator
 
     if data[:actions].present?
       data[:actions].each do |action|
+        validate_subscription(action, :action)
         check_required(action, :action)
         validate_liquid_template(action, :action)
       end
@@ -52,13 +57,23 @@ class CustomWizard::TemplateValidator
   private
 
   def check_required(object, type)
-    CustomWizard::TemplateValidator.required[type].each do |property|
+    self.class.required[type].each do |property|
       if object[property].blank?
         errors.add :base, I18n.t("wizard.validation.required", property: property)
       end
     end
   end
 
+  def validate_subscription(object, type)
+    object.keys.each do |property|
+      value = object[property]
+
+      if !@subscription.includes?(type, property.to_sym, value)
+        errors.add :base, I18n.t("wizard.validation.subscription", type: type.to_s, property: property)
+      end
+    end
+  end
+
   def check_id(object, type)
     if type === :wizard && @opts[:create] && CustomWizard::Template.exists?(object[:id])
       errors.add :base, I18n.t("wizard.validation.conflict", wizard_id: object[:id])
diff --git a/lib/custom_wizard/wizard.rb b/lib/custom_wizard/wizard.rb
index 4fb3dd97..223aeaa5 100644
--- a/lib/custom_wizard/wizard.rb
+++ b/lib/custom_wizard/wizard.rb
@@ -31,7 +31,8 @@ class CustomWizard::Wizard
                 :actions,
                 :action_ids,
                 :user,
-                :submissions
+                :submissions,
+                :template
 
   attr_reader   :all_step_ids
 
@@ -77,6 +78,7 @@ class CustomWizard::Wizard
 
     @actions = attrs['actions'] || []
     @action_ids = @actions.map { |a| a['id'] }
+    @template = attrs
   end
 
   def cast_bool(val)
@@ -262,7 +264,7 @@ class CustomWizard::Wizard
 
   def submissions
     return nil unless user.present?
-    @submissions ||= CustomWizard::Submission.list(self, user_id: user.id)
+    @submissions ||= CustomWizard::Submission.list(self, user_id: user.id).submissions
   end
 
   def current_submission
@@ -312,10 +314,10 @@ class CustomWizard::Wizard
     end
   end
 
-  def self.list(user, template_opts: {}, not_completed: false)
+  def self.list(user, template_opts = {}, not_completed = false)
     return [] unless user
 
-    CustomWizard::Template.list(template_opts).reduce([]) do |result, template|
+    CustomWizard::Template.list(**template_opts).reduce([]) do |result, template|
       wizard = new(template, user)
       result.push(wizard) if wizard.can_access? && (
         !not_completed || !wizard.completed?
@@ -327,7 +329,7 @@ class CustomWizard::Wizard
   def self.after_signup(user)
     wizards = list(
       user,
-      template_opts: {
+      {
         setting: 'after_signup',
         order: "(value::json ->> 'permitted') IS NOT NULL DESC"
       }
@@ -338,11 +340,11 @@ class CustomWizard::Wizard
   def self.prompt_completion(user)
     wizards = list(
       user,
-      template_opts: {
+      {
         setting: 'prompt_completion',
         order: "(value::json ->> 'permitted') IS NOT NULL DESC"
       },
-      not_completed: true
+      true
     )
     if wizards.any?
       wizards.map do |w|
diff --git a/plugin.rb b/plugin.rb
index 49dcb105..44d2c152 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -1,17 +1,15 @@
 # frozen_string_literal: true
 # name: discourse-custom-wizard
 # about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more.
-# version: 1.22.10
-# authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George
+# version: 2.0.0
+# authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever
 # url: https://github.com/paviliondev/discourse-custom-wizard
 # contact_emails: development@pavilion.tech
 # subscription_url: https://coop.pavilion.tech
 
 gem 'liquid', '5.0.1', require: true
-
-register_asset 'stylesheets/common/wizard-admin.scss'
-register_asset 'stylesheets/common/wizard-mapper.scss'
-register_asset 'stylesheets/common/wizard-custom.scss'
+register_asset 'stylesheets/common/admin.scss'
+register_asset 'stylesheets/common/wizard.scss'
 
 enabled_site_setting :custom_wizard_enabled
 
@@ -20,7 +18,16 @@ if respond_to?(:register_svg_icon)
   register_svg_icon "chevron-right"
   register_svg_icon "chevron-left"
   register_svg_icon "save"
+  register_svg_icon "sliders-h"
+  register_svg_icon "calendar"
+  register_svg_icon "check"
+  register_svg_icon "times"
+  register_svg_icon "clock"
+  register_svg_icon "link"
+  register_svg_icon "comment-alt"
+  register_svg_icon "far-life-ring"
   register_svg_icon "arrow-right"
+  register_svg_icon "bolt"
 end
 
 after_initialize do
@@ -37,8 +44,8 @@ after_initialize do
     ../app/controllers/custom_wizard/wizard.rb
     ../app/controllers/custom_wizard/steps.rb
     ../app/controllers/custom_wizard/realtime_validations.rb
-    ../app/jobs/refresh_api_access_token.rb
-    ../app/jobs/set_after_time_wizard.rb
+    ../app/jobs/regular/refresh_api_access_token.rb
+    ../app/jobs/regular/set_after_time_wizard.rb
     ../lib/custom_wizard/validators/template.rb
     ../lib/custom_wizard/validators/update.rb
     ../lib/custom_wizard/action_result.rb
@@ -55,6 +62,7 @@ after_initialize do
     ../lib/custom_wizard/step_updater.rb
     ../lib/custom_wizard/step.rb
     ../lib/custom_wizard/submission.rb
+    ../lib/custom_wizard/subscription.rb
     ../lib/custom_wizard/template.rb
     ../lib/custom_wizard/wizard.rb
     ../lib/custom_wizard/api/api.rb
@@ -79,9 +87,9 @@ after_initialize do
     ../app/serializers/custom_wizard/realtime_validation/similar_topics_serializer.rb
     ../lib/custom_wizard/extensions/extra_locales_controller.rb
     ../lib/custom_wizard/extensions/invites_controller.rb
-    ../lib/custom_wizard/extensions/guardian.rb
     ../lib/custom_wizard/extensions/users_controller.rb
     ../lib/custom_wizard/extensions/tags_controller.rb
+    ../lib/custom_wizard/extensions/guardian.rb
     ../lib/custom_wizard/extensions/custom_field/preloader.rb
     ../lib/custom_wizard/extensions/custom_field/serializer.rb
     ../lib/custom_wizard/extensions/custom_field/extension.rb
diff --git a/spec/components/custom_wizard/action_spec.rb b/spec/components/custom_wizard/action_spec.rb
index 3c693c22..e5dedfa9 100644
--- a/spec/components/custom_wizard/action_spec.rb
+++ b/spec/components/custom_wizard/action_spec.rb
@@ -5,21 +5,22 @@ describe CustomWizard::Action do
   fab!(:category) { Fabricate(:category, name: 'cat1', slug: 'cat-slug') }
   fab!(:group) { Fabricate(:group) }
 
-  let(:wizard_template) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read
-    )
-  }
+  let(:wizard_template) { get_wizard_fixture("wizard") }
+  let(:open_composer) { get_wizard_fixture("actions/open_composer") }
+  let(:create_category) { get_wizard_fixture("actions/create_category") }
+  let(:watch_categories) { get_wizard_fixture("actions/watch_categories") }
+  let(:create_group) { get_wizard_fixture("actions/create_group") }
+  let(:add_to_group) { get_wizard_fixture("actions/add_to_group") }
+  let(:send_message) { get_wizard_fixture("actions/send_message") }
+  let(:send_message_multi) { get_wizard_fixture("actions/send_message_multi") }
+  let(:api_test_endpoint) { get_wizard_fixture("endpoints/test_endpoint") }
+  let(:api_test_endpoint_body) { get_wizard_fixture("endpoints/test_endpoint_body") }
+  let(:api_test_no_authorization) { get_wizard_fixture("api/no_authorization") }
 
-  let(:open_composer) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/actions/open_composer.json"
-      ).read
-    )
-  }
+  def update_template(template)
+    CustomWizard::Template.save(template, skip_jobs: true)
+    @template = CustomWizard::Template.find('super_mega_fun_wizard')
+  end
 
   let(:create_topic) {
     JSON.parse(
@@ -37,8 +38,7 @@ describe CustomWizard::Action do
 
   before do
     Group.refresh_automatic_group!(:trust_level_2)
-    CustomWizard::Template.save(wizard_template, skip_jobs: true)
-    @template = CustomWizard::Template.find('super_mega_fun_wizard')
+    update_template(wizard_template)
   end
 
   context 'creating a topic' do
@@ -157,54 +157,6 @@ describe CustomWizard::Action do
     end
   end
 
-  context 'sending a message' do
-    it 'works' do
-      User.create(username: 'angus1', email: "angus1@email.com")
-
-      wizard = CustomWizard::Builder.new(@template[:id], user).build
-      wizard.create_updater(wizard.steps[0].id, {}).update
-      wizard.create_updater(wizard.steps[1].id, {}).update
-
-      topic = Topic.where(
-        archetype: Archetype.private_message,
-        title: "Message title"
-      )
-
-      post = Post.where(
-        topic_id: topic.pluck(:id),
-        raw: "I will interpolate some wizard fields"
-      )
-
-      expect(topic.exists?).to eq(true)
-      expect(topic.first.topic_allowed_users.first.user.username).to eq('angus1')
-      expect(post.exists?).to eq(true)
-    end
-
-    it 'allows using multiple PM targets' do
-      User.create(username: 'angus1', email: "angus1@email.com")
-      User.create(username: 'faiz', email: "faiz@email.com")
-      Group.create(name: "cool_group")
-      Group.create(name: 'cool_group_1')
-      wizard = CustomWizard::Builder.new(@template[:id], user).build
-      wizard.create_updater(wizard.steps[0].id, {}).update
-      wizard.create_updater(wizard.steps[1].id, {}).update
-
-      topic = Topic.where(
-        archetype: Archetype.private_message,
-        title: "Multiple Recipients title"
-      )
-
-      post = Post.where(
-        topic_id: topic.pluck(:id),
-        raw: "I will interpolate some wizard fields"
-      )
-      expect(topic.exists?).to eq(true)
-      expect(topic.first.all_allowed_users.map(&:username)).to include('angus1', 'faiz')
-      expect(topic.first.allowed_groups.map(&:name)).to include('cool_group', 'cool_group_1')
-      expect(post.exists?).to eq(true)
-    end
-  end
-
   it 'updates a profile' do
     wizard = CustomWizard::Builder.new(@template[:id], user).build
     upload = Upload.create!(
@@ -229,10 +181,8 @@ describe CustomWizard::Action do
       updater = wizard.create_updater(wizard.steps[1].id, {})
       updater.update
 
-      category = Category.find_by(id: wizard.current_submission.fields['action_8'])
-
       expect(updater.result[:redirect_on_next]).to eq(
-        "/new-topic?title=Title%20of%20the%20composer%20topic&body=I%20am%20interpolating%20some%20user%20fields%20Angus%20angus%20angus%40email.com&category_id=#{category.id}&tags=tag1"
+        "/new-topic?title=Title%20of%20the%20composer%20topic&body=I%20am%20interpolating%20some%20user%20fields%20Angus%20angus%20angus%40email.com&tags=tag1"
       )
     end
 
@@ -257,41 +207,6 @@ describe CustomWizard::Action do
     end
   end
 
-  it 'creates a category' do
-    wizard = CustomWizard::Builder.new(@template[:id], user).build
-    wizard.create_updater(wizard.steps[0].id, step_1_field_1: "Text input").update
-    wizard.create_updater(wizard.steps[1].id, {}).update
-    expect(Category.where(id: wizard.current_submission.fields['action_8']).exists?).to eq(true)
-  end
-
-  it 'creates a group' do
-    wizard = CustomWizard::Builder.new(@template[:id], user).build
-    wizard.create_updater(wizard.steps[0].id, step_1_field_1: "Text input").update
-    expect(Group.where(name: wizard.current_submission.fields['action_9']).exists?).to eq(true)
-  end
-
-  it 'adds a user to a group' do
-    wizard = CustomWizard::Builder.new(@template[:id], user).build
-    step_id = wizard.steps[0].id
-    updater = wizard.create_updater(step_id, step_1_field_1: "Text input").update
-    group = Group.find_by(name: wizard.current_submission.fields['action_9'])
-    expect(group.users.first.username).to eq('angus')
-  end
-
-  it 'watches categories' do
-    wizard = CustomWizard::Builder.new(@template[:id], user).build
-    wizard.create_updater(wizard.steps[0].id, step_1_field_1: "Text input").update
-    wizard.create_updater(wizard.steps[1].id, {}).update
-    expect(CategoryUser.where(
-      category_id: wizard.current_submission.fields['action_8'],
-      user_id: user.id
-    ).first.notification_level).to eq(2)
-    expect(CategoryUser.where(
-      category_id: category.id,
-      user_id: user.id
-    ).first.notification_level).to eq(0)
-  end
-
   it 're-routes a user' do
     wizard = CustomWizard::Builder.new(@template[:id], user).build
     updater = wizard.create_updater(wizard.steps.last.id, {})
@@ -299,6 +214,166 @@ describe CustomWizard::Action do
     expect(updater.result[:redirect_on_next]).to eq("https://google.com")
   end
 
+  context "standard subscription actions" do
+    before do
+      enable_subscription("standard")
+    end
+
+    it 'watches categories' do
+      watch_categories[:categories][0][:output] = category.id
+      wizard_template[:actions] << watch_categories
+      update_template(wizard_template)
+
+      wizard = CustomWizard::Builder.new(@template[:id], user).build
+      wizard.create_updater(wizard.steps[0].id, step_1_field_1: "Text input").update
+
+      expect(CategoryUser.where(
+        category_id: category.id,
+        user_id: user.id
+      ).first.notification_level).to eq(2)
+    end
+
+    it '#send_message' do
+      wizard_template['actions'] << send_message
+      update_template(wizard_template)
+
+      User.create(username: 'angus1', email: "angus1@email.com")
+
+      wizard = CustomWizard::Builder.new(@template[:id], user).build
+      wizard.create_updater(wizard.steps[0].id, {}).update
+      wizard.create_updater(wizard.steps[1].id, {}).update
+
+      topic = Topic.where(
+        archetype: Archetype.private_message,
+        title: "Message title"
+      )
+
+      post = Post.where(
+        topic_id: topic.pluck(:id),
+        raw: "I will interpolate some wizard fields"
+      )
+
+      expect(topic.exists?).to eq(true)
+      expect(topic.first.topic_allowed_users.first.user.username).to eq('angus1')
+      expect(post.exists?).to eq(true)
+    end
+
+    it '#send_message allows using multiple targets' do
+      wizard_template['actions'] << send_message_multi
+      update_template(wizard_template)
+
+      User.create(username: 'angus1', email: "angus1@email.com")
+      User.create(username: 'faiz', email: "faiz@email.com")
+      Group.create(name: "cool_group")
+      Group.create(name: 'cool_group_1')
+      wizard = CustomWizard::Builder.new(@template[:id], user).build
+      wizard.create_updater(wizard.steps[0].id, {}).update
+      wizard.create_updater(wizard.steps[1].id, {}).update
+
+      topic = Topic.where(
+        archetype: Archetype.private_message,
+        title: "Multiple Recipients title"
+      )
+
+      post = Post.where(
+        topic_id: topic.pluck(:id),
+        raw: "I will interpolate some wizard fields"
+      )
+
+      expect(topic.exists?).to eq(true)
+      expect(topic.first.all_allowed_users.map(&:username)).to include('angus1', 'faiz')
+      expect(topic.first.allowed_groups.map(&:name)).to include('cool_group', 'cool_group_1')
+      expect(post.exists?).to eq(true)
+    end
+  end
+
+  context "business subscription actions" do
+    before do
+      enable_subscription("business")
+    end
+
+    it '#create_category' do
+      wizard_template['actions'] << create_category
+      wizard_template['actions'] << create_group
+      update_template(wizard_template)
+
+      wizard = CustomWizard::Builder.new(@template[:id], user).build
+      wizard.create_updater(wizard.steps[0].id, step_1_field_1: "Text input").update
+      wizard.create_updater(wizard.steps[1].id, {}).update
+
+      expect(Category.where(id: wizard.current_submission.fields['action_8']).exists?).to eq(true)
+    end
+
+    it '#create_group' do
+      wizard_template['actions'] << create_group
+      update_template(wizard_template)
+
+      wizard = CustomWizard::Builder.new(@template[:id], user).build
+      wizard.create_updater(wizard.steps[0].id, step_1_field_1: "Text input").update
+
+      expect(Group.where(name: wizard.current_submission.fields['action_9']).exists?).to eq(true)
+    end
+
+    it '#add_to_group' do
+      wizard_template['actions'] << create_group
+      wizard_template['actions'] << add_to_group
+      update_template(wizard_template)
+
+      wizard = CustomWizard::Builder.new(@template[:id], user).build
+      step_id = wizard.steps[0].id
+      updater = wizard.create_updater(step_id, step_1_field_1: "Text input").update
+      group = Group.find_by(name: wizard.current_submission.fields['action_9'])
+
+      expect(group.users.first.username).to eq('angus')
+    end
+
+    it '#send_to_api successful' do
+      stub_request(:put, "https://myexternalapi.com/update").
+        with(
+        body: "some_body",
+        headers: {
+          'Host' => 'myexternalapi.com'
+        }).
+        to_return(status: 200, body: "success", headers: {})
+
+      new_api = CustomWizard::Api.new("my_api")
+      CustomWizard::Api.set("my_api", title: "Mocked external api")
+      CustomWizard::Api::Authorization.set("my_api", api_test_no_authorization)
+      CustomWizard::Api::Endpoint.new("my_api")
+      CustomWizard::Api::Endpoint.set("my_api",  api_test_endpoint)
+      endpoint_id = CustomWizard::Api::Endpoint.list("my_api").first.id
+
+      result = CustomWizard::Api::Endpoint.request("my_api", endpoint_id, "some_body")
+      log_entry = CustomWizard::Api::LogEntry.list("my_api").first
+
+      expect(result).to eq('success')
+      expect(log_entry.status).to eq('SUCCESS')
+    end
+
+    it '#send_to_api failure' do
+      stub_request(:put, "https://myexternalapi.com/update").
+        with(
+        body: "some_body",
+        headers: {
+          'Host' => 'myexternalapi.com'
+        }).
+        to_return(status: 500, body: "failure", headers: {})
+
+      new_api = CustomWizard::Api.new("my_api")
+      CustomWizard::Api.set("my_api", title: "Mocked external api")
+      CustomWizard::Api::Authorization.set("my_api", api_test_no_authorization)
+      CustomWizard::Api::Endpoint.new("my_api")
+      CustomWizard::Api::Endpoint.set("my_api",  api_test_endpoint)
+      endpoint_id = CustomWizard::Api::Endpoint.list("my_api").first.id
+
+      result = CustomWizard::Api::Endpoint.request("my_api", endpoint_id, "some_body")
+      log_entry = CustomWizard::Api::LogEntry.list("my_api").first
+
+      expect(result).to eq({ error: "API request failed" })
+      expect(log_entry.status).to eq('FAIL')
+    end
+  end
+
   it 'registers callbacks' do
     described_class.register_callback(:before_create_topic) do |params, wizard, action, submission|
       params[:topic_opts][:custom_fields]["topic_custom_field"] = true
diff --git a/spec/components/custom_wizard/builder_spec.rb b/spec/components/custom_wizard/builder_spec.rb
index e140931c..ebcc355b 100644
--- a/spec/components/custom_wizard/builder_spec.rb
+++ b/spec/components/custom_wizard/builder_spec.rb
@@ -14,37 +14,11 @@ describe CustomWizard::Builder do
   fab!(:category2) { Fabricate(:category, name: 'cat2') }
   fab!(:group) { Fabricate(:group) }
 
-  let(:required_data_json) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/step/required_data.json"
-      ).read
-    )
-  }
-
-  let(:permitted_json) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard/permitted.json"
-      ).read
-    )
-  }
-
-  let(:permitted_param_json) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/step/permitted_params.json"
-      ).read
-    )
-  }
-
-  let(:user_condition_json) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/condition/user_condition.json"
-      ).read
-    )
-  }
+  let(:wizard_template) { get_wizard_fixture("wizard") }
+  let(:required_data_json) { get_wizard_fixture("step/required_data") }
+  let(:permitted_json) { get_wizard_fixture("wizard/permitted") }
+  let(:permitted_param_json) { get_wizard_fixture("step/permitted_params") }
+  let(:user_condition_json) { get_wizard_fixture("condition/user_condition") }
 
   let(:boolean_field_condition_json) {
     JSON.parse(
@@ -56,11 +30,7 @@ describe CustomWizard::Builder do
 
   before do
     Group.refresh_automatic_group!(:trust_level_3)
-    CustomWizard::Template.save(
-      JSON.parse(File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read),
-    skip_jobs: true)
+    CustomWizard::Template.save(wizard_template, skip_jobs: true)
     @template = CustomWizard::Template.find('super_mega_fun_wizard')
   end
 
@@ -130,6 +100,7 @@ describe CustomWizard::Builder do
 
     context "with restricted permissions" do
       before do
+        enable_subscription("standard")
         @template[:permitted] = permitted_json["permitted"]
         CustomWizard::Template.save(@template.as_json)
       end
@@ -213,6 +184,7 @@ describe CustomWizard::Builder do
 
       context "restart is enabled" do
         before do
+          enable_subscription("standard")
           @template[:restart_on_revisit] = true
           CustomWizard::Template.save(@template.as_json)
         end
@@ -241,6 +213,7 @@ describe CustomWizard::Builder do
 
       context 'with required data' do
         before do
+          enable_subscription("standard")
           @template[:steps][0][:required_data] = required_data_json['required_data']
           @template[:steps][0][:required_data_message] = required_data_json['required_data_message']
           CustomWizard::Template.save(@template.as_json)
@@ -276,6 +249,7 @@ describe CustomWizard::Builder do
 
       context "with permitted params" do
         before do
+          enable_subscription("standard")
           @template[:steps][0][:permitted_params] = permitted_param_json['permitted_params']
           CustomWizard::Template.save(@template.as_json)
         end
@@ -290,6 +264,7 @@ describe CustomWizard::Builder do
 
       context "with condition" do
         before do
+          enable_subscription("standard")
           @template[:steps][0][:condition] = user_condition_json['condition']
           CustomWizard::Template.save(@template.as_json)
         end
@@ -328,8 +303,9 @@ describe CustomWizard::Builder do
 
       context "with condition" do
         before do
+          enable_subscription("standard")
           @template[:steps][0][:fields][0][:condition] = user_condition_json['condition']
-          @template[:steps][2][:fields][5][:condition] = boolean_field_condition_json['condition']
+          @template[:steps][2][:fields][0][:condition] = boolean_field_condition_json['condition']
           CustomWizard::Template.save(@template.as_json)
         end
 
@@ -350,7 +326,7 @@ describe CustomWizard::Builder do
 
           builder = CustomWizard::Builder.new(@template[:id], user)
           wizard = builder.build
-          expect(wizard.steps.last.fields.last.id).to eq(@template[:steps][2][:fields][5]['id'])
+          expect(wizard.steps.last.fields.last.id).to eq(@template[:steps][2][:fields][0]['id'])
         end
       end
     end
@@ -370,6 +346,7 @@ describe CustomWizard::Builder do
 
       context 'save submissions disabled' do
         before do
+          enable_subscription("standard")
           @template[:save_submissions] = false
           CustomWizard::Template.save(@template.as_json)
           @wizard = CustomWizard::Builder.new(@template[:id], user).build
diff --git a/spec/components/custom_wizard/custom_field_spec.rb b/spec/components/custom_wizard/custom_field_spec.rb
index cd29f081..4b8d43e2 100644
--- a/spec/components/custom_wizard/custom_field_spec.rb
+++ b/spec/components/custom_wizard/custom_field_spec.rb
@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
 describe CustomWizard::CustomField do
-
-  let(:custom_field_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/custom_field/custom_fields.json"
-    ).read)
-  }
+  let(:custom_field_json) { get_wizard_fixture("custom_field/custom_fields") }
+  let(:custom_field_subscription_json) { get_wizard_fixture("custom_field/subscription_custom_fields") }
 
   before do
     CustomWizard::CustomField.invalidate_cache
@@ -102,8 +98,8 @@ describe CustomWizard::CustomField do
 
     it "does not save with an unsupported serializer" do
       invalid_field_json = custom_field_json['custom_fields'].first
-      invalid_field_json['klass'] = 'category'
-      invalid_field_json['serializers'] = ['category', 'site_category']
+      invalid_field_json['klass'] = 'post'
+      invalid_field_json['serializers'] = ['post', 'post_revision']
 
       custom_field = CustomWizard::CustomField.new(nil, invalid_field_json)
 
@@ -111,8 +107,8 @@ describe CustomWizard::CustomField do
       expect(custom_field.valid?).to eq(false)
       expect(custom_field.errors.full_messages.first).to eq(
         I18n.t("wizard.custom_field.error.unsupported_serializers",
-          class: "category",
-          serializers: "category, site_category"
+          class: "post",
+          serializers: "post_revision"
         )
       )
       expect(
@@ -194,6 +190,50 @@ describe CustomWizard::CustomField do
         ).exists?
       ).to eq(false)
     end
+
+    it "does not save subscription field types without a subscription" do
+      subscription_field_json = custom_field_subscription_json['custom_fields'].first
+      custom_field = CustomWizard::CustomField.new(nil, subscription_field_json)
+
+      expect(custom_field.save).to eq(false)
+      expect(custom_field.valid?).to eq(false)
+      expect(custom_field.errors.full_messages.first).to eq(
+        I18n.t("wizard.custom_field.error.subscription_type", type: "json")
+      )
+    end
+
+    it "does not save subscription field classes without a subscription" do
+      subscription_field_json = custom_field_subscription_json['custom_fields'].second
+      custom_field = CustomWizard::CustomField.new(nil, subscription_field_json)
+
+      expect(custom_field.save).to eq(false)
+      expect(custom_field.valid?).to eq(false)
+      expect(custom_field.errors.full_messages.first).to eq(
+        I18n.t("wizard.custom_field.error.subscription_type", type: "category")
+      )
+    end
+
+    context "with a subscription" do
+      before do
+        enable_subscription("business")
+      end
+
+      it "saves subscription field types" do
+        subscription_field_json = custom_field_subscription_json['custom_fields'].first
+        custom_field = CustomWizard::CustomField.new(nil, subscription_field_json)
+
+        expect(custom_field.save).to eq(true)
+        expect(custom_field.valid?).to eq(true)
+      end
+
+      it "saves subscription field classes" do
+        subscription_field_json = custom_field_subscription_json['custom_fields'].second
+        custom_field = CustomWizard::CustomField.new(nil, subscription_field_json)
+
+        expect(custom_field.save).to eq(true)
+        expect(custom_field.valid?).to eq(true)
+      end
+    end
   end
 
   context "lists" do
@@ -203,15 +243,15 @@ describe CustomWizard::CustomField do
       end
     end
 
-    it "lists saved custom field records" do
-      expect(CustomWizard::CustomField.list.length).to eq(4)
+    it "saved custom field records" do
+      expect(CustomWizard::CustomField.list.length).to eq(2)
     end
 
-    it "lists saved custom field records by attribute value" do
+    it "saved custom field records by attribute value" do
       expect(CustomWizard::CustomField.list_by(:klass, 'topic').length).to eq(1)
     end
 
-    it "lists saved custom field records by optional values" do
+    it "saved custom field records by optional values" do
       field_json = custom_field_json['custom_fields'].first
       field_json['serializers'] = nil
 
@@ -220,11 +260,11 @@ describe CustomWizard::CustomField do
     end
 
     it "lists custom field records added by other plugins " do
-      expect(CustomWizard::CustomField.external_list.length).to eq(8)
+      expect(CustomWizard::CustomField.external_list.length).to be > 2
     end
 
     it "lists all custom field records" do
-      expect(CustomWizard::CustomField.full_list.length).to eq(12)
+      expect(CustomWizard::CustomField.full_list.length).to be > 2
     end
   end
 
diff --git a/spec/components/custom_wizard/field_spec.rb b/spec/components/custom_wizard/field_spec.rb
index 2386a004..1a43e06c 100644
--- a/spec/components/custom_wizard/field_spec.rb
+++ b/spec/components/custom_wizard/field_spec.rb
@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 describe CustomWizard::Field do
-  let(:field_hash) do
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/field/field.json"
-    ).read).with_indifferent_access
-  end
+  let(:field_hash) { get_wizard_fixture("field/field") }
 
   before do
     CustomWizard::Field.register(
@@ -26,7 +22,6 @@ describe CustomWizard::Field do
     expect(field.image).to eq("field_image_url.png")
     expect(field.description).to eq("Field description")
     expect(field.required).to eq(true)
-    expect(field.key).to eq("field.locale.key")
     expect(field.type).to eq("field_type")
     expect(field.content).to eq([])
   end
diff --git a/spec/components/custom_wizard/log_spec.rb b/spec/components/custom_wizard/log_spec.rb
index d5c0de5d..e4f5550f 100644
--- a/spec/components/custom_wizard/log_spec.rb
+++ b/spec/components/custom_wizard/log_spec.rb
@@ -2,26 +2,32 @@
 
 describe CustomWizard::Log do
   before do
-    CustomWizard::Log.create("First log message")
-    CustomWizard::Log.create("Second log message")
-    CustomWizard::Log.create("Third log message")
+    CustomWizard::Log.create('first-test-wizard', 'perform_first_action', 'first_test_user', 'First log message')
+    CustomWizard::Log.create('second-test-wizard', 'perform_second_action', 'second_test_user', 'Second log message')
+    CustomWizard::Log.create('third-test-wizard', 'perform_third_action', 'third_test_user', 'Third log message')
   end
 
   it "creates logs" do
     expect(
-      CustomWizard::Log.list.length
+      CustomWizard::Log.list.logs.length
     ).to eq(3)
   end
 
   it "lists logs by time created" do
     expect(
-      CustomWizard::Log.list.first.message
+      CustomWizard::Log.list.logs.first.message
     ).to eq("Third log message")
   end
 
   it "paginates logs" do
     expect(
-      CustomWizard::Log.list(0, 2).length
+      CustomWizard::Log.list(0, 2).logs.length
     ).to eq(2)
   end
+
+  it "lists logs by wizard" do
+    expect(
+      CustomWizard::Log.list(0, 2, 'third-test-wizard').logs.length
+    ).to eq(1)
+  end
 end
diff --git a/spec/components/custom_wizard/mapper_spec.rb b/spec/components/custom_wizard/mapper_spec.rb
index 422ffbf5..111558a4 100644
--- a/spec/components/custom_wizard/mapper_spec.rb
+++ b/spec/components/custom_wizard/mapper_spec.rb
@@ -30,16 +30,8 @@ describe CustomWizard::Mapper do
       ]
     )
   }
-  let(:inputs) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/mapper/inputs.json"
-    ).read)
-  }
-  let(:data) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/mapper/data.json"
-    ).read)
-  }
+  let(:inputs) { get_wizard_fixture("mapper/inputs") }
+  let(:data) { get_wizard_fixture("mapper/data") }
   let(:template_params) {
     {
       "step_1_field_1" => "Hello"
@@ -351,7 +343,7 @@ describe CustomWizard::Mapper do
       expect(result).to eq(template_params["step_1_field_1"])
     end
 
-    it "treats replaced values as string literals" do
+    it "requires a subscription" do
       template = '{{ "w{step_1_field_1}" | size }}'
       mapper = create_template_mapper(template_params, user1)
       result = mapper.interpolate(
@@ -361,60 +353,17 @@ describe CustomWizard::Mapper do
         wizard: true,
         value: true
       )
-      expect(result).to eq(template_params["step_1_field_1"].size.to_s)
+      expect(result).to eq("{{ \"#{template_params["step_1_field_1"]}\" | size }}")
     end
 
-    it "allows the wizard values to be used inside conditionals" do
-      template = <<-LIQUID
-        {%- if "w{step_1_field_1}" contains "ello" -%}
-          Correct
-        {%- else -%}
-          Incorrect
-        {%-endif-%}
-      LIQUID
-      mapper = create_template_mapper(template_params, user1)
-      result = mapper.interpolate(
-        template.dup,
-        template: true,
-        user: true,
-        wizard: true,
-        value: true
-      )
-      expect(result).to eq("Correct")
-    end
+    context "with a subscription" do
+      before do
+        enable_subscription("standard")
+      end
 
-    it "can access data passed to render method as variable" do
-      template = "{{step_1_field_1.size}}"
-      mapper = create_template_mapper(template_params, user1)
-      result = mapper.interpolate(
-        template.dup,
-        template: true,
-        user: true,
-        wizard: true,
-        value: true
-      )
-      expect(result).to eq(template_params["step_1_field_1"].size.to_s)
-    end
-
-    it "doesn't parse the template when template param is false" do
-      template = <<-LIQUID.strip
-        {{ "w{step_1_field_1}" | size}}
-      LIQUID
-      mapper = create_template_mapper(template_params, user1)
-      result = mapper.interpolate(
-        template.dup,
-        template: false,
-      )
-      expect(result).to eq(template)
-    end
-
-    context "custom filter: 'first_non_empty'" do
-      it "gives first non empty element from list" do
-        template = <<-LIQUID.strip
-          {%- assign entry = "" | first_non_empty: step_1_field_1, step_1_field_2, step_1_field_3 -%}
-          {{ entry }}
-        LIQUID
-        mapper = create_template_mapper(template_params_non_empty, user1)
+      it "treats replaced values as string literals" do
+        template = '{{ "w{step_1_field_1}" | size }}'
+        mapper = create_template_mapper(template_params, user1)
         result = mapper.interpolate(
           template.dup,
           template: true,
@@ -422,15 +371,18 @@ describe CustomWizard::Mapper do
           wizard: true,
           value: true
         )
-        expect(result).to eq(template_params_non_empty["step_1_field_3"])
+        expect(result).to eq(template_params["step_1_field_1"].size.to_s)
       end
 
-      it "gives first non empty element from list when multiple non empty values present" do
-        template = <<-LIQUID.strip
-          {%- assign entry = "" | first_non_empty: step_1_field_1, step_1_field_2, step_1_field_3 -%}
-          {{ entry }}
+      it "allows the wizard values to be used inside conditionals" do
+        template = <<-LIQUID
+          {%- if "w{step_1_field_1}" contains "ello" -%}
+            Correct
+          {%- else -%}
+            Incorrect
+          {%-endif-%}
         LIQUID
-        mapper = create_template_mapper(template_params_multiple_non_empty, user1)
+        mapper = create_template_mapper(template_params, user1)
         result = mapper.interpolate(
           template.dup,
           template: true,
@@ -438,25 +390,84 @@ describe CustomWizard::Mapper do
           wizard: true,
           value: true
         )
-        expect(result).to eq(template_params_multiple_non_empty["step_1_field_2"])
+        expect(result).to eq("Correct")
       end
 
-      it "gives empty if all elements are empty" do
+      it "can access data passed to render method as variable" do
+        template = "{{step_1_field_1.size}}"
+        mapper = create_template_mapper(template_params, user1)
+        result = mapper.interpolate(
+          template.dup,
+          template: true,
+          user: true,
+          wizard: true,
+          value: true
+        )
+        expect(result).to eq(template_params["step_1_field_1"].size.to_s)
+      end
+
+      it "doesn't parse the template when template param is false" do
         template = <<-LIQUID.strip
-          {%- assign entry = "" | first_non_empty: step_1_field_1, step_1_field_2, step_1_field_3 -%}
-          {%- if entry -%}
+          {{ "w{step_1_field_1}" | size}}
+        LIQUID
+        mapper = create_template_mapper(template_params, user1)
+        result = mapper.interpolate(
+          template.dup,
+          template: false,
+        )
+        expect(result).to eq(template)
+      end
+
+      context "custom filter: 'first_non_empty'" do
+        it "gives first non empty element from list" do
+          template = <<-LIQUID.strip
+            {%- assign entry = "" | first_non_empty: step_1_field_1, step_1_field_2, step_1_field_3 -%}
             {{ entry }}
-          {%- endif -%}
-        LIQUID
-        mapper = create_template_mapper(template_params_empty, user1)
-        result = mapper.interpolate(
-          template.dup,
-          template: true,
-          user: true,
-          wizard: true,
-          value: true
-        )
-        expect(result).to eq("")
+          LIQUID
+          mapper = create_template_mapper(template_params_non_empty, user1)
+          result = mapper.interpolate(
+            template.dup,
+            template: true,
+            user: true,
+            wizard: true,
+            value: true
+          )
+          expect(result).to eq(template_params_non_empty["step_1_field_3"])
+        end
+
+        it "gives first non empty element from list when multiple non empty values present" do
+          template = <<-LIQUID.strip
+            {%- assign entry = "" | first_non_empty: step_1_field_1, step_1_field_2, step_1_field_3 -%}
+            {{ entry }}
+          LIQUID
+          mapper = create_template_mapper(template_params_multiple_non_empty, user1)
+          result = mapper.interpolate(
+            template.dup,
+            template: true,
+            user: true,
+            wizard: true,
+            value: true
+          )
+          expect(result).to eq(template_params_multiple_non_empty["step_1_field_2"])
+        end
+
+        it "gives empty if all elements are empty" do
+          template = <<-LIQUID.strip
+            {%- assign entry = "" | first_non_empty: step_1_field_1, step_1_field_2, step_1_field_3 -%}
+            {%- if entry -%}
+              {{ entry }}
+            {%- endif -%}
+          LIQUID
+          mapper = create_template_mapper(template_params_empty, user1)
+          result = mapper.interpolate(
+            template.dup,
+            template: true,
+            user: true,
+            wizard: true,
+            value: true
+          )
+          expect(result).to eq("")
+        end
       end
     end
   end
diff --git a/spec/components/custom_wizard/step_spec.rb b/spec/components/custom_wizard/step_spec.rb
index ac0abbb7..fc6f9920 100644
--- a/spec/components/custom_wizard/step_spec.rb
+++ b/spec/components/custom_wizard/step_spec.rb
@@ -1,21 +1,8 @@
 # frozen_string_literal: true
 
 describe CustomWizard::Step do
-  let(:step_hash) do
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/step/step.json"
-      ).read
-    ).with_indifferent_access
-  end
-
-  let(:field_hash) do
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/field/field.json"
-      ).read
-    ).with_indifferent_access
-  end
+  let(:step_hash) { get_wizard_fixture("step/step") }
+  let(:field_hash) { get_wizard_fixture("field/field") }
 
   before do
     @step = CustomWizard::Step.new(step_hash[:id])
diff --git a/spec/components/custom_wizard/submission_spec.rb b/spec/components/custom_wizard/submission_spec.rb
index a406d606..48459a08 100644
--- a/spec/components/custom_wizard/submission_spec.rb
+++ b/spec/components/custom_wizard/submission_spec.rb
@@ -3,41 +3,48 @@
 describe CustomWizard::Submission do
   fab!(:user) { Fabricate(:user) }
   fab!(:user2) { Fabricate(:user) }
-
-  let(:template_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-    ).read)
-  }
+  let(:template_json) { get_wizard_fixture("wizard") }
 
   before do
     CustomWizard::Template.save(template_json, skip_jobs: true)
-
-    template_json_2 = template_json.dup
-    template_json_2["id"] = "super_mega_fun_wizard_2"
-    CustomWizard::Template.save(template_json_2, skip_jobs: true)
-
     @wizard = CustomWizard::Wizard.create(template_json["id"], user)
-    @wizard2 = CustomWizard::Wizard.create(template_json["id"], user2)
-    @wizard3 = CustomWizard::Wizard.create(template_json_2["id"], user)
-
-    described_class.new(@wizard, step_1_field_1: "I am a user submission").save
-    described_class.new(@wizard2, step_1_field_1: "I am another user's submission").save
-    described_class.new(@wizard3, step_1_field_1: "I am a user submission on another wizard").save
+    described_class.new(@wizard, step_1_field_1: "I am user submission").save
   end
 
   it "saves a user's submission" do
     expect(
       described_class.get(@wizard, user.id).fields["step_1_field_1"]
-    ).to eq("I am a user submission")
+    ).to eq("I am user submission")
   end
 
-  it "list submissions by wizard" do
-    expect(described_class.list(@wizard).size).to eq(2)
-  end
+  describe "#list" do
+    before do
+      template_json_2 = template_json.dup
+      template_json_2["id"] = "super_mega_fun_wizard_2"
+      CustomWizard::Template.save(template_json_2, skip_jobs: true)
 
-  it "list submissions by wizard and user" do
-    expect(described_class.list(@wizard, user_id: user.id).size).to eq(1)
+      @wizard2 = CustomWizard::Wizard.create(template_json["id"], user2)
+      @wizard3 = CustomWizard::Wizard.create(template_json_2["id"], user)
+      @count = CustomWizard::Submission::PAGE_LIMIT + 20
+
+      @count.times do |index|
+        described_class.new(@wizard, step_1_field_1: "I am user submission #{index + 1}").save
+      end
+      described_class.new(@wizard2, step_1_field_1: "I am another user's submission").save
+      described_class.new(@wizard3, step_1_field_1: "I am a user submission on another wizard").save
+    end
+
+    it "list submissions by wizard" do
+      expect(described_class.list(@wizard).total).to eq(@count + 2)
+    end
+
+    it "list submissions by wizard and user" do
+      expect(described_class.list(@wizard, user_id: user.id).total).to eq(@count + 1)
+    end
+
+    it "paginates submission lists" do
+      expect(described_class.list(@wizard, page: 1).submissions.size).to eq((@count + 2) - CustomWizard::Submission::PAGE_LIMIT)
+    end
   end
 
   describe "#cleanup_incomplete_submissions" do
@@ -46,10 +53,10 @@ describe CustomWizard::Submission do
       described_class.new(@wizard, step_1_field_1: "I am the second submission").save
       builder = CustomWizard::Builder.new(@wizard.id, @wizard.user)
       builder.build
-      sub_list = described_class.list(@wizard, user_id: @wizard.user.id)
+      submissions = described_class.list(@wizard, user_id: @wizard.user.id).submissions
 
-      expect(sub_list.length).to eq(1)
-      expect(sub_list.first.fields["step_1_field_1"]).to eq("I am the second submission")
+      expect(submissions.length).to eq(1)
+      expect(submissions.first.fields["step_1_field_1"]).to eq("I am the second submission")
     end
 
     it "handles submissions without 'updated_at' field correctly" do
@@ -62,10 +69,10 @@ describe CustomWizard::Submission do
       PluginStore.set("#{@wizard.id}_submissions", @wizard.user.id, sub_data)
       builder = CustomWizard::Builder.new(@wizard.id, @wizard.user)
       builder.build
-      sub_list = described_class.list(@wizard, user_id: @wizard.user.id)
+      submissions = described_class.list(@wizard, user_id: @wizard.user.id).submissions
 
-      expect(sub_list.length).to eq(1)
-      expect(sub_list.first.fields["step_1_field_1"]).to eq("I am the third submission")
+      expect(submissions.length).to eq(1)
+      expect(submissions.first.fields["step_1_field_1"]).to eq("I am the third submission")
     end
 
     it "handles submissions with and without 'updated_at' field correctly" do
@@ -79,10 +86,10 @@ describe CustomWizard::Submission do
 
       builder = CustomWizard::Builder.new(@wizard.id, @wizard.user)
       builder.build
-      sub_list = described_class.list(@wizard, user_id: @wizard.user.id)
+      submissions = described_class.list(@wizard, user_id: @wizard.user.id).submissions
 
-      expect(sub_list.length).to eq(1)
-      expect(sub_list.first.fields["step_1_field_1"]).to eq("I am the third submission")
+      expect(submissions.length).to eq(1)
+      expect(submissions.first.fields["step_1_field_1"]).to eq("I am the third submission")
     end
   end
 end
diff --git a/spec/components/custom_wizard/subscription_spec.rb b/spec/components/custom_wizard/subscription_spec.rb
new file mode 100644
index 00000000..5f06397b
--- /dev/null
+++ b/spec/components/custom_wizard/subscription_spec.rb
@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+describe CustomWizard::Subscription do
+  def undefine_client_classes
+    Object.send(:remove_const, :SubscriptionClient) if Object.constants.include?(:SubscriptionClient)
+    Object.send(:remove_const, :SubscriptionClientSubscription) if Object.constants.include?(:SubscriptionClientSubscription)
+  end
+
+  def define_client_classes
+    load File.expand_path("#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/subscription_client.rb", __FILE__)
+  end
+
+  def stub_client_methods
+    [:active, :where, :order, :first].each do |method|
+      SubscriptionClientSubscription.stubs(method)
+        .returns(SubscriptionClientSubscription)
+    end
+    SubscriptionClientSubscription.stubs(:product_id).returns(SecureRandom.hex(8))
+  end
+
+  after do
+    undefine_client_classes
+  end
+
+  it "detects the subscription client" do
+    expect(described_class.client_installed?).to eq(false)
+  end
+
+  context "without a subscription client" do
+    it "is not subscribed" do
+      expect(described_class.subscribed?).to eq(false)
+    end
+
+    it "has none type" do
+      subscription = described_class.new
+      expect(subscription.type).to eq(:none)
+    end
+
+    it "non subscriber features are included" do
+      expect(described_class.includes?(:wizard, :after_signup, true)).to eq(true)
+    end
+
+    it "ubscriber features are not included" do
+      expect(described_class.includes?(:wizard, :permitted, {})).to eq(false)
+    end
+  end
+
+  context "with subscription client" do
+    before do
+      define_client_classes
+      stub_client_methods
+    end
+
+    it "detects the subscription client" do
+      expect(described_class.client_installed?).to eq(true)
+    end
+
+    context "without a subscription" do
+      it "has none type" do
+        expect(described_class.type).to eq(:none)
+      end
+
+      it "non subscriber features are included" do
+        expect(described_class.includes?(:wizard, :after_signup, true)).to eq(true)
+      end
+
+      it "subscriber features are not included" do
+        expect(described_class.includes?(:wizard, :permitted, {})).to eq(false)
+      end
+    end
+
+    context "with standard subscription" do
+      before do
+        SubscriptionClientSubscription.stubs(:product_id).returns(CustomWizard::Subscription::STANDARD_PRODUCT_ID)
+      end
+
+      it "detects standard type" do
+        expect(described_class.type).to eq(:standard)
+      end
+
+      it "standard features are included" do
+        expect(described_class.includes?(:wizard, :type, 'send_message')).to eq(true)
+      end
+
+      it "business features are not included" do
+        expect(described_class.includes?(:action, :type, 'create_category')).to eq(false)
+      end
+    end
+
+    context "with business subscription" do
+      before do
+        SubscriptionClientSubscription.stubs(:product_id).returns(CustomWizard::Subscription::BUSINESS_PRODUCT_ID)
+      end
+
+      it "detects business type" do
+        expect(described_class.type).to eq(:business)
+      end
+
+      it "business features are included" do
+        expect(described_class.includes?(:action, :type, 'create_category')).to eq(true)
+      end
+    end
+
+    context "with community subscription" do
+      before do
+        SubscriptionClientSubscription.stubs(:product_id).returns(CustomWizard::Subscription::COMMUNITY_PRODUCT_ID)
+      end
+
+      it "detects community type" do
+        expect(described_class.type).to eq(:community)
+      end
+
+      it "community features are included" do
+        expect(described_class.includes?(:action, :type, 'create_category')).to eq(true)
+      end
+    end
+  end
+end
diff --git a/spec/components/custom_wizard/template_spec.rb b/spec/components/custom_wizard/template_spec.rb
index 9a7b3777..76b229dc 100644
--- a/spec/components/custom_wizard/template_spec.rb
+++ b/spec/components/custom_wizard/template_spec.rb
@@ -2,19 +2,10 @@
 
 describe CustomWizard::Template do
   fab!(:user) { Fabricate(:user) }
+  let(:template_json) { get_wizard_fixture("wizard") }
+  let(:permitted_json) { get_wizard_fixture("wizard/permitted") }
   fab!(:upload) { Fabricate(:upload) }
 
-  let(:template_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-    ).read)
-  }
-  let(:permitted_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard/permitted.json"
-    ).read)
-  }
-
   before do
     CustomWizard::Template.save(template_json, skip_jobs: true)
   end
@@ -125,6 +116,8 @@ describe CustomWizard::Template do
 
   context "wizard template list" do
     before do
+      enable_subscription('standard')
+
       template_json_2 = template_json.dup
       template_json_2["id"] = 'super_mega_fun_wizard_2'
       template_json_2["permitted"] = permitted_json['permitted']
diff --git a/spec/components/custom_wizard/template_validator_spec.rb b/spec/components/custom_wizard/template_validator_spec.rb
index 8e730140..b149706f 100644
--- a/spec/components/custom_wizard/template_validator_spec.rb
+++ b/spec/components/custom_wizard/template_validator_spec.rb
@@ -2,12 +2,12 @@
 
 describe CustomWizard::TemplateValidator do
   fab!(:user) { Fabricate(:user) }
+  let(:template) { get_wizard_fixture("wizard") }
+  let(:create_category) { get_wizard_fixture("actions/create_category") }
+  let(:user_condition) { get_wizard_fixture("condition/user_condition") }
+  let(:permitted_json) { get_wizard_fixture("wizard/permitted") }
+  let(:composer_preview) { get_wizard_fixture("field/composer_preview") }
 
-  let(:template) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-    ).read).with_indifferent_access
-  }
   let(:valid_liquid_template) {
     <<-LIQUID.strip
         {%- assign hello = "Topic Form 1" %}
@@ -104,6 +104,70 @@ describe CustomWizard::TemplateValidator do
     ).to eq(false)
   end
 
+  context "without subscription" do
+    it "invalidates subscription wizard attributes" do
+      template[:permitted] = permitted_json['permitted']
+      expect(
+        CustomWizard::TemplateValidator.new(template).perform
+      ).to eq(false)
+    end
+
+    it "invalidates subscription step attributes" do
+      template[:steps][0][:condition] = user_condition['condition']
+      expect(
+        CustomWizard::TemplateValidator.new(template).perform
+      ).to eq(false)
+    end
+
+    it "invalidates subscription field attributes" do
+      template[:steps][0][:fields][0][:condition] = user_condition['condition']
+      expect(
+        CustomWizard::TemplateValidator.new(template).perform
+      ).to eq(false)
+    end
+
+    it "invalidates subscription actions" do
+      template[:actions] << create_category
+      expect(
+        CustomWizard::TemplateValidator.new(template).perform
+      ).to eq(false)
+    end
+  end
+
+  context "with subscription" do
+    before do
+      enable_subscription("business")
+    end
+
+    it "validates wizard attributes" do
+      template[:permitted] = permitted_json['permitted']
+      expect(
+        CustomWizard::TemplateValidator.new(template).perform
+      ).to eq(true)
+    end
+
+    it "validates step attributes" do
+      template[:steps][0][:condition] = user_condition['condition']
+      expect(
+        CustomWizard::TemplateValidator.new(template).perform
+      ).to eq(true)
+    end
+
+    it "validates field attributes" do
+      template[:steps][0][:fields][0][:condition] = user_condition['condition']
+      expect(
+        CustomWizard::TemplateValidator.new(template).perform
+      ).to eq(true)
+    end
+
+    it "validates actions" do
+      template[:actions] << create_category
+      expect(
+        CustomWizard::TemplateValidator.new(template).perform
+      ).to eq(true)
+    end
+  end
+
   context "steps" do
     CustomWizard::TemplateValidator.required[:step].each do |attribute|
       it "invalidates if \"#{attribute.to_s}\" is not present" do
@@ -165,7 +229,9 @@ describe CustomWizard::TemplateValidator do
         end
 
         it "validates preview templates" do
-          template[:steps][0][:fields][4][:preview_template] = invalid_liquid_template
+          enable_subscription("standard")
+          template[:steps][0][:fields] << composer_preview
+          template[:steps][0][:fields][3][:preview_template] = invalid_liquid_template
           expect_validation_failure("step_1_field_5.preview_template", liquid_syntax_error)
         end
       end
diff --git a/spec/components/custom_wizard/update_validator_spec.rb b/spec/components/custom_wizard/update_validator_spec.rb
index b8aea789..7caa1784 100644
--- a/spec/components/custom_wizard/update_validator_spec.rb
+++ b/spec/components/custom_wizard/update_validator_spec.rb
@@ -2,12 +2,8 @@
 
 describe CustomWizard::UpdateValidator do
   fab!(:user) { Fabricate(:user) }
-
-  let(:template) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-    ).read).with_indifferent_access
-  }
+  let(:template) { get_wizard_fixture("wizard") }
+  let(:url_field) { get_wizard_fixture("field/url") }
 
   before do
     CustomWizard::Template.save(template, skip_jobs: true)
@@ -26,7 +22,6 @@ describe CustomWizard::UpdateValidator do
 
     @template[:steps][0][:fields][0][:min_length] = min_length
     @template[:steps][0][:fields][1][:min_length] = min_length
-    @template[:steps][0][:fields][2][:min_length] = min_length
 
     CustomWizard::Template.save(@template)
 
@@ -39,11 +34,6 @@ describe CustomWizard::UpdateValidator do
     expect(
       updater.errors.messages[:step_1_field_2].first
     ).to eq(I18n.t('wizard.field.too_short', label: 'Textarea', min: min_length))
-
-    updater = perform_validation('step_1', step_1_field_3: 'Te')
-    expect(
-      updater.errors.messages[:step_1_field_3].first
-    ).to eq(I18n.t('wizard.field.too_short', label: 'Composer', min: min_length))
   end
 
   it 'prevents submission if the length is over the max length' do
@@ -51,7 +41,6 @@ describe CustomWizard::UpdateValidator do
 
     @template[:steps][0][:fields][0][:max_length] = max_length
     @template[:steps][0][:fields][1][:max_length] = max_length
-    @template[:steps][0][:fields][2][:max_length] = max_length
 
     CustomWizard::Template.save(@template)
     long_string = "Our Competitive Capability solution offers platforms a suite of wholesale offerings. In the future, will you be able to effectively revolutionize synergies in your business? In the emerging market space, industry is ethically investing its mission critical executive searches. Key players will take ownership of their capabilities by iteratively right-sizing world-class visibilities. "
@@ -64,11 +53,6 @@ describe CustomWizard::UpdateValidator do
     expect(
       updater.errors.messages[:step_1_field_2].first
     ).to eq(I18n.t('wizard.field.too_long', label: 'Textarea', max: max_length))
-
-    updater = perform_validation('step_1', step_1_field_3: long_string)
-    expect(
-      updater.errors.messages[:step_1_field_3].first
-    ).to eq(I18n.t('wizard.field.too_long', label: 'Composer', max: max_length))
   end
 
   it "allows submission if the length is under or equal to the max length" do
@@ -76,7 +60,6 @@ describe CustomWizard::UpdateValidator do
 
     @template[:steps][0][:fields][0][:max_length] = max_length
     @template[:steps][0][:fields][1][:max_length] = max_length
-    @template[:steps][0][:fields][2][:max_length] = max_length
 
     CustomWizard::Template.save(@template)
     hundred_chars_string = "This is a line, exactly hundred characters long and not more even a single character more than that."
@@ -89,11 +72,6 @@ describe CustomWizard::UpdateValidator do
     expect(
       updater.errors.messages[:step_1_field_2].first
     ).to eq(nil)
-
-    updater = perform_validation('step_1', step_1_field_3: hundred_chars_string)
-    expect(
-      updater.errors.messages[:step_1_field_3].first
-    ).to eq(nil)
   end
 
   it "applies min length only if the input is non-empty" do
@@ -136,25 +114,33 @@ describe CustomWizard::UpdateValidator do
     ).to eq(I18n.t('wizard.field.required', label: 'Textarea'))
   end
 
-  it 'validates url fields' do
-    updater = perform_validation('step_2', step_2_field_6: 'https://discourse.com')
-    expect(
-      updater.errors.messages[:step_2_field_6].first
-    ).to eq(nil)
-  end
+  context "subscription fields" do
+    before do
+      enable_subscription("standard")
+    end
 
-  it 'does not validate url fields with non-url inputs' do
-    updater = perform_validation('step_2', step_2_field_6: 'discourse')
-    expect(
-      updater.errors.messages[:step_2_field_6].first
-    ).to eq(I18n.t('wizard.field.not_url', label: 'Url'))
-  end
+    it 'validates url fields' do
+      updater = perform_validation('step_2', step_2_field_6: 'https://discourse.com')
+      expect(
+        updater.errors.messages[:step_2_field_6].first
+      ).to eq(nil)
+    end
 
-  it 'validates empty url fields' do
-    updater = perform_validation('step_2', step_2_field_6: '')
-    expect(
-      updater.errors.messages[:step_2_field_6].first
-    ).to eq(nil)
+    it 'does not validate url fields with non-url inputs' do
+      template[:steps][0][:fields] << url_field
+      CustomWizard::Template.save(template)
+      updater = perform_validation('step_1', step_2_field_6: 'discourse')
+      expect(
+        updater.errors.messages[:step_2_field_6].first
+      ).to eq(I18n.t('wizard.field.not_url', label: 'Url'))
+    end
+
+    it 'validates empty url fields' do
+      updater = perform_validation('step_2', step_2_field_6: '')
+      expect(
+        updater.errors.messages[:step_2_field_6].first
+      ).to eq(nil)
+    end
   end
 
   it 'validates date fields' do
diff --git a/spec/components/custom_wizard/wizard_spec.rb b/spec/components/custom_wizard/wizard_spec.rb
index cf366f43..8268849c 100644
--- a/spec/components/custom_wizard/wizard_spec.rb
+++ b/spec/components/custom_wizard/wizard_spec.rb
@@ -4,22 +4,8 @@ describe CustomWizard::Wizard do
   fab!(:user) { Fabricate(:user) }
   fab!(:trusted_user) { Fabricate(:user, trust_level: TrustLevel[3]) }
   fab!(:admin_user) { Fabricate(:user, admin: true) }
-
-  let(:template_json) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read
-    )
-  }
-
-  let(:permitted_json) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard/permitted.json"
-      ).read
-    )
-  }
+  let(:template_json) { get_wizard_fixture("wizard") }
+  let(:permitted_json) { get_wizard_fixture("wizard/permitted") }
 
   before do
     Group.refresh_automatic_group!(:trust_level_3)
@@ -127,69 +113,91 @@ describe CustomWizard::Wizard do
     expect(wizard.completed?).to eq(false)
   end
 
-  it "permits admins" do
-    expect(
-      CustomWizard::Wizard.new(@permitted_template, admin_user).permitted?
-    ).to eq(true)
-  end
+  context "with subscription" do
+    before do
+      enable_subscription("standard")
+    end
 
-  it "permits permitted users" do
-    expect(
-      CustomWizard::Wizard.new(@permitted_template, trusted_user).permitted?
-    ).to eq(true)
-  end
+    it "permits admins" do
+      expect(
+        CustomWizard::Wizard.new(@permitted_template, admin_user).permitted?
+      ).to eq(true)
+    end
 
-  it "permits everyone if everyone is permitted" do
-    @permitted_template['permitted'][0]['output'] = Group::AUTO_GROUPS[:everyone]
-    expect(
-      CustomWizard::Wizard.new(@permitted_template, user).permitted?
-    ).to eq(true)
-  end
+    it "permits permitted users" do
+      expect(
+        CustomWizard::Wizard.new(@permitted_template, trusted_user).permitted?
+      ).to eq(true)
+    end
 
-  it "does not permit unpermitted users" do
-    expect(
-      CustomWizard::Wizard.new(@permitted_template, user).permitted?
-    ).to eq(false)
-  end
+    it "permits everyone if everyone is permitted" do
+      @permitted_template['permitted'][0]['output'] = Group::AUTO_GROUPS[:everyone]
+      expect(
+        CustomWizard::Wizard.new(@permitted_template, user).permitted?
+      ).to eq(true)
+    end
 
-  it "does not let an unpermitted user access a wizard" do
-    expect(
-      CustomWizard::Wizard.new(@permitted_template, user).can_access?
-    ).to eq(false)
-  end
+    it "does not permit unpermitted users" do
+      expect(
+        CustomWizard::Wizard.new(@permitted_template, user).permitted?
+      ).to eq(false)
+    end
 
-  it "lets a permitted user access an incomplete wizard" do
-    expect(
-      CustomWizard::Wizard.new(@permitted_template, trusted_user).can_access?
-    ).to eq(true)
-  end
+    it "does not let an unpermitted user access a wizard" do
+      expect(
+        CustomWizard::Wizard.new(@permitted_template, user).can_access?
+      ).to eq(false)
+    end
 
-  it "lets a permitted user access a complete wizard with multiple submissions" do
-    append_steps
+    it "lets a permitted user access an incomplete wizard" do
+      expect(
+        CustomWizard::Wizard.new(@permitted_template, trusted_user).can_access?
+      ).to eq(true)
+    end
 
-    progress_step("step_1", acting_user: trusted_user)
-    progress_step("step_2", acting_user: trusted_user)
-    progress_step("step_3", acting_user: trusted_user)
+    it "lets a permitted user access a complete wizard with multiple submissions" do
+      append_steps
 
-    @permitted_template["multiple_submissions"] = true
+      progress_step("step_1", acting_user: trusted_user)
+      progress_step("step_2", acting_user: trusted_user)
+      progress_step("step_3", acting_user: trusted_user)
 
-    expect(
-      CustomWizard::Wizard.new(@permitted_template, trusted_user).can_access?
-    ).to eq(true)
-  end
+      @permitted_template["multiple_submissions"] = true
 
-  it "does not let an unpermitted user access a complete wizard without multiple submissions" do
-    append_steps
+      expect(
+        CustomWizard::Wizard.new(@permitted_template, trusted_user).can_access?
+      ).to eq(true)
+    end
 
-    progress_step("step_1", acting_user: trusted_user)
-    progress_step("step_2", acting_user: trusted_user)
-    progress_step("step_3", acting_user: trusted_user)
+    it "does not let an unpermitted user access a complete wizard without multiple submissions" do
+      append_steps
 
-    @permitted_template['multiple_submissions'] = false
+      progress_step("step_1", acting_user: trusted_user)
+      progress_step("step_2", acting_user: trusted_user)
+      progress_step("step_3", acting_user: trusted_user)
 
-    expect(
-      CustomWizard::Wizard.new(@permitted_template, trusted_user).can_access?
-    ).to eq(false)
+      @permitted_template['multiple_submissions'] = false
+
+      expect(
+        CustomWizard::Wizard.new(@permitted_template, trusted_user).can_access?
+      ).to eq(false)
+    end
+
+    it "sets wizard redirects if user is permitted" do
+      CustomWizard::Template.save(@permitted_template, skip_jobs: true)
+      CustomWizard::Wizard.set_user_redirect('super_mega_fun_wizard', trusted_user)
+      expect(
+        trusted_user.custom_fields['redirect_to_wizard']
+      ).to eq("super_mega_fun_wizard")
+    end
+
+    it "does not set a wizard redirect if user is not permitted" do
+      CustomWizard::Template.save(@permitted_template, skip_jobs: true)
+      CustomWizard::Wizard.set_user_redirect('super_mega_fun_wizard', user)
+      expect(
+        trusted_user.custom_fields['redirect_to_wizard']
+      ).to eq(nil)
+    end
   end
 
   context "submissions" do
@@ -208,6 +216,7 @@ describe CustomWizard::Wizard do
 
   context "class methods" do
     before do
+      enable_subscription("standard")
       CustomWizard::Template.save(@permitted_template, skip_jobs: true)
 
       template_json_2 = template_json.dup
@@ -243,20 +252,4 @@ describe CustomWizard::Wizard do
       expect(CustomWizard::Wizard.prompt_completion(user).length).to eq(1)
     end
   end
-
-  it "sets wizard redirects if user is permitted" do
-    CustomWizard::Template.save(@permitted_template, skip_jobs: true)
-    CustomWizard::Wizard.set_user_redirect('super_mega_fun_wizard', trusted_user)
-    expect(
-      trusted_user.custom_fields['redirect_to_wizard']
-    ).to eq("super_mega_fun_wizard")
-  end
-
-  it "does not set a wizard redirect if user is not permitted" do
-    CustomWizard::Template.save(@permitted_template, skip_jobs: true)
-    CustomWizard::Wizard.set_user_redirect('super_mega_fun_wizard', user)
-    expect(
-      trusted_user.custom_fields['redirect_to_wizard']
-    ).to eq(nil)
-  end
 end
diff --git a/spec/extensions/custom_field_extensions_spec.rb b/spec/extensions/custom_field_extensions_spec.rb
index 1b7ec6bf..b0088972 100644
--- a/spec/extensions/custom_field_extensions_spec.rb
+++ b/spec/extensions/custom_field_extensions_spec.rb
@@ -7,11 +7,8 @@ describe "custom field extensions" do
   fab!(:group) { Fabricate(:group) }
   fab!(:user) { Fabricate(:user) }
 
-  let(:custom_field_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/custom_field/custom_fields.json"
-    ).read)
-  }
+  let(:custom_field_json) { get_wizard_fixture("custom_field/custom_fields") }
+  let(:subscription_custom_field_json) { get_wizard_fixture("custom_field/subscription_custom_fields") }
 
   before do
     custom_field_json['custom_fields'].each do |field_json|
@@ -73,43 +70,54 @@ describe "custom field extensions" do
     end
   end
 
-  context "category" do
-    it "registers category custom fields" do
-      category
-      expect(Category.get_custom_field_type("category_field_1")).to eq(:json)
+  context "subscription custom fields" do
+    before do
+      enable_subscription("business")
+
+      subscription_custom_field_json['custom_fields'].each do |field_json|
+        custom_field = CustomWizard::CustomField.new(nil, field_json)
+        custom_field.save
+      end
     end
 
-    it "adds category custom fields to the basic category serializer" do
-      category.custom_fields["category_field_1"] = { a: 1, b: 2 }.to_json
-      category.save_custom_fields(true)
+    context "category" do
+      it "registers" do
+        category
+        expect(Category.get_custom_field_type("category_field_1")).to eq(:json)
+      end
 
-      serializer = BasicCategorySerializer.new(
-        category,
-        scope: Guardian.new(user),
-        root: false
-      ).as_json
+      it "adds custom fields to the basic category serializer" do
+        category.custom_fields["category_field_1"] = { a: 1, b: 2 }.to_json
+        category.save_custom_fields(true)
 
-      expect(serializer[:category_field_1]).to eq({ a: 1, b: 2 }.to_json)
-    end
-  end
+        serializer = BasicCategorySerializer.new(
+          category,
+          scope: Guardian.new(user),
+          root: false
+        ).as_json
 
-  context "group" do
-    it "registers group custom fields" do
-      group
-      expect(Group.get_custom_field_type("group_field_1")).to eq(:string)
+        expect(serializer[:category_field_1]).to eq({ a: 1, b: 2 }.to_json)
+      end
     end
 
-    it "adds group custom fields to the basic group serializer" do
-      group.custom_fields["group_field_1"] = "Hello"
-      group.save_custom_fields(true)
+    context "group" do
+      it "registers" do
+        group
+        expect(Group.get_custom_field_type("group_field_1")).to eq(:string)
+      end
 
-      serializer = BasicGroupSerializer.new(
-        group,
-        scope: Guardian.new(user),
-        root: false
-      ).as_json
+      it "adds custom fields to the basic group serializer" do
+        group.custom_fields["group_field_1"] = "Hello"
+        group.save_custom_fields(true)
 
-      expect(serializer[:group_field_1]).to eq("Hello")
+        serializer = BasicGroupSerializer.new(
+          group,
+          scope: Guardian.new(user),
+          root: false
+        ).as_json
+
+        expect(serializer[:group_field_1]).to eq("Hello")
+      end
     end
   end
 end
diff --git a/spec/extensions/extra_locales_controller_spec.rb b/spec/extensions/extra_locales_controller_spec.rb
index 32d3940c..1be62f36 100644
--- a/spec/extensions/extra_locales_controller_spec.rb
+++ b/spec/extensions/extra_locales_controller_spec.rb
@@ -3,18 +3,8 @@
 describe ExtraLocalesControllerCustomWizard, type: :request do
   let(:new_user) { Fabricate(:user, trust_level: TrustLevel[0]) }
   let(:staff_user) { Fabricate(:moderator) }
-
-  let(:template) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-    ).read)
-  }
-
-  let(:permitted) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard/permitted.json"
-    ).read)
-  }
+  let(:template) { get_wizard_fixture("wizard") }
+  let(:permitted) { get_wizard_fixture("wizard/permitted") }
 
   before do
     CustomWizard::Template.save(template, skip_jobs: true)
diff --git a/spec/extensions/invites_controller_spec.rb b/spec/extensions/invites_controller_spec.rb
index 42e0ece7..99c3b402 100644
--- a/spec/extensions/invites_controller_spec.rb
+++ b/spec/extensions/invites_controller_spec.rb
@@ -3,12 +3,7 @@
 describe InvitesControllerCustomWizard, type: :request do
   fab!(:topic) { Fabricate(:topic) }
   let(:invite) { Invite.generate(topic.user, email: "angus@mcleod.org", topic: topic) }
-
-  let(:template) do
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-    ).read)
-  end
+  let(:template) { get_wizard_fixture("wizard") }
 
   before do
     @controller = InvitesController.new
diff --git a/spec/extensions/users_controller_spec.rb b/spec/extensions/users_controller_spec.rb
index 0c220a62..a28dc08e 100644
--- a/spec/extensions/users_controller_spec.rb
+++ b/spec/extensions/users_controller_spec.rb
@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 describe CustomWizardUsersController, type: :request do
-  let(:template) do
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-    ).read)
-  end
+  let(:template) { get_wizard_fixture("wizard") }
 
   before do
     @controller = UsersController.new
diff --git a/spec/fixtures/actions/add_to_group.json b/spec/fixtures/actions/add_to_group.json
new file mode 100644
index 00000000..2a5af1c3
--- /dev/null
+++ b/spec/fixtures/actions/add_to_group.json
@@ -0,0 +1,13 @@
+{
+  "id": "action_6",
+  "run_after": "step_1",
+  "type": "add_to_group",
+  "group": [
+    {
+      "type": "assignment",
+      "output": "action_9",
+      "output_type": "wizard_action",
+      "output_connector": "set"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/spec/fixtures/actions/create_category.json b/spec/fixtures/actions/create_category.json
new file mode 100644
index 00000000..c5f3d5af
--- /dev/null
+++ b/spec/fixtures/actions/create_category.json
@@ -0,0 +1,51 @@
+{
+  "id": "action_8",
+  "run_after": "step_1",
+  "type": "create_category",
+  "custom_fields": [
+    {
+      "type": "association",
+      "pairs": [
+        {
+          "index": 0,
+          "key": "category_custom_field",
+          "key_type": "text",
+          "value": "CC Val",
+          "value_type": "text",
+          "connector": "association"
+        }
+      ]
+    }
+  ],
+  "name": [
+    {
+      "type": "assignment",
+      "output": "step_1_field_1",
+      "output_type": "wizard_field",
+      "output_connector": "set"
+    }
+  ],
+  "slug": [
+    {
+      "type": "assignment",
+      "output": "step_1_field_1",
+      "output_type": "wizard_field",
+      "output_connector": "set"
+    }
+  ],
+  "permissions": [
+    {
+      "type": "association",
+      "pairs": [
+        {
+          "index": 0,
+          "key": "action_9",
+          "key_type": "wizard_action",
+          "value": "2",
+          "value_type": "text",
+          "connector": "association"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/spec/fixtures/actions/create_group.json b/spec/fixtures/actions/create_group.json
new file mode 100644
index 00000000..e2e52ef2
--- /dev/null
+++ b/spec/fixtures/actions/create_group.json
@@ -0,0 +1,104 @@
+{
+  "id": "action_9",
+  "run_after": "step_1",
+  "type": "create_group",
+  "title": [
+    {
+      "type": "assignment",
+      "output": "New Group Member",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "custom_fields": [
+    {
+      "type": "association",
+      "pairs": [
+        {
+          "index": 0,
+          "key": "group_custom_field",
+          "key_type": "text",
+          "value": "step_3_field_1",
+          "value_type": "wizard_field",
+          "connector": "association"
+        }
+      ]
+    }
+  ],
+  "name": [
+    {
+      "type": "assignment",
+      "output": "step_1_field_1",
+      "output_type": "wizard_field",
+      "output_connector": "set"
+    }
+  ],
+  "full_name": [
+    {
+      "type": "assignment",
+      "output": "step_1_field_1",
+      "output_type": "wizard_field",
+      "output_connector": "set"
+    }
+  ],
+  "usernames": [
+    {
+      "type": "assignment",
+      "output_type": "user",
+      "output_connector": "set",
+      "output": [
+        "angus1"
+      ]
+    }
+  ],
+  "owner_usernames": [
+    {
+      "type": "assignment",
+      "output_type": "user",
+      "output_connector": "set",
+      "output": [
+        "angus"
+      ]
+    }
+  ],
+  "grant_trust_level": [
+    {
+      "type": "assignment",
+      "output": "3",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "mentionable_level": [
+    {
+      "type": "assignment",
+      "output": "1",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "messageable_level": [
+    {
+      "type": "assignment",
+      "output": "2",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "visibility_level": [
+    {
+      "type": "assignment",
+      "output": "3",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "members_visibility_level": [
+    {
+      "type": "assignment",
+      "output": "99",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/spec/fixtures/actions/send_message.json b/spec/fixtures/actions/send_message.json
new file mode 100644
index 00000000..ddc9bf10
--- /dev/null
+++ b/spec/fixtures/actions/send_message.json
@@ -0,0 +1,25 @@
+{
+  "id": "action_2",
+  "run_after": "step_2",
+  "type": "send_message",
+  "post_builder": true,
+  "post_template": "I will interpolate some wizard fields w{step_1_field_1} w{step_1_field_2}",
+  "title": [
+    {
+      "type": "assignment",
+      "output": "Message title",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "recipient": [
+    {
+      "type": "assignment",
+      "output_type": "user",
+      "output_connector": "set",
+      "output": [
+        "angus1"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/spec/fixtures/actions/send_message_multi.json b/spec/fixtures/actions/send_message_multi.json
new file mode 100644
index 00000000..8ab0fdb7
--- /dev/null
+++ b/spec/fixtures/actions/send_message_multi.json
@@ -0,0 +1,28 @@
+{
+  "id": "action_11",
+  "run_after": "step_2",
+  "type": "send_message",
+  "post_builder": true,
+  "post_template": "I will interpolate some wizard fields w{step_1_field_1} w{step_1_field_2}",
+  "title": [
+    {
+      "type": "assignment",
+      "output": "Multiple Recipients title",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "recipient": [
+    {
+      "type": "assignment",
+      "output_type": "user",
+      "output_connector": "set",
+      "output": [
+        "angus1",
+        "faiz",
+        "cool_group",
+        "cool_group_1"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/spec/fixtures/actions/watch_categories.json b/spec/fixtures/actions/watch_categories.json
new file mode 100644
index 00000000..20644f44
--- /dev/null
+++ b/spec/fixtures/actions/watch_categories.json
@@ -0,0 +1,23 @@
+{
+  "id": "action_5",
+  "run_after": "step_1",
+  "type": "watch_categories",
+  "notification_level": "tracking",
+  "wizard_user": true,
+  "categories": [
+    {
+      "type": "assignment",
+      "output": "",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ],
+  "mute_remainder": [
+    {
+      "type": "assignment",
+      "output": "true",
+      "output_type": "text",
+      "output_connector": "set"
+    }
+  ]
+}
diff --git a/spec/fixtures/api/no_authorization.json b/spec/fixtures/api/no_authorization.json
new file mode 100644
index 00000000..b1c6506e
--- /dev/null
+++ b/spec/fixtures/api/no_authorization.json
@@ -0,0 +1,3 @@
+{
+  "auth_type": "none"
+}
\ No newline at end of file
diff --git a/spec/fixtures/custom_field/custom_fields.json b/spec/fixtures/custom_field/custom_fields.json
index 0e7741ce..c9b98476 100644
--- a/spec/fixtures/custom_field/custom_fields.json
+++ b/spec/fixtures/custom_field/custom_fields.json
@@ -16,22 +16,6 @@
       "serializers": [
         "post"
       ]
-    },
-    {
-      "klass": "category",
-      "name": "category_field_1",
-      "type": "json",
-      "serializers": [
-        "basic_category"
-      ]
-    },
-    {
-      "klass": "group",
-      "name": "group_field_1",
-      "type": "string",
-      "serializers": [
-        "basic_group"
-      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/spec/fixtures/custom_field/subscription_custom_fields.json b/spec/fixtures/custom_field/subscription_custom_fields.json
new file mode 100644
index 00000000..b7060bdf
--- /dev/null
+++ b/spec/fixtures/custom_field/subscription_custom_fields.json
@@ -0,0 +1,28 @@
+{
+  "custom_fields": [
+    {
+      "klass": "topic",
+      "name": "topic_field_2",
+      "type": "json",
+      "serializers": [
+        "topic_view"
+      ]
+    },
+    {
+      "klass": "category",
+      "name": "category_field_1",
+      "type": "json",
+      "serializers": [
+        "basic_category"
+      ]
+    },
+    {
+      "klass": "group",
+      "name": "group_field_1",
+      "type": "string",
+      "serializers": [
+        "basic_group"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/spec/fixtures/endpoints/test_endpoint.json b/spec/fixtures/endpoints/test_endpoint.json
new file mode 100644
index 00000000..ba979064
--- /dev/null
+++ b/spec/fixtures/endpoints/test_endpoint.json
@@ -0,0 +1,5 @@
+{
+  "method": "PUT",
+  "url": "https://myexternalapi.com/update",
+  "success_codes": [200]
+}
\ No newline at end of file
diff --git a/spec/fixtures/endpoints/test_endpoint_body.json b/spec/fixtures/endpoints/test_endpoint_body.json
new file mode 100644
index 00000000..837e7c72
--- /dev/null
+++ b/spec/fixtures/endpoints/test_endpoint_body.json
@@ -0,0 +1,3 @@
+{
+  "data": "some_data"
+}
\ No newline at end of file
diff --git a/spec/fixtures/field/advanced_types.json b/spec/fixtures/field/advanced_types.json
new file mode 100644
index 00000000..63357cdb
--- /dev/null
+++ b/spec/fixtures/field/advanced_types.json
@@ -0,0 +1,27 @@
+{
+  "fields": [
+    {
+      "id": "step_3_field_2",
+      "label": "Tag",
+      "type": "tag"
+    },
+    {
+      "id": "step_3_field_3",
+      "label": "Category",
+      "type": "category",
+      "limit": 1,
+      "property": "id"
+    },
+    {
+      "id": "step_3_field_4",
+      "label": "Group",
+      "type": "group"
+    },
+    {
+      "id": "step_3_field_5",
+      "label": "User Selector",
+      "description": "",
+      "type": "user_selector"
+    }
+  ]
+}
diff --git a/spec/fixtures/field/composer_preview.json b/spec/fixtures/field/composer_preview.json
new file mode 100644
index 00000000..f4bec04a
--- /dev/null
+++ b/spec/fixtures/field/composer_preview.json
@@ -0,0 +1,7 @@
+{
+  "id": "step_1_field_5",
+  "label": "I'm a preview",
+  "description": "",
+  "type": "composer_preview",
+  "preview_template": "w{step_1_field_1}"
+}
diff --git a/spec/fixtures/field/url.json b/spec/fixtures/field/url.json
new file mode 100644
index 00000000..e3153fe9
--- /dev/null
+++ b/spec/fixtures/field/url.json
@@ -0,0 +1,5 @@
+{
+  "id": "step_2_field_6",
+  "label": "Url",
+  "type": "url"
+}
diff --git a/spec/fixtures/sprockets/require_tree_discourse_empty.js b/spec/fixtures/sprockets/require_tree_discourse_empty.js
index df264ec5..953c5ec4 100644
--- a/spec/fixtures/sprockets/require_tree_discourse_empty.js
+++ b/spec/fixtures/sprockets/require_tree_discourse_empty.js
@@ -1 +1 @@
-//= require_tree_discourse 
\ No newline at end of file
+//= require_tree_discourse
\ No newline at end of file
diff --git a/spec/fixtures/subscription_client.rb b/spec/fixtures/subscription_client.rb
new file mode 100644
index 00000000..a041b507
--- /dev/null
+++ b/spec/fixtures/subscription_client.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+module SubscriptionClient; end
+class SubscriptionClientSubscription; end
diff --git a/spec/fixtures/wizard.json b/spec/fixtures/wizard.json
index 01421c7f..de5e636e 100644
--- a/spec/fixtures/wizard.json
+++ b/spec/fixtures/wizard.json
@@ -33,23 +33,11 @@
           "type": "textarea",
           "min_length": ""
         },
-        {
-          "id": "step_1_field_3",
-          "label": "Composer",
-          "type": "composer"
-        },
         {
           "id": "step_1_field_4",
           "label": "I'm only text",
           "description": "",
           "type": "text_only"
-        },
-        {
-          "id": "step_1_field_5",
-          "label": "I'm a preview",
-          "description": "",
-          "type": "composer_preview",
-          "preview_template": "w{step_1_field_1}"
         }
       ],
       "description": "Text inputs!"
@@ -87,11 +75,6 @@
           "label": "Checkbox",
           "type": "checkbox"
         },
-        {
-          "id": "step_2_field_6",
-          "label": "Url",
-          "type": "url"
-        },
         {
           "id": "step_2_field_7",
           "label": "Upload",
@@ -141,232 +124,12 @@
               ]
             }
           ]
-        },
-        {
-          "id": "step_3_field_2",
-          "label": "Tag",
-          "type": "tag"
-        },
-        {
-          "id": "step_3_field_3",
-          "label": "Category",
-          "type": "category",
-          "limit": 1,
-          "property": "id"
-        },
-        {
-          "id": "step_3_field_4",
-          "label": "Group",
-          "type": "group"
-        },
-        {
-          "id": "step_3_field_5",
-          "label": "User Selector",
-          "description": "",
-          "type": "user_selector"
-        },
-        {
-          "id": "step_3_field_6",
-          "label": "Conditional User Selector",
-          "description": "Shown when checkbox in step_2_field_5 is true",
-          "type": "user_selector"
         }
       ],
       "description": "Unfortunately not the edible type :sushi: "
     }
   ],
   "actions": [
-    {
-      "id": "action_9",
-      "run_after": "step_1",
-      "type": "create_group",
-      "title": [
-        {
-          "type": "assignment",
-          "output": "New Group Member",
-          "output_type": "text",
-          "output_connector": "set"
-        }
-      ],
-      "custom_fields": [
-        {
-          "type": "association",
-          "pairs": [
-            {
-              "index": 0,
-              "key": "group_custom_field",
-              "key_type": "text",
-              "value": "step_3_field_1",
-              "value_type": "wizard_field",
-              "connector": "association"
-            }
-          ]
-        }
-      ],
-      "name": [
-        {
-          "type": "assignment",
-          "output": "step_1_field_1",
-          "output_type": "wizard_field",
-          "output_connector": "set"
-        }
-      ],
-      "full_name": [
-        {
-          "type": "assignment",
-          "output": "step_1_field_1",
-          "output_type": "wizard_field",
-          "output_connector": "set"
-        }
-      ],
-      "usernames": [
-        {
-          "type": "assignment",
-          "output_type": "user",
-          "output_connector": "set",
-          "output": [
-            "angus1"
-          ]
-        }
-      ],
-      "owner_usernames": [
-        {
-          "type": "assignment",
-          "output_type": "user",
-          "output_connector": "set",
-          "output": [
-            "angus"
-          ]
-        }
-      ],
-      "grant_trust_level": [
-        {
-          "type": "assignment",
-          "output": "3",
-          "output_type": "text",
-          "output_connector": "set"
-        }
-      ],
-      "mentionable_level": [
-        {
-          "type": "assignment",
-          "output": "1",
-          "output_type": "text",
-          "output_connector": "set"
-        }
-      ],
-      "messageable_level": [
-        {
-          "type": "assignment",
-          "output": "2",
-          "output_type": "text",
-          "output_connector": "set"
-        }
-      ],
-      "visibility_level": [
-        {
-          "type": "assignment",
-          "output": "3",
-          "output_type": "text",
-          "output_connector": "set"
-        }
-      ],
-      "members_visibility_level": [
-        {
-          "type": "assignment",
-          "output": "99",
-          "output_type": "text",
-          "output_connector": "set"
-        }
-      ]
-    },
-    {
-      "id": "action_6",
-      "run_after": "step_1",
-      "type": "add_to_group",
-      "group": [
-        {
-          "type": "assignment",
-          "output": "action_9",
-          "output_type": "wizard_action",
-          "output_connector": "set"
-        }
-      ]
-    },
-    {
-      "id": "action_8",
-      "run_after": "step_1",
-      "type": "create_category",
-      "custom_fields": [
-        {
-          "type": "association",
-          "pairs": [
-            {
-              "index": 0,
-              "key": "category_custom_field",
-              "key_type": "text",
-              "value": "CC Val",
-              "value_type": "text",
-              "connector": "association"
-            }
-          ]
-        }
-      ],
-      "name": [
-        {
-          "type": "assignment",
-          "output": "step_1_field_1",
-          "output_type": "wizard_field",
-          "output_connector": "set"
-        }
-      ],
-      "slug": [
-        {
-          "type": "assignment",
-          "output": "step_1_field_1",
-          "output_type": "wizard_field",
-          "output_connector": "set"
-        }
-      ],
-      "permissions": [
-        {
-          "type": "association",
-          "pairs": [
-            {
-              "index": 0,
-              "key": "action_9",
-              "key_type": "wizard_action",
-              "value": "2",
-              "value_type": "text",
-              "connector": "association"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "id": "action_5",
-      "run_after": "step_1",
-      "type": "watch_categories",
-      "notification_level": "tracking",
-      "wizard_user": true,
-      "categories": [
-        {
-          "type": "assignment",
-          "output": "action_8",
-          "output_type": "wizard_action",
-          "output_connector": "set"
-        }
-      ],
-      "mute_remainder": [
-        {
-          "type": "assignment",
-          "output": "true",
-          "output_type": "text",
-          "output_connector": "set"
-        }
-      ]
-    },
     {
       "id": "action_1",
       "run_after": "step_3",
@@ -475,59 +238,6 @@
         }
       ]
     },
-    {
-      "id": "action_2",
-      "run_after": "step_2",
-      "type": "send_message",
-      "post_builder": true,
-      "post_template": "I will interpolate some wizard fields w{step_1_field_1} w{step_1_field_2}",
-      "title": [
-        {
-          "type": "assignment",
-          "output": "Message title",
-          "output_type": "text",
-          "output_connector": "set"
-        }
-      ],
-      "recipient": [
-        {
-          "type": "assignment",
-          "output_type": "user",
-          "output_connector": "set",
-          "output": [
-            "angus1"
-          ]
-        }
-      ]
-    },
-    {
-      "id": "action_11",
-      "run_after": "step_2",
-      "type": "send_message",
-      "post_builder": true,
-      "post_template": "I will interpolate some wizard fields w{step_1_field_1} w{step_1_field_2}",
-      "title": [
-        {
-          "type": "assignment",
-          "output": "Multiple Recipients title",
-          "output_type": "text",
-          "output_connector": "set"
-        }
-      ],
-      "recipient": [
-        {
-          "type": "assignment",
-          "output_type": "user",
-          "output_connector": "set",
-          "output": [
-            "angus1",
-            "faiz",
-            "cool_group",
-            "cool_group_1"
-          ]
-        }
-      ]
-    },
     {
       "id": "action_3",
       "run_after": "step_2",
@@ -542,24 +252,6 @@
           "output_connector": "set"
         }
       ],
-      "category": [
-        {
-          "type": "assignment",
-          "output": "action_8",
-          "output_type": "wizard_action",
-          "output_connector": "set",
-          "pairs": [
-            {
-              "index": 0,
-              "key": "step_2_field_5",
-              "key_type": "wizard_field",
-              "value": "true",
-              "value_type": "text",
-              "connector": "is"
-            }
-          ]
-        }
-      ],
       "tags": [
         {
           "type": "assignment",
diff --git a/spec/jobs/set_after_time_wizard_spec.rb b/spec/jobs/set_after_time_wizard_spec.rb
index 40418d13..8162cfd2 100644
--- a/spec/jobs/set_after_time_wizard_spec.rb
+++ b/spec/jobs/set_after_time_wizard_spec.rb
@@ -5,11 +5,7 @@ describe Jobs::SetAfterTimeWizard do
   fab!(:user2) { Fabricate(:user) }
   fab!(:user3) { Fabricate(:user) }
 
-  let(:template) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-    ).read).with_indifferent_access
-  }
+  let(:template) { get_wizard_fixture("wizard") }
 
   it "sets wizard redirect for all users " do
     after_time_template = template.dup
diff --git a/spec/plugin_helper.rb b/spec/plugin_helper.rb
new file mode 100644
index 00000000..a0189de1
--- /dev/null
+++ b/spec/plugin_helper.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+def get_wizard_fixture(path)
+  JSON.parse(
+    File.open(
+      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/#{path}.json"
+    ).read
+  ).with_indifferent_access
+end
+
+def enable_subscription(type)
+  CustomWizard::Subscription.stubs(:client_installed?).returns(true)
+  CustomWizard::Subscription.stubs("#{type}?".to_sym).returns(true)
+  CustomWizard::Subscription.any_instance.stubs("#{type}?".to_sym).returns(true)
+end
diff --git a/spec/requests/custom_wizard/admin/custom_fields_controller_spec.rb b/spec/requests/custom_wizard/admin/custom_fields_controller_spec.rb
index 1690660f..7aef791c 100644
--- a/spec/requests/custom_wizard/admin/custom_fields_controller_spec.rb
+++ b/spec/requests/custom_wizard/admin/custom_fields_controller_spec.rb
@@ -2,12 +2,7 @@
 
 describe CustomWizard::AdminCustomFieldsController do
   fab!(:admin_user) { Fabricate(:user, admin: true) }
-
-  let(:custom_field_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/custom_field/custom_fields.json"
-    ).read)
-  }
+  let(:custom_field_json) { get_wizard_fixture("custom_field/custom_fields") }
 
   before do
     custom_field_json['custom_fields'].each do |field_json|
@@ -18,7 +13,7 @@ describe CustomWizard::AdminCustomFieldsController do
 
   it "returns the full list of custom fields" do
     get "/admin/wizards/custom-fields.json"
-    expect(response.parsed_body.length).to eq(12)
+    expect(response.parsed_body["custom_fields"].length).to be > 2
   end
 
   it "saves custom fields" do
diff --git a/spec/requests/custom_wizard/admin/logs_controller_spec.rb b/spec/requests/custom_wizard/admin/logs_controller_spec.rb
index a2f619e4..b67907a4 100644
--- a/spec/requests/custom_wizard/admin/logs_controller_spec.rb
+++ b/spec/requests/custom_wizard/admin/logs_controller_spec.rb
@@ -2,21 +2,40 @@
 
 describe CustomWizard::AdminLogsController do
   fab!(:admin_user) { Fabricate(:user, admin: true) }
+  let(:template) { get_wizard_fixture("wizard") }
 
   before do
-    CustomWizard::Log.create("First log message")
-    CustomWizard::Log.create("Second log message")
-    CustomWizard::Log.create("Third log message")
+    ["first", "second", "third"].each_with_index do |key, index|
+      temp = template.dup
+      temp["id"] = "#{key}_test_wizard"
+      CustomWizard::Template.save(temp, skip_jobs: true)
+      CustomWizard::Log.create("#{key}_test_wizard", "perform_#{key}_action", "#{key}_test_user", "#{key} log message")
+    end
     sign_in(admin_user)
   end
 
-  it "returns a list of logs" do
+  it "returns a list of wizards" do
     get "/admin/wizards/logs.json"
     expect(response.parsed_body.length).to eq(3)
   end
 
+  it "returns a list of logs for a wizard" do
+    get "/admin/wizards/logs/first_test_wizard.json"
+    expect(response.parsed_body['logs'].length).to eq(1)
+  end
+
   it "paginates" do
-    get "/admin/wizards/logs.json", params: { page: 1, limit: 2 }
-    expect(response.parsed_body.length).to eq(1)
+    get "/admin/wizards/logs/first_test_wizard.json", params: { page: 1 }
+    expect(response.parsed_body['logs'].length).to eq(0)
+  end
+
+  it "returns total logs for a wizard" do
+    get "/admin/wizards/logs/first_test_wizard.json"
+    expect(response.parsed_body['total']).to eq(1)
+  end
+
+  it "returns basic wizard" do
+    get "/admin/wizards/logs/first_test_wizard.json"
+    expect(response.parsed_body['wizard']['id']).to eq("first_test_wizard")
   end
 end
diff --git a/spec/requests/custom_wizard/admin/manager_controller_spec.rb b/spec/requests/custom_wizard/admin/manager_controller_spec.rb
index 5c7b3ec3..30c1aa3a 100644
--- a/spec/requests/custom_wizard/admin/manager_controller_spec.rb
+++ b/spec/requests/custom_wizard/admin/manager_controller_spec.rb
@@ -2,12 +2,7 @@
 
 describe CustomWizard::AdminManagerController do
   fab!(:admin_user) { Fabricate(:user, admin: true) }
-
-  let(:template) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-    ).read)
-  }
+  let(:template) { get_wizard_fixture("wizard") }
 
   before do
     sign_in(admin_user)
diff --git a/spec/requests/custom_wizard/admin/submissions_controller_spec.rb b/spec/requests/custom_wizard/admin/submissions_controller_spec.rb
index c35b5365..3c740c85 100644
--- a/spec/requests/custom_wizard/admin/submissions_controller_spec.rb
+++ b/spec/requests/custom_wizard/admin/submissions_controller_spec.rb
@@ -6,12 +6,7 @@ describe CustomWizard::AdminSubmissionsController do
   fab!(:user2) { Fabricate(:user) }
   fab!(:user3) { Fabricate(:user) }
 
-  let(:template) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-    ).read)
-  }
-
+  let(:template) { get_wizard_fixture("wizard") }
   let(:template_2) {
     temp = template.dup
     temp["id"] = "super_mega_fun_wizard_2"
diff --git a/spec/requests/custom_wizard/admin/wizard_controller_spec.rb b/spec/requests/custom_wizard/admin/wizard_controller_spec.rb
index de287374..9f63cb6b 100644
--- a/spec/requests/custom_wizard/admin/wizard_controller_spec.rb
+++ b/spec/requests/custom_wizard/admin/wizard_controller_spec.rb
@@ -4,15 +4,11 @@ describe CustomWizard::AdminWizardController do
   fab!(:admin_user) { Fabricate(:user, admin: true) }
   fab!(:user1) { Fabricate(:user) }
   fab!(:user2) { Fabricate(:user) }
-
-  let(:template) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-    ).read)
-  }
+  let(:template) { get_wizard_fixture("wizard") }
 
   before do
     CustomWizard::Template.save(template, skip_jobs: true)
+    enable_subscription("standard")
 
     template_2 = template.dup
     template_2["id"] = 'super_mega_fun_wizard_2'
diff --git a/spec/requests/custom_wizard/application_controller_spec.rb b/spec/requests/custom_wizard/application_controller_spec.rb
index 23679c39..1eb1b857 100644
--- a/spec/requests/custom_wizard/application_controller_spec.rb
+++ b/spec/requests/custom_wizard/application_controller_spec.rb
@@ -1,21 +1,11 @@
 # frozen_string_literal: true
 
 describe ApplicationController do
-  fab!(:user) {
-    Fabricate(
-      :user,
-      username: 'angus',
-      email: "angus@email.com",
-      trust_level: TrustLevel[3]
-    )
-  }
+  fab!(:user) { Fabricate(:user, username: 'angus', email: "angus@email.com", trust_level: TrustLevel[3]) }
+  let(:wizard_template) { get_wizard_fixture("wizard") }
 
   before do
-    CustomWizard::Template.save(
-      JSON.parse(File.open(
-          "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read),
-    skip_jobs: true)
+    CustomWizard::Template.save(wizard_template, skip_jobs: true)
     @template = CustomWizard::Template.find('super_mega_fun_wizard')
   end
 
diff --git a/spec/requests/custom_wizard/custom_field_extensions_spec.rb b/spec/requests/custom_wizard/custom_field_extensions_spec.rb
index 5bb7ffd9..44556ef1 100644
--- a/spec/requests/custom_wizard/custom_field_extensions_spec.rb
+++ b/spec/requests/custom_wizard/custom_field_extensions_spec.rb
@@ -6,12 +6,8 @@ describe "custom field extensions" do
   let!(:category) { Fabricate(:category) }
   let!(:user) { Fabricate(:user) }
   let!(:group) { Fabricate(:group, users: [user]) }
-
-  let(:custom_field_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/custom_field/custom_fields.json"
-    ).read)
-  }
+  let(:custom_field_json) { get_wizard_fixture("custom_field/custom_fields") }
+  let(:subscription_custom_field_json) { get_wizard_fixture("custom_field/subscription_custom_fields") }
 
   before do
     custom_field_json['custom_fields'].each do |field_json|
@@ -30,27 +26,6 @@ describe "custom field extensions" do
     expect(response.parsed_body["topic_field_1"]).to eq(true)
   end
 
-  it "adds category custom fields to the show categories response" do
-    category.custom_fields["category_field_1"] = { a: 1, b: 2 }
-    category.save_custom_fields(true)
-
-    get "/c/#{category.id}/show.json"
-
-    expect(response.status).to eq(200)
-    expect(response.parsed_body["category"]["category_field_1"]).to eq({ a: 1, b: 2 }.as_json)
-  end
-
-  it "adds group custom fields to the show group response" do
-    group.custom_fields["group_field_1"] = "Group cf entry"
-    group.save_custom_fields(true)
-
-    sign_in(user)
-    get "/groups/#{group.name}.json"
-
-    expect(response.status).to eq(200)
-    expect(response.parsed_body['group']['group_field_1']).to eq("Group cf entry")
-  end
-
   it "adds post custom fields to the show post response" do
     post.custom_fields["post_field_1"] = 7
     post.save_custom_fields(true)
@@ -61,32 +36,63 @@ describe "custom field extensions" do
     expect(response.parsed_body['post_field_1']).to eq(7)
   end
 
-  context "preloaded" do
-    it "preloads category custom fields on site categories" do
-      Site.preloaded_category_custom_fields << "other_field"
+  context "with a subscription" do
+    before do
+      enable_subscription("business")
+      subscription_custom_field_json['custom_fields'].each do |field_json|
+        custom_field = CustomWizard::CustomField.new(nil, field_json)
+        custom_field.save
+      end
+    end
 
+    it "adds category custom fields to the show categories response" do
       category.custom_fields["category_field_1"] = { a: 1, b: 2 }
       category.save_custom_fields(true)
 
-      get "/site.json"
-      expect(response.status).to eq(200)
+      get "/c/#{category.id}/show.json"
 
-      site_category = response.parsed_body['categories'].select { |c| c['id'] == category.id }.first
-      expect(site_category["category_field_1"]).to eq({ a: 1, b: 2 }.as_json)
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["category"]["category_field_1"]).to eq({ a: 1, b: 2 }.as_json)
     end
 
-    it "preloads group custom fields on group index" do
-      Group.preloaded_custom_field_names << "other_field"
-
-      group = Fabricate(:group)
+    it "adds group custom fields to the show group response" do
       group.custom_fields["group_field_1"] = "Group cf entry"
       group.save_custom_fields(true)
 
-      get "/groups.json"
-      expect(response.status).to eq(200)
+      sign_in(user)
+      get "/groups/#{group.name}.json"
 
-      group = response.parsed_body['groups'].select { |g| g['id'] == group.id }.first
-      expect(group['group_field_1']).to eq("Group cf entry")
+      expect(response.status).to eq(200)
+      expect(response.parsed_body['group']['group_field_1']).to eq("Group cf entry")
+    end
+
+    context "preloaded" do
+      it "preloads category custom fields on site categories" do
+        Site.preloaded_category_custom_fields << "other_field"
+
+        category.custom_fields["category_field_1"] = { a: 1, b: 2 }
+        category.save_custom_fields(true)
+
+        get "/site.json"
+        expect(response.status).to eq(200)
+
+        site_category = response.parsed_body['categories'].select { |c| c['id'] == category.id }.first
+        expect(site_category["category_field_1"]).to eq({ a: 1, b: 2 }.as_json)
+      end
+
+      it "preloads group custom fields on group index" do
+        Group.preloaded_custom_field_names << "other_field"
+
+        group = Fabricate(:group)
+        group.custom_fields["group_field_1"] = "Group cf entry"
+        group.save_custom_fields(true)
+
+        get "/groups.json"
+        expect(response.status).to eq(200)
+
+        group = response.parsed_body['groups'].select { |g| g['id'] == group.id }.first
+        expect(group['group_field_1']).to eq("Group cf entry")
+      end
     end
   end
 end
diff --git a/spec/requests/custom_wizard/steps_controller_spec.rb b/spec/requests/custom_wizard/steps_controller_spec.rb
index dc8d0130..e05ba917 100644
--- a/spec/requests/custom_wizard/steps_controller_spec.rb
+++ b/spec/requests/custom_wizard/steps_controller_spec.rb
@@ -1,55 +1,12 @@
 # frozen_string_literal: true
 
 describe CustomWizard::StepsController do
-  fab!(:user) {
-    Fabricate(
-      :user,
-      username: 'angus',
-      email: "angus@email.com",
-      trust_level: TrustLevel[3]
-    )
-  }
-
-  fab!(:user2) {
-    Fabricate(
-      :user,
-      username: 'bob',
-      email: "bob@email.com",
-      trust_level: TrustLevel[2]
-    )
-  }
-
-  let(:wizard_template) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read
-    )
-  }
-
-  let(:wizard_field_condition_template) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/condition/wizard_field_condition.json"
-      ).read
-    )
-  }
-
-  let(:user_condition_template) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/condition/user_condition.json"
-      ).read
-    )
-  }
-
-  let(:permitted_json) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard/permitted.json"
-      ).read
-    )
-  }
+  fab!(:user) { Fabricate(:user, username: 'angus', email: "angus@email.com", trust_level: TrustLevel[3]) }
+  fab!(:user2) { Fabricate(:user, username: 'bob', email: "bob@email.com", trust_level: TrustLevel[2]) }
+  let(:wizard_template) { get_wizard_fixture("wizard") }
+  let(:wizard_field_condition_template) { get_wizard_fixture("condition/wizard_field_condition") }
+  let(:user_condition_template) { get_wizard_fixture("condition/user_condition") }
+  let(:permitted_json) { get_wizard_fixture("wizard/permitted") }
 
   before do
     CustomWizard::Template.save(wizard_template, skip_jobs: true)
@@ -77,6 +34,7 @@ describe CustomWizard::StepsController do
     end
 
     it "when the user cant access the wizard" do
+      enable_subscription("standard")
       new_template = wizard_template.dup
       new_template["permitted"] = permitted_json["permitted"]
       CustomWizard::Template.save(new_template, skip_jobs: true)
@@ -89,17 +47,6 @@ describe CustomWizard::StepsController do
       put '/w/super-mega-fun-wizard/steps/step_10.json'
       expect(response.status).to eq(400)
     end
-
-    it "when user cant see the step due to conditions" do
-      sign_in(user2)
-
-      new_wizard_template = wizard_template.dup
-      new_wizard_template['steps'][0]['condition'] = user_condition_template['condition']
-      CustomWizard::Template.save(new_wizard_template, skip_jobs: true)
-
-      put '/w/super-mega-fun-wizard/steps/step_1.json'
-      expect(response.status).to eq(403)
-    end
   end
 
   it "works if the step has no fields" do
@@ -122,64 +69,40 @@ describe CustomWizard::StepsController do
     expect(response.parsed_body['wizard']['start']).to eq("step_2")
   end
 
-  it "returns an updated wizard when condition doesnt pass" do
-    new_template = wizard_template.dup
-    new_template['steps'][1]['condition'] = wizard_field_condition_template['condition']
-    CustomWizard::Template.save(new_template, skip_jobs: true)
-
-    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
-      fields: {
-        step_1_field_1: "Condition wont pass"
-      }
-    }
-    expect(response.status).to eq(200)
-    expect(response.parsed_body['wizard']['start']).to eq("step_3")
-  end
-
   it "runs completion actions if user has completed wizard" do
     new_template = wizard_template.dup
 
     ## route_to action
     new_template['actions'].last['run_after'] = 'wizard_completion'
-    new_template['steps'][1]['condition'] = wizard_field_condition_template['condition']
-    new_template['steps'][2]['condition'] = wizard_field_condition_template['condition']
     CustomWizard::Template.save(new_template, skip_jobs: true)
 
-    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
-      fields: {
-        step_1_field_1: "Condition wont pass"
-      }
-    }
+    put '/w/super-mega-fun-wizard/steps/step_1.json'
+    put '/w/super-mega-fun-wizard/steps/step_2.json'
+    put '/w/super-mega-fun-wizard/steps/step_3.json'
     expect(response.status).to eq(200)
     expect(response.parsed_body['redirect_on_complete']).to eq("https://google.com")
   end
 
   it "saves results of completion actions if user has completed wizard" do
     new_template = wizard_template.dup
-
-    ## Create group action
     new_template['actions'].first['run_after'] = 'wizard_completion'
-    new_template['steps'][1]['condition'] = wizard_field_condition_template['condition']
     CustomWizard::Template.save(new_template, skip_jobs: true)
 
     put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
       fields: {
-        step_1_field_1: "My cool group"
+        step_1_field_1: "Topic title",
+        step_1_field_2: "Topic post"
       }
     }
-    expect(response.status).to eq(200)
-
+    put '/w/super-mega-fun-wizard/steps/step_2.json'
     put '/w/super-mega-fun-wizard/steps/step_3.json'
-    expect(response.status).to eq(200)
 
     wizard_id = response.parsed_body['wizard']['id']
     wizard = CustomWizard::Wizard.create(wizard_id, user)
 
-    group_name = wizard.submissions.first.fields['action_9']
-    group = Group.find_by(name: group_name)
-
-    expect(group.present?).to eq(true)
-    expect(group.full_name).to eq("My cool group")
+    topic_id = wizard.submissions.first.fields[new_template['actions'].first['id']]
+    topic = Topic.find(topic_id)
+    expect(topic.present?).to eq(true)
   end
 
   it "returns a final step without conditions" do
@@ -196,88 +119,151 @@ describe CustomWizard::StepsController do
     expect(response.parsed_body['final']).to eq(true)
   end
 
-  it "returns the correct final step when the conditional final step and last step are the same" do
-    new_template = wizard_template.dup
-    new_template['steps'][0]['condition'] = user_condition_template['condition']
-    new_template['steps'][2]['condition'] = wizard_field_condition_template['condition']
-    CustomWizard::Template.save(new_template, skip_jobs: true)
+  context "subscription" do
+    before do
+      enable_subscription("standard")
+    end
 
-    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
-      fields: {
-        step_1_field_1: "Condition will pass"
+    it "raises an error when user cant see the step due to conditions" do
+      sign_in(user2)
+
+      new_wizard_template = wizard_template.dup
+      new_wizard_template['steps'][0]['condition'] = user_condition_template['condition']
+      CustomWizard::Template.save(new_wizard_template, skip_jobs: true)
+
+      put '/w/super-mega-fun-wizard/steps/step_1.json'
+      expect(response.status).to eq(403)
+    end
+
+    it "returns an updated wizard when condition doesnt pass" do
+      new_template = wizard_template.dup
+      new_template['steps'][1]['condition'] = wizard_field_condition_template['condition']
+      CustomWizard::Template.save(new_template, skip_jobs: true)
+
+      put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+        fields: {
+          step_1_field_1: "Condition wont pass"
+        }
       }
-    }
-    expect(response.status).to eq(200)
-    expect(response.parsed_body['final']).to eq(false)
+      expect(response.status).to eq(200)
+      expect(response.parsed_body['wizard']['start']).to eq("step_3")
+    end
 
-    put '/w/super-mega-fun-wizard/steps/step_2.json'
-    expect(response.status).to eq(200)
-    expect(response.parsed_body['final']).to eq(false)
+    it "returns the correct final step when the conditional final step and last step are the same" do
+      new_template = wizard_template.dup
+      new_template['steps'][0]['condition'] = user_condition_template['condition']
+      new_template['steps'][2]['condition'] = wizard_field_condition_template['condition']
+      CustomWizard::Template.save(new_template, skip_jobs: true)
+    end
 
-    put '/w/super-mega-fun-wizard/steps/step_3.json'
-    expect(response.status).to eq(200)
-    expect(response.parsed_body['final']).to eq(true)
-  end
+    it "raises an error when user cant see the step due to conditions" do
+      sign_in(user2)
 
-  it "returns the correct final step when the conditional final step and last step are different" do
-    new_template = wizard_template.dup
-    new_template['steps'][2]['condition'] = wizard_field_condition_template['condition']
-    CustomWizard::Template.save(new_template, skip_jobs: true)
+      new_wizard_template = wizard_template.dup
+      new_wizard_template['steps'][0]['condition'] = user_condition_template['condition']
+      CustomWizard::Template.save(new_wizard_template, skip_jobs: true)
 
-    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
-      fields: {
-        step_1_field_1: "Condition will not pass"
+      put '/w/super-mega-fun-wizard/steps/step_1.json'
+      expect(response.status).to eq(403)
+    end
+
+    it "returns an updated wizard when condition doesnt pass" do
+      new_template = wizard_template.dup
+      new_template['steps'][1]['condition'] = wizard_field_condition_template['condition']
+      CustomWizard::Template.save(new_template, skip_jobs: true)
+
+      put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+        fields: {
+          step_1_field_1: "Condition wont pass"
+        }
       }
-    }
-    expect(response.status).to eq(200)
-    expect(response.parsed_body['final']).to eq(false)
+      expect(response.status).to eq(200)
+      expect(response.parsed_body['wizard']['start']).to eq("step_3")
+    end
 
-    put '/w/super-mega-fun-wizard/steps/step_2.json'
-    expect(response.status).to eq(200)
-    expect(response.parsed_body['final']).to eq(true)
-  end
+    it "returns the correct final step when the conditional final step and last step are the same" do
+      new_template = wizard_template.dup
+      new_template['steps'][0]['condition'] = user_condition_template['condition']
+      new_template['steps'][2]['condition'] = wizard_field_condition_template['condition']
+      CustomWizard::Template.save(new_template, skip_jobs: true)
 
-  it "returns the correct final step when the conditional final step is determined in the same action" do
-    new_template = wizard_template.dup
-    new_template['steps'][1]['condition'] = wizard_field_condition_template['condition']
-    new_template['steps'][2]['condition'] = wizard_field_condition_template['condition']
-    CustomWizard::Template.save(new_template, skip_jobs: true)
-
-    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
-      fields: {
-        step_1_field_1: "Condition will not pass"
+      put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+        fields: {
+          step_1_field_1: "Condition will pass"
+        }
       }
-    }
-    expect(response.status).to eq(200)
-    expect(response.parsed_body['final']).to eq(true)
-  end
+      expect(response.status).to eq(200)
+      expect(response.parsed_body['final']).to eq(false)
 
-  it "excludes the non-included conditional fields from the submissions" do
-    new_template = wizard_template.dup
-    new_template['steps'][1]['fields'][0]['condition'] = wizard_field_condition_template['condition']
-    CustomWizard::Template.save(new_template, skip_jobs: true)
+      put '/w/super-mega-fun-wizard/steps/step_2.json'
+      expect(response.status).to eq(200)
+      expect(response.parsed_body['final']).to eq(false)
 
-    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
-      fields: {
-        step_1_field_1: "Condition will pass"
+      put '/w/super-mega-fun-wizard/steps/step_3.json'
+      expect(response.status).to eq(200)
+      expect(response.parsed_body['final']).to eq(true)
+    end
+
+    it "returns the correct final step when the conditional final step and last step are different" do
+      new_template = wizard_template.dup
+      new_template['steps'][2]['condition'] = wizard_field_condition_template['condition']
+      CustomWizard::Template.save(new_template, skip_jobs: true)
+
+      put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+        fields: {
+          step_1_field_1: "Condition will not pass"
+        }
       }
-    }
+      expect(response.status).to eq(200)
+      expect(response.parsed_body['final']).to eq(false)
 
-    put '/w/super-mega-fun-wizard/steps/step_2.json', params: {
-      fields: {
-        step_2_field_1: "1995-04-23"
+      put '/w/super-mega-fun-wizard/steps/step_2.json'
+      expect(response.status).to eq(200)
+      expect(response.parsed_body['final']).to eq(true)
+    end
+
+    it "returns the correct final step when the conditional final step is determined in the same action" do
+      new_template = wizard_template.dup
+      new_template['steps'][1]['condition'] = wizard_field_condition_template['condition']
+      new_template['steps'][2]['condition'] = wizard_field_condition_template['condition']
+      CustomWizard::Template.save(new_template, skip_jobs: true)
+
+      put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+        fields: {
+          step_1_field_1: "Condition will not pass"
+        }
       }
-    }
+      expect(response.status).to eq(200)
+      expect(response.parsed_body['final']).to eq(true)
+    end
 
-    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
-      fields: {
-        step_1_field_1: "Condition will not pass"
+    it "excludes the non-included conditional fields from the submissions" do
+      new_template = wizard_template.dup
+      new_template['steps'][1]['fields'][0]['condition'] = wizard_field_condition_template['condition']
+      CustomWizard::Template.save(new_template, skip_jobs: true)
+
+      put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+        fields: {
+          step_1_field_1: "Condition will pass"
+        }
       }
-    }
 
-    wizard_id = response.parsed_body['wizard']['id']
-    wizard = CustomWizard::Wizard.create(wizard_id, user)
-    submission = wizard.current_submission
-    expect(submission.fields.keys).not_to include("step_2_field_1")
+      put '/w/super-mega-fun-wizard/steps/step_2.json', params: {
+        fields: {
+          step_2_field_1: "1995-04-23"
+        }
+      }
+
+      put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+        fields: {
+          step_1_field_1: "Condition will not pass"
+        }
+      }
+
+      wizard_id = response.parsed_body['wizard']['id']
+      wizard = CustomWizard::Wizard.create(wizard_id, user)
+      submission = wizard.current_submission
+      expect(submission.fields.keys).not_to include("step_2_field_1")
+    end
   end
 end
diff --git a/spec/requests/custom_wizard/wizard_controller_spec.rb b/spec/requests/custom_wizard/wizard_controller_spec.rb
index 44e48ed7..aa1f479b 100644
--- a/spec/requests/custom_wizard/wizard_controller_spec.rb
+++ b/spec/requests/custom_wizard/wizard_controller_spec.rb
@@ -1,29 +1,12 @@
 # frozen_string_literal: true
 
 describe CustomWizard::WizardController do
-  fab!(:user) {
-    Fabricate(
-      :user,
-      username: 'angus',
-      email: "angus@email.com",
-      trust_level: TrustLevel[3]
-    )
-  }
-
-  let(:permitted_json) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard/permitted.json"
-      ).read
-    )
-  }
+  fab!(:user) { Fabricate(:user, username: 'angus', email: "angus@email.com", trust_level: TrustLevel[3]) }
+  let(:wizard_template) { get_wizard_fixture("wizard") }
+  let(:permitted_json) { get_wizard_fixture("wizard/permitted") }
 
   before do
-    CustomWizard::Template.save(
-      JSON.parse(File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read),
-    skip_jobs: true)
+    CustomWizard::Template.save(wizard_template, skip_jobs: true)
     @template = CustomWizard::Template.find("super_mega_fun_wizard")
     sign_in(user)
   end
@@ -57,14 +40,15 @@ describe CustomWizard::WizardController do
     end
 
     it 'lets user skip if user cant access wizard' do
+      enable_subscription("standard")
       @template["permitted"] = permitted_json["permitted"]
       CustomWizard::Template.save(@template, skip_jobs: true)
-
       put '/w/super-mega-fun-wizard/skip.json'
       expect(response.status).to eq(200)
     end
 
     it 'returns a no skip message if user is not allowed to skip' do
+      enable_subscription("standard")
       @template['required'] = 'true'
       CustomWizard::Template.save(@template)
       put '/w/super-mega-fun-wizard/skip.json'
@@ -92,9 +76,9 @@ describe CustomWizard::WizardController do
       CustomWizard::Submission.new(@wizard, step_1_field_1: "Hello World").save
       current_submission = @wizard.current_submission
       put '/w/super-mega-fun-wizard/skip.json'
-      list = CustomWizard::Submission.list(@wizard)
+      submissions = CustomWizard::Submission.list(@wizard).submissions
 
-      expect(list.any? { |submission| submission.id == current_submission.id }).to eq(false)
+      expect(submissions.any? { |submission| submission.id == current_submission.id }).to eq(false)
     end
 
     it "starts from the first step if user visits after skipping the wizard" do
diff --git a/spec/serializers/custom_wizard/basic_wizard_serializer_spec.rb b/spec/serializers/custom_wizard/basic_wizard_serializer_spec.rb
index 59647477..4a2f353a 100644
--- a/spec/serializers/custom_wizard/basic_wizard_serializer_spec.rb
+++ b/spec/serializers/custom_wizard/basic_wizard_serializer_spec.rb
@@ -2,13 +2,10 @@
 
 describe CustomWizard::BasicWizardSerializer do
   fab!(:user) { Fabricate(:user) }
+  let(:template) { get_wizard_fixture("wizard") }
 
   it 'should return basic wizard attributes' do
-    CustomWizard::Template.save(
-      JSON.parse(File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read),
-    skip_jobs: true)
+    CustomWizard::Template.save(template, skip_jobs: true)
     json = CustomWizard::BasicWizardSerializer.new(
       CustomWizard::Builder.new("super_mega_fun_wizard", user).build,
       scope: Guardian.new(user)
diff --git a/spec/serializers/custom_wizard/custom_field_serializer_spec.rb b/spec/serializers/custom_wizard/custom_field_serializer_spec.rb
index 0f6f5564..1da62245 100644
--- a/spec/serializers/custom_wizard/custom_field_serializer_spec.rb
+++ b/spec/serializers/custom_wizard/custom_field_serializer_spec.rb
@@ -2,12 +2,7 @@
 
 describe CustomWizard::CustomFieldSerializer do
   fab!(:user) { Fabricate(:user) }
-
-  let(:custom_field_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/custom_field/custom_fields.json"
-    ).read)
-  }
+  let(:custom_field_json) { get_wizard_fixture("custom_field/custom_fields") }
 
   it 'should return custom field attributes' do
     custom_field_json['custom_fields'].each do |field_json|
diff --git a/spec/serializers/custom_wizard/log_serializer_spec.rb b/spec/serializers/custom_wizard/log_serializer_spec.rb
index 895cab54..7dd1db0f 100644
--- a/spec/serializers/custom_wizard/log_serializer_spec.rb
+++ b/spec/serializers/custom_wizard/log_serializer_spec.rb
@@ -4,14 +4,16 @@ describe CustomWizard::LogSerializer do
   fab!(:user) { Fabricate(:user) }
 
   it 'should return log attributes' do
-    CustomWizard::Log.create("First log message")
-    CustomWizard::Log.create("Second log message")
+    CustomWizard::Log.create('first-test-wizard', 'perform_first_action', 'first_test_user', 'First log message')
+    CustomWizard::Log.create('second-test-wizard', 'perform_second_action', 'second_test_user', 'Second log message')
 
     json_array = ActiveModel::ArraySerializer.new(
-      CustomWizard::Log.list(0),
+      CustomWizard::Log.list(0).logs,
       each_serializer: CustomWizard::LogSerializer
     ).as_json
     expect(json_array.length).to eq(2)
+    expect(json_array[0][:action]).to eq("perform_second_action")
+    expect(json_array[0][:username]).to eq('second_test_user')
     expect(json_array[0][:message]).to eq("Second log message")
   end
 end
diff --git a/spec/serializers/custom_wizard/submission_serializer_spec.rb b/spec/serializers/custom_wizard/submission_serializer_spec.rb
new file mode 100644
index 00000000..02d8be8a
--- /dev/null
+++ b/spec/serializers/custom_wizard/submission_serializer_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require_relative '../../plugin_helper'
+
+describe CustomWizard::SubmissionSerializer do
+  fab!(:user) { Fabricate(:user) }
+
+  let(:template_json) {
+    JSON.parse(File.open(
+      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
+    ).read)
+  }
+
+  before do
+    CustomWizard::Template.save(template_json, skip_jobs: true)
+    wizard = CustomWizard::Wizard.create(template_json["id"], user)
+    CustomWizard::Submission.new(wizard,
+      step_1_field_1: "I am user submission",
+      submitted_at: Time.now.iso8601
+    ).save
+    @list = CustomWizard::Submission.list(wizard, page: 0)
+  end
+
+  it 'should return submission attributes' do
+    json_array = ActiveModel::ArraySerializer.new(
+      @list.submissions,
+      each_serializer: described_class
+    ).as_json
+
+    expect(json_array.length).to eq(1)
+    expect(json_array[0][:id].present?).to eq(true)
+    expect(json_array[0][:user].present?).to eq(true)
+    expect(json_array[0][:submitted_at].present?).to eq(true)
+  end
+
+  it "should return field values, types and labels" do
+    json_array = ActiveModel::ArraySerializer.new(
+      @list.submissions,
+      each_serializer: described_class
+    ).as_json
+
+    expect(json_array.length).to eq(1)
+    expect(json_array[0][:fields].as_json).to eq({
+      "step_1_field_1": {
+        "value": "I am user submission",
+        "type": "text",
+        "label": "Text"
+      }
+    }.as_json)
+  end
+end
diff --git a/spec/serializers/custom_wizard/wizard_field_serializer_spec.rb b/spec/serializers/custom_wizard/wizard_field_serializer_spec.rb
index 5f225f44..1ac2579e 100644
--- a/spec/serializers/custom_wizard/wizard_field_serializer_spec.rb
+++ b/spec/serializers/custom_wizard/wizard_field_serializer_spec.rb
@@ -2,13 +2,10 @@
 
 describe CustomWizard::FieldSerializer do
   fab!(:user) { Fabricate(:user) }
+  let(:template) { get_wizard_fixture("wizard") }
 
   before do
-    CustomWizard::Template.save(
-      JSON.parse(File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read),
-    skip_jobs: true)
+    CustomWizard::Template.save(template, skip_jobs: true)
     @wizard = CustomWizard::Builder.new("super_mega_fun_wizard", user).build
   end
 
@@ -22,7 +19,7 @@ describe CustomWizard::FieldSerializer do
     expect(json_array.size).to eq(@wizard.steps.first.fields.size)
     expect(json_array[0][:label]).to eq("<p>Text</p>")
     expect(json_array[0][:description]).to eq("Text field description.")
-    expect(json_array[3][:index]).to eq(3)
+    expect(json_array[2][:index]).to eq(2)
   end
 
   it "should return optional field attributes" do
@@ -32,6 +29,6 @@ describe CustomWizard::FieldSerializer do
       scope: Guardian.new(user)
     ).as_json
     expect(json_array[0][:format]).to eq("YYYY-MM-DD")
-    expect(json_array[6][:file_types]).to eq(".jpg,.jpeg,.png")
+    expect(json_array[5][:file_types]).to eq(".jpg,.jpeg,.png")
   end
 end
diff --git a/spec/serializers/custom_wizard/wizard_serializer_spec.rb b/spec/serializers/custom_wizard/wizard_serializer_spec.rb
index 7fcf0117..aa1d82f2 100644
--- a/spec/serializers/custom_wizard/wizard_serializer_spec.rb
+++ b/spec/serializers/custom_wizard/wizard_serializer_spec.rb
@@ -3,19 +3,12 @@
 describe CustomWizard::WizardSerializer do
   fab!(:user) { Fabricate(:user) }
   fab!(:category) { Fabricate(:category) }
-
-  let(:similar_topics_validation) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/field/validation/similar_topics.json"
-    ).read)
-  }
+  let(:template) { get_wizard_fixture("wizard") }
+  let(:similar_topics_validation) { get_wizard_fixture("field/validation/similar_topics") }
+  let(:advanced_fields) { get_wizard_fixture("field/advanced_types") }
 
   before do
-    CustomWizard::Template.save(
-      JSON.parse(File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read),
-    skip_jobs: true)
+    CustomWizard::Template.save(template, skip_jobs: true)
     @template = CustomWizard::Template.find('super_mega_fun_wizard')
   end
 
diff --git a/spec/serializers/custom_wizard/wizard_step_serializer_spec.rb b/spec/serializers/custom_wizard/wizard_step_serializer_spec.rb
index 0df76baf..2c28479c 100644
--- a/spec/serializers/custom_wizard/wizard_step_serializer_spec.rb
+++ b/spec/serializers/custom_wizard/wizard_step_serializer_spec.rb
@@ -2,22 +2,8 @@
 
 describe CustomWizard::StepSerializer do
   fab!(:user) { Fabricate(:user) }
-
-  let(:wizard_template) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read
-    )
-  }
-
-  let(:required_data_json) {
-    JSON.parse(
-      File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/step/required_data.json"
-      ).read
-    )
-  }
+  let(:wizard_template) { get_wizard_fixture("wizard") }
+  let(:required_data_json) { get_wizard_fixture("step/required_data") }
 
   before do
     CustomWizard::Template.save(wizard_template, skip_jobs: true)
@@ -30,7 +16,7 @@ describe CustomWizard::StepSerializer do
       each_serializer: described_class,
       scope: Guardian.new(user)
     ).as_json
-    expect(json_array[0][:title]).to eq("<p>Text</p>")
+    expect(json_array[0][:title]).to eq("Text")
     expect(json_array[0][:description]).to eq("<p>Text inputs!</p>")
     expect(json_array[1][:index]).to eq(1)
   end
@@ -47,6 +33,7 @@ describe CustomWizard::StepSerializer do
 
   context 'with required data' do
     before do
+      enable_subscription("standard")
       wizard_template['steps'][0]['required_data'] = required_data_json['required_data']
       wizard_template['steps'][0]['required_data_message'] = required_data_json['required_data_message']
       CustomWizard::Template.save(wizard_template)