diff --git a/Assets/Data/ModifierCatalog/Conditions.meta b/Assets/Data/ModifierCatalog/Conditions.meta
new file mode 100644
index 0000000..78fa4fe
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Conditions.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cb259b4e3a5e21144bc94ccc7c861481
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/ModifierCatalog/Behaviors/NewBehavior.asset b/Assets/Data/ModifierCatalog/Conditions/Cond_FullHouseOnly.asset
similarity index 63%
rename from Assets/Data/ModifierCatalog/Behaviors/NewBehavior.asset
rename to Assets/Data/ModifierCatalog/Conditions/Cond_FullHouseOnly.asset
index 1f2c27a..a901a76 100644
--- a/Assets/Data/ModifierCatalog/Behaviors/NewBehavior.asset
+++ b/Assets/Data/ModifierCatalog/Conditions/Cond_FullHouseOnly.asset
@@ -9,9 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7e2fda372e0798647a33c50ce0e03bba, type: 3}
-  m_Name: NewBehavior
-  m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Definition.ModifierBehavior
-  <Trigger>k__BackingField: 0
-  conditions: []
-  effects: []
+  m_Script: {fileID: 11500000, guid: 433ee372c032a484a8d3b0b58f951384, type: 3}
+  m_Name: Cond_FullHouseOnly
+  m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.CategoryCondition
+  requiredCategory: {fileID: 0}
diff --git a/Assets/Data/ModifierCatalog/Behaviors/NewBehavior.asset.meta b/Assets/Data/ModifierCatalog/Conditions/Cond_FullHouseOnly.asset.meta
similarity index 79%
rename from Assets/Data/ModifierCatalog/Behaviors/NewBehavior.asset.meta
rename to Assets/Data/ModifierCatalog/Conditions/Cond_FullHouseOnly.asset.meta
index 548db84..f506893 100644
--- a/Assets/Data/ModifierCatalog/Behaviors/NewBehavior.asset.meta
+++ b/Assets/Data/ModifierCatalog/Conditions/Cond_FullHouseOnly.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f8ca6f8dc19e3954da472597022ad937
+guid: c98912857a33ef641bb5b57919cd90c0
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
diff --git a/Assets/Data/ModifierCatalog/Conditions/Cond_MinScore20.asset b/Assets/Data/ModifierCatalog/Conditions/Cond_MinScore20.asset
new file mode 100644
index 0000000..1769737
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Conditions/Cond_MinScore20.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6bbd24b25ff7a0642ab6a98c84f99988, type: 3}
+  m_Name: Cond_MinScore20
+  m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.MinScoreCondition
+  minimumBaseScore: 0
diff --git a/Assets/Data/ModifierCatalog/Modifiers/NewModifier.asset.meta b/Assets/Data/ModifierCatalog/Conditions/Cond_MinScore20.asset.meta
similarity index 79%
rename from Assets/Data/ModifierCatalog/Modifiers/NewModifier.asset.meta
rename to Assets/Data/ModifierCatalog/Conditions/Cond_MinScore20.asset.meta
index b8e40b8..aae03e7 100644
--- a/Assets/Data/ModifierCatalog/Modifiers/NewModifier.asset.meta
+++ b/Assets/Data/ModifierCatalog/Conditions/Cond_MinScore20.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a15c6a5e0f108684085e29cd9ac7447b
+guid: 4896cd01a7f0997418a713ddae26311a
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
diff --git a/Assets/Data/ModifierCatalog/Conditions/Cond_YachtOnly.asset b/Assets/Data/ModifierCatalog/Conditions/Cond_YachtOnly.asset
new file mode 100644
index 0000000..27e7c82
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Conditions/Cond_YachtOnly.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 433ee372c032a484a8d3b0b58f951384, type: 3}
+  m_Name: Cond_YachtOnly
+  m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.CategoryCondition
+  requiredCategory: {fileID: 0}
diff --git a/Assets/Data/ModifierCatalog/Conditions/Cond_YachtOnly.asset.meta b/Assets/Data/ModifierCatalog/Conditions/Cond_YachtOnly.asset.meta
new file mode 100644
index 0000000..4380120
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Conditions/Cond_YachtOnly.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 529525854be95424f9d18054fee2334a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/ModifierCatalog/Effects.meta b/Assets/Data/ModifierCatalog/Effects.meta
new file mode 100644
index 0000000..28a51ff
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3e700c7f94272db43ab94760ae5cbf0d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_AddCurrency_25.asset b/Assets/Data/ModifierCatalog/Effects/Effect_AddCurrency_25.asset
new file mode 100644
index 0000000..2ecbeaf
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_AddCurrency_25.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 78ad72a53a9496a43bc67c899395f8ed, type: 3}
+  m_Name: Effect_AddCurrency_25
+  m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Effects.AddCurrencyEffect
+  <Phase>k__BackingField: 500
+  <Priority>k__BackingField: 0
+  amount: 25
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_AddCurrency_25.asset.meta b/Assets/Data/ModifierCatalog/Effects/Effect_AddCurrency_25.asset.meta
new file mode 100644
index 0000000..0cdf285
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_AddCurrency_25.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 33083878a83fe234d863b8ee25430138
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_AddFlat_15.asset b/Assets/Data/ModifierCatalog/Effects/Effect_AddFlat_15.asset
new file mode 100644
index 0000000..6cf34b5
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_AddFlat_15.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 470d6d2952bb35744866f1fc160399be, type: 3}
+  m_Name: Effect_AddFlat_15
+  m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Effects.AddFlatScoreEffect
+  <Phase>k__BackingField: 100
+  <Priority>k__BackingField: 0
+  value: 15
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_AddFlat_15.asset.meta b/Assets/Data/ModifierCatalog/Effects/Effect_AddFlat_15.asset.meta
new file mode 100644
index 0000000..bf336cc
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_AddFlat_15.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ac58645e59ce5504582d4126b374def7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_AddFlat_5.asset b/Assets/Data/ModifierCatalog/Effects/Effect_AddFlat_5.asset
new file mode 100644
index 0000000..362bc99
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_AddFlat_5.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 470d6d2952bb35744866f1fc160399be, type: 3}
+  m_Name: Effect_AddFlat_5
+  m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Effects.AddFlatScoreEffect
+  <Phase>k__BackingField: 100
+  <Priority>k__BackingField: 0
+  value: 5
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_AddFlat_5.asset.meta b/Assets/Data/ModifierCatalog/Effects/Effect_AddFlat_5.asset.meta
new file mode 100644
index 0000000..c428b95
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_AddFlat_5.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a3f69fdecdf4d864fb7db58307de733a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_AddPerDice_Sixes_3.asset b/Assets/Data/ModifierCatalog/Effects/Effect_AddPerDice_Sixes_3.asset
new file mode 100644
index 0000000..acc5fe6
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_AddPerDice_Sixes_3.asset
@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3255ac75ecd795748914ec35314f1748, type: 3}
+  m_Name: Effect_AddPerDice_Sixes_3
+  m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Effects.AddPerDiceEffect
+  <Phase>k__BackingField: 100
+  <Priority>k__BackingField: 0
+  valuePerDice: 3
+  targetDiceValue: 6
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_AddPerDice_Sixes_3.asset.meta b/Assets/Data/ModifierCatalog/Effects/Effect_AddPerDice_Sixes_3.asset.meta
new file mode 100644
index 0000000..111085c
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_AddPerDice_Sixes_3.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 34aa8fb97a8c15e4fa956991b3b42aa3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_MultiplyScore_1_5x.asset b/Assets/Data/ModifierCatalog/Effects/Effect_MultiplyScore_1_5x.asset
new file mode 100644
index 0000000..16b1965
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_MultiplyScore_1_5x.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 728c15c5d2e70804499ec9ca5b8fb0be, type: 3}
+  m_Name: Effect_MultiplyScore_1_5x
+  m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Effects.MultiplyScoreEffect
+  <Phase>k__BackingField: 200
+  <Priority>k__BackingField: 0
+  multiplier: 1.5
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_MultiplyScore_1_5x.asset.meta b/Assets/Data/ModifierCatalog/Effects/Effect_MultiplyScore_1_5x.asset.meta
new file mode 100644
index 0000000..340c54e
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_MultiplyScore_1_5x.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a7a5a43843817f4b8f54266a24c2ec1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_MultiplyScore_2x.asset b/Assets/Data/ModifierCatalog/Effects/Effect_MultiplyScore_2x.asset
new file mode 100644
index 0000000..a49a82b
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_MultiplyScore_2x.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 728c15c5d2e70804499ec9ca5b8fb0be, type: 3}
+  m_Name: Effect_MultiplyScore_2x
+  m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Effects.MultiplyScoreEffect
+  <Phase>k__BackingField: 200
+  <Priority>k__BackingField: 0
+  multiplier: 2
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_MultiplyScore_2x.asset.meta b/Assets/Data/ModifierCatalog/Effects/Effect_MultiplyScore_2x.asset.meta
new file mode 100644
index 0000000..eae0fa6
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_MultiplyScore_2x.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 03e455dbd7600e5408ec77d1dfe05b64
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_PostMultiply_1_3x.asset b/Assets/Data/ModifierCatalog/Effects/Effect_PostMultiply_1_3x.asset
new file mode 100644
index 0000000..bb9207b
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_PostMultiply_1_3x.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 25b93265ed2bb4549b8584dd8e5ba762, type: 3}
+  m_Name: Effect_PostMultiply_1_3x
+  m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Effects.PostMultiplyEffect
+  <Phase>k__BackingField: 300
+  <Priority>k__BackingField: 0
+  postMultiplier: 1.3
diff --git a/Assets/Data/ModifierCatalog/Effects/Effect_PostMultiply_1_3x.asset.meta b/Assets/Data/ModifierCatalog/Effects/Effect_PostMultiply_1_3x.asset.meta
new file mode 100644
index 0000000..3845594
--- /dev/null
+++ b/Assets/Data/ModifierCatalog/Effects/Effect_PostMultiply_1_3x.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6c0efc323f5bcf5488895837fb7a4fd9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Data/ModifierCatalog/Modifiers/NewModifier.asset b/Assets/Data/ModifierCatalog/Modifiers/NewModifier.asset
deleted file mode 100644
index 0a7a83a..0000000
--- a/Assets/Data/ModifierCatalog/Modifiers/NewModifier.asset
+++ /dev/null
@@ -1,25 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: acb03445cebc5d842b34bc3e987ef174, type: 3}
-  m_Name: NewModifier
-  m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Definition.ModifierDefinition
-  <Id>k__BackingField: 
-  <DisplayName>k__BackingField: 
-  <Description>k__BackingField: 
-  <Icon>k__BackingField: {fileID: 0}
-  <Rarity>k__BackingField: 0
-  <ShopPrice>k__BackingField: 0
-  <SellPrice>k__BackingField: 0
-  <HasLimitedUses>k__BackingField: 0
-  <MaxUses>k__BackingField: 0
-  <MaxStacks>k__BackingField: 1
-  behaviors: []