diff --git a/Assets/AddressableAssetsData/AssetGroups/Common_Assets.asset b/Assets/AddressableAssetsData/AssetGroups/Common_Assets.asset
index 4687ca1..4e80814 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Common_Assets.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Common_Assets.asset
@@ -241,6 +241,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f7becfd0b70554e46b4e04fa25a75341
+    m_Address: JovianTagsSettings
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: fe393ace9b354375a9cb14cdbbc28be4
     m_Address: Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader
     m_ReadOnly: 0
diff --git a/Assets/Database/Game/JovianTagsSettings.asset b/Assets/Database/Game/JovianTagsSettings.asset
new file mode 100644
index 0000000..8147484
--- /dev/null
+++ b/Assets/Database/Game/JovianTagsSettings.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: 32e658688044a8f469e0c311f9c4facb, type: 3}
+  m_Name: JovianTagsSettings
+  m_EditorClassIdentifier: Jovian.TagSystem::Jovian.TagSystem.JovianTagsSettings
+  gameTags: []
diff --git a/Assets/Database/Game/JovianTagsSettings.asset.meta b/Assets/Database/Game/JovianTagsSettings.asset.meta
new file mode 100644
index 0000000..ebff8c2
--- /dev/null
+++ b/Assets/Database/Game/JovianTagsSettings.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f7becfd0b70554e46b4e04fa25a75341
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.jovian.tag-system b/Packages/com.jovian.tag-system
new file mode 160000
index 0000000..505b2ca
--- /dev/null
+++ b/Packages/com.jovian.tag-system
@@ -0,0 +1 @@
+Subproject commit 505b2ca161028653bd9caba399506fe9f88638f6
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index d7a09c8..0da9076 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -74,6 +74,12 @@
         "com.unity.nuget.newtonsoft-json": "3.2.1"
       }
     },
+    "com.jovian.tag-system": {
+      "version": "file:com.jovian.tag-system",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
     "com.jovian.unitypackagesync": {
       "version": "file:com.jovian.unitypackagesync",
       "depth": 0,
diff --git a/ProjectSettings/PackageSyncSettings.json b/ProjectSettings/PackageSyncSettings.json
index 3a32fbe..e2d4d38 100644
--- a/ProjectSettings/PackageSyncSettings.json
+++ b/ProjectSettings/PackageSyncSettings.json
@@ -1 +1 @@
-[{"displayName":"Save System","packagePath":"Packages/com.jovian.savesystem","repoPath":"D:\\repos\\unity-save-system","selected":false},{"displayName":"Zone System","packagePath":"Packages/com.jovian.zonesystem","repoPath":"D:\\repos\\unity-zone-system","selected":false},{"displayName":"Unity Inspector","packagePath":"Packages/com.jovian.inspector-tools","repoPath":"d:\\repos\\unity-inspector\\","selected":false},{"displayName":"Unity Logger","packagePath":"Packages/com.jovian.logger","repoPath":"d:\\repos\\unity-logger\\","selected":false},{"displayName":"Unity Recent Assets","packagePath":"Packages/com.jovian.assets-history","repoPath":"d:\\repos\\unity-recentassets\\","selected":false},{"displayName":"Unity Utilities","packagePath":"Packages/com.jovian.utilities","repoPath":"d:\\repos\\unity-utilities\\","selected":false},{"displayName":"Unity Popup System","packagePath":"Packages/com.jovian.popup-system","repoPath":"d:\\repos\\unity-popup-system\\","selected":false},{"displayName":"Unity Calendar System","packagePath":"Packages/com.jovian.calendar","repoPath":"d:\\repos\\unity-calendar-system\\","selected":false},{"displayName":"Unity Encounter System","packagePath":"Packages/com.jovian.encounter-system","repoPath":"d:\\repos\\encounter-system\\","selected":false}]
\ No newline at end of file
+[{"displayName":"Save System","packagePath":"Packages/com.jovian.savesystem","repoPath":"D:\\repos\\unity-save-system","selected":false},{"displayName":"Zone System","packagePath":"Packages/com.jovian.zonesystem","repoPath":"D:\\repos\\unity-zone-system","selected":false},{"displayName":"Unity Inspector","packagePath":"Packages/com.jovian.inspector-tools","repoPath":"d:\\repos\\unity-inspector\\","selected":false},{"displayName":"Unity Logger","packagePath":"Packages/com.jovian.logger","repoPath":"d:\\repos\\unity-logger\\","selected":false},{"displayName":"Unity Recent Assets","packagePath":"Packages/com.jovian.assets-history","repoPath":"d:\\repos\\unity-recentassets\\","selected":false},{"displayName":"Unity Utilities","packagePath":"Packages/com.jovian.utilities","repoPath":"d:\\repos\\unity-utilities\\","selected":false},{"displayName":"Unity Popup System","packagePath":"Packages/com.jovian.popup-system","repoPath":"d:\\repos\\unity-popup-system\\","selected":false},{"displayName":"Unity Calendar System","packagePath":"Packages/com.jovian.calendar","repoPath":"d:\\repos\\unity-calendar-system\\","selected":false},{"displayName":"Unity Encounter System","packagePath":"Packages/com.jovian.encounter-system","repoPath":"d:\\repos\\encounter-system\\","selected":false},{"displayName":"Unity Tag System","packagePath":"Packages/com.jovian.tag-system","repoPath":"d:\\repos\\unity-tag-system\\","selected":false}]
\ No newline at end of file