diff --git a/app/imports/api/properties/ClassLevels.js b/app/imports/api/properties/ClassLevels.js
index 3d97ab21..f0600917 100644
--- a/app/imports/api/properties/ClassLevels.js
+++ b/app/imports/api/properties/ClassLevels.js
@@ -26,6 +26,12 @@ const ClassLevelSchema = createPropertySchema({
 		defaultValue: 1,
     max: STORAGE_LIMITS.levelMax,
   },
+  // Filters out of UI if condition isn't met, but isn't otherwise enforced
+  slotFillerCondition: {
+    type: String,
+    optional: true,
+    max: STORAGE_LIMITS.calculation,
+  },
 });
 
 const ComputedOnlyClassLevelSchema  = createPropertySchema({
diff --git a/app/imports/ui/properties/forms/ClassLevelForm.vue b/app/imports/ui/properties/forms/ClassLevelForm.vue
index 8a2615be..e34fe57f 100644
--- a/app/imports/ui/properties/forms/ClassLevelForm.vue
+++ b/app/imports/ui/properties/forms/ClassLevelForm.vue
@@ -27,6 +27,15 @@
         @change="change('variableName', ...arguments)"
       />
     </div>
+    <text-field
+      v-if="context.isLibraryForm"
+      label="Condition"
+      hint="A caclulation to determine if this can be added to the character"
+      placeholder="Always active"
+      :value="model.slotFillerCondition"
+      :error-messages="errors.slotFillerCondition"
+      @change="change('slotFillerCondition', ...arguments)"
+    />
 
     <inline-computation-field
       label="Description"
@@ -54,6 +63,9 @@
 
 	export default {
     mixins: [propertyFormMixin],
+    inject: {
+      context: { default: {} }
+    },
 	};
 </script>
 
diff --git a/app/imports/ui/properties/forms/SlotFillerForm.vue b/app/imports/ui/properties/forms/SlotFillerForm.vue
index 532ecb94..d0f84567 100644
--- a/app/imports/ui/properties/forms/SlotFillerForm.vue
+++ b/app/imports/ui/properties/forms/SlotFillerForm.vue
@@ -15,7 +15,6 @@
       :error-messages="errors.name"
       @change="change('name', ...arguments)"
     />
-
     <text-area
       label="Description"
       :value="model.description"
@@ -74,12 +73,8 @@
 <script lang="js">
   import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
   import PROPERTIES from '/imports/constants/PROPERTIES.js';
-  import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
 
 	export default {
-    components: {
-      CalculationErrorList,
-    },
     mixins: [propertyFormMixin],
     inject: {
       context: { default: {} }
diff --git a/app/imports/ui/properties/viewers/ClassLevelViewer.vue b/app/imports/ui/properties/viewers/ClassLevelViewer.vue
index 27dca3ca..e475d5fd 100644
--- a/app/imports/ui/properties/viewers/ClassLevelViewer.vue
+++ b/app/imports/ui/properties/viewers/ClassLevelViewer.vue
@@ -15,6 +15,12 @@
         mono
         :value="model.variableName"
       />
+      <property-field
+        v-if="!context.creatureId"
+        name="Condition"
+        mono
+        :value="model.slotFillerCondition"
+      />
       <property-description
         name="Description"
         :model="model.description"
diff --git a/app/imports/ui/properties/viewers/SlotFillerViewer.vue b/app/imports/ui/properties/viewers/SlotFillerViewer.vue
index d807317b..6ebf8a36 100644
--- a/app/imports/ui/properties/viewers/SlotFillerViewer.vue
+++ b/app/imports/ui/properties/viewers/SlotFillerViewer.vue
@@ -10,7 +10,7 @@
         :value="model.slotQuantityFilled"
       />
       <property-field
-        v-if="context.creatureId"
+        v-if="!context.creatureId"
         name="Condition"
         mono
         :value="model.slotFillerCondition"