diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml
index fc3e1581e..3a3ad23cb 100644
--- a/julia_src/Manifest.toml
+++ b/julia_src/Manifest.toml
@@ -922,9 +922,11 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[deps.REopt]]
 deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"]
-git-tree-sha1 = "9946abe774e30d82f786e68296ad1fdf8bb7dba4"
+git-tree-sha1 = "37371dea02a25459d46411025a82cad3a3229a3c"
+repo-rev = "develop"
+repo-url = "https://github.com/NREL/REopt.jl.git"
 uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6"
-version = "0.51.1"
+version = "0.52.0"
 
 [[deps.Random]]
 deps = ["SHA"]
diff --git a/reoptjl/migrations/0081_ghpinputs_load_served_by_ghp_and_more.py b/reoptjl/migrations/0081_ghpinputs_load_served_by_ghp_and_more.py
new file mode 100644
index 000000000..d6a2f6a59
--- /dev/null
+++ b/reoptjl/migrations/0081_ghpinputs_load_served_by_ghp_and_more.py
@@ -0,0 +1,29 @@
+# Generated by Django 4.0.7 on 2025-04-22 16:44
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0080_electricloadoutputs_annual_electric_load_with_thermal_conversions_kwh_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ghpinputs',
+            name='load_served_by_ghp',
+            field=models.TextField(blank=True, default='nonpeak', help_text='How to split between load served by GHP and load served by backup system'),
+        ),
+        migrations.AddField(
+            model_name='ghpinputs',
+            name='max_number_of_boreholes',
+            field=models.FloatField(blank=True, help_text='Maximum number of boreholes for GHX', null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100000000.0)]),
+        ),
+        migrations.AddField(
+            model_name='ghpinputs',
+            name='max_ton',
+            field=models.FloatField(blank=True, help_text='Maximum thermal power size constraint for GHP [ton]', null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100000000.0)]),
+        ),
+    ]
diff --git a/reoptjl/migrations/0084_merge_20250423_2110.py b/reoptjl/migrations/0084_merge_20250423_2110.py
new file mode 100644
index 000000000..8ea012a9b
--- /dev/null
+++ b/reoptjl/migrations/0084_merge_20250423_2110.py
@@ -0,0 +1,14 @@
+# Generated by Django 4.0.7 on 2025-04-23 21:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0081_ghpinputs_load_served_by_ghp_and_more'),
+        ('reoptjl', '0083_electricutilityoutputs_peak_grid_demand_kw_and_more'),
+    ]
+
+    operations = [
+    ]
diff --git a/reoptjl/migrations/0085_ghpoutputs_annual_thermal_production_mmbtu_and_more.py b/reoptjl/migrations/0085_ghpoutputs_annual_thermal_production_mmbtu_and_more.py
new file mode 100644
index 000000000..fe4a5e62b
--- /dev/null
+++ b/reoptjl/migrations/0085_ghpoutputs_annual_thermal_production_mmbtu_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.0.7 on 2025-04-24 14:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0084_merge_20250423_2110'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ghpoutputs',
+            name='annual_thermal_production_mmbtu',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='ghpoutputs',
+            name='annual_thermal_production_tonhour',
+            field=models.FloatField(blank=True, null=True),
+        ),
+    ]
diff --git a/reoptjl/models.py b/reoptjl/models.py
index 6a33b9daa..ddc2c0363 100644
--- a/reoptjl/models.py
+++ b/reoptjl/models.py
@@ -8366,6 +8366,32 @@ class GHPInputs(BaseModel, models.Model):
         blank=True,
         help_text="Maximum utility rebate"
     )
+    max_ton = models.FloatField(
+        validators=[
+            MinValueValidator(0),
+            MaxValueValidator(MAX_BIG_NUMBER)
+        ],
+        null=True,
+        blank=True,
+        help_text=("Maximum thermal power size constraint for GHP [ton]")
+    )
+
+    max_number_of_boreholes = models.FloatField(
+        validators=[
+            MinValueValidator(0),
+            MaxValueValidator(MAX_BIG_NUMBER)
+        ],
+        null=True,
+        blank=True,
+        help_text=("Maximum number of boreholes for GHX")
+    )
+
+    load_served_by_ghp = models.TextField(
+        null=False,
+        blank=True,
+        default="nonpeak",
+        help_text="How to split between load served by GHP and load served by backup system"
+    )
 
 
     def clean(self):
@@ -8409,6 +8435,8 @@ class GHPOutputs(BaseModel, models.Model):
     thermal_to_dhw_load_series_mmbtu_per_hour = ArrayField(models.FloatField(null=True, blank=True), default=list, null=True, blank=True)
     thermal_to_load_series_ton = ArrayField(models.FloatField(null=True, blank=True), default=list, null=True, blank=True)
     avoided_capex_by_ghp_present_value = models.FloatField(null=True, blank=True) 
+    annual_thermal_production_mmbtu = models.FloatField(null=True, blank=True)
+    annual_thermal_production_tonhour = models.FloatField(null=True, blank=True)
 
 def get_input_dict_from_run_uuid(run_uuid:str):
     """
diff --git a/reoptjl/testing.txt b/reoptjl/testing.txt
new file mode 100644
index 000000000..e69de29bb