diff --git a/atlas/filters.py b/atlas/filters.py
index ca8dfda3..a0092c32 100755
--- a/atlas/filters.py
+++ b/atlas/filters.py
@@ -44,7 +44,7 @@ class SeriesFilter(django_filters.FilterSet):
 class ConditionFilter(django_filters.FilterSet):
     class Meta:
         model = Condition
-        fields = ("name", "primary", "synonym", "subspecialty")
+        fields = ("name", "primary", "synonym", "parent", "subspecialty")
 
     def __init__(self, data=None, queryset=None, prefix=None, strict=None, user=None, request=None):
         #if not request.user.groups.filter(name="atlas_checker").exists():
diff --git a/atlas/migrations/0015_condition_parent.py b/atlas/migrations/0015_condition_parent.py
new file mode 100644
index 00000000..c7560a23
--- /dev/null
+++ b/atlas/migrations/0015_condition_parent.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.4 on 2021-12-05 16:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('atlas', '0014_remove_case_sign'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='condition',
+            name='parent',
+            field=models.ManyToManyField(blank=True, related_name='_atlas_condition_parent_+', to='atlas.Condition'),
+        ),
+    ]
diff --git a/atlas/models.py b/atlas/models.py
index 94bfa81e..3d57dfba 100644
--- a/atlas/models.py
+++ b/atlas/models.py
@@ -102,6 +102,7 @@ class Condition(SynMixin, models.Model):
     name = models.CharField(max_length=255, unique=True)
 
     synonym = models.ManyToManyField("self", blank=True)
+    parent = models.ManyToManyField("self", blank=True)
 
     primary = models.BooleanField(default="True")
 
diff --git a/atlas/tables.py b/atlas/tables.py
index ee4f9c0f..e6e4753e 100755
--- a/atlas/tables.py
+++ b/atlas/tables.py
@@ -145,6 +145,7 @@ class ConditionTable(tables.Table):
     selection = tables.CheckBoxColumn(accessor="pk", orderable=False)
 
     synonym = tables.ManyToManyColumn(verbose_name="Synonyms")
+    parent = tables.ManyToManyColumn(verbose_name="Parents")
 
     class Meta:
         model = Condition
diff --git a/atlas/templates/atlas/case_detail.html b/atlas/templates/atlas/case_detail.html
index 811b3305..1e928f4c 100755
--- a/atlas/templates/atlas/case_detail.html
+++ b/atlas/templates/atlas/case_detail.html
@@ -15,6 +15,7 @@
     {% if request.user.is_superuser %}
     <a href="{% url 'admin:atlas_case_change' case.id %}" title="Edit the Case using the admin interface">Admin Edit</a>
     {% endif %}
+</div>
     {% include 'atlas/case_display_block.html' %}
     {% endblock %}
 
diff --git a/atlas/templates/atlas/condition_detail.html b/atlas/templates/atlas/condition_detail.html
index 589c9559..6821e3cf 100755
--- a/atlas/templates/atlas/condition_detail.html
+++ b/atlas/templates/atlas/condition_detail.html
@@ -16,6 +16,7 @@
     <h3>Name: {{condition.name}}</h3>
     Primary name: {{condition.primary}}<br />
     Synonyms: {{condition.synonym.all|join:", "}}<br />
+    Parent: {{condition.parent.all|join:", "}}<br />
 </div>
 
 {% endblock %}