diff --git a/ObservatoryExplorer/DefaultCriteria.cs b/ObservatoryExplorer/DefaultCriteria.cs
index da271f3..dae70c0 100644
--- a/ObservatoryExplorer/DefaultCriteria.cs
+++ b/ObservatoryExplorer/DefaultCriteria.cs
@@ -9,6 +9,18 @@ namespace Observatory.Explorer
 {
     internal static class DefaultCriteria
     {
+        private static IList<string> HighValueNonTerraformablePlanetClasses = new string[] {
+            "Earthlike body",
+            "Ammonia world",
+            "Water world",
+        };
+
+        private static IList<string> HighValueTerraformablePlanetClasses = new string[] {
+            "Water world",
+            "High metal content body",
+            "Rocky body",
+        };
+
         public static List<(string Description, string Detail, bool SystemWide)> CheckInterest(Scan scan, Dictionary<ulong, Dictionary<int, Scan>> scanHistory, Dictionary<ulong, Dictionary<int, FSSBodySignals>> signalHistory, ExplorerSettings settings)
         {
             List<(string, string, bool)> results = new();
@@ -46,6 +58,20 @@ namespace Observatory.Explorer
             }
             #endregion
 
+            #region Value Checks
+            if (settings.HighValueMappable)
+            {
+                if (HighValueTerraformablePlanetClasses.Contains(scan.PlanetClass) && scan.TerraformState?.Length > 0)
+                {
+                    results.Add("High-Value Mapping", $"{scan.DistanceFromArrivalLS:0}Ls, {scan.PlanetClass} (TF)");
+                }
+                if (HighValueNonTerraformablePlanetClasses.Contains(scan.PlanetClass) && scan.TerraformState?.Length == 0)
+                {
+                    results.Add("High-Value Mapping", $"{scan.DistanceFromArrivalLS:0}Ls, {scan.PlanetClass}");
+                }
+            }
+            #endregion
+            
             #region Parent Relative Checks
 
             if (scan.SystemAddress != 0 && scan.SemiMajorAxis != 0 &&
diff --git a/ObservatoryExplorer/ExplorerSettings.cs b/ObservatoryExplorer/ExplorerSettings.cs
index 0db15bb..12533fb 100644
--- a/ObservatoryExplorer/ExplorerSettings.cs
+++ b/ObservatoryExplorer/ExplorerSettings.cs
@@ -80,6 +80,9 @@ namespace Observatory.Explorer
         [SettingDisplayName("All Surface Mats In System")]
         public bool GoldSystem { get; set; }
 
+        [SettingDisplayName("High-Value Mapping")]
+        public bool HighValueMappable { get; set; }
+
         [SettingDisplayName("Enable Custom Criteria")]
         public bool EnableCustomCriteria { get; set; }