diff --git a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php
index 2c7701b4c..23bd6e444 100644
--- a/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php
+++ b/app/plugins/CoreEnroller/src/Model/Table/AttributeCollectorsTable.php
@@ -80,15 +80,32 @@ public function initialize(array $config): void {
     $this->setTabsConfig(
       [
         // Ordered list of Tabs
-        'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.AttributeCollectors', 'CoreEnroller.EnrollmentAttributes'],
+        'tabs' => ['EnrollmentFlows', 'EnrollmentFlowSteps', 'Petitions'],
         // What actions will inlcude the subnavigation header
         'action' => [
           // If a model renders in a subnavigation mode in edit/view mode, it cannot
           // render in index mode for the same use case/context
           // XXX edit should go first.
-          'EnrollmentFlowSteps' => ['edit', 'view'],
-          'CoreEnroller.AttributeCollectors' => ['edit'],
-          'CoreEnroller.EnrollmentAttributes' => ['index'],
+          'EnrollmentFlows' => ['edit', 'view'],
+          'EnrollmentFlowSteps' => ['index'],
+          'Petitions' => ['index'],
+        ],
+        // What model will have a counter-badge after the tab title
+        'counter' => ['EnrollmentFlowSteps', 'Petitions'],
+        'nested' => [
+          // Ordered list of Tabs
+          'tabs' => ['EnrollmentFlowSteps', 'CoreEnroller.AttributeCollectors', 'CoreEnroller.EnrollmentAttributes'],
+          // What actions will include the subnavigation header
+          'action' => [
+            // If a model renders in a subnavigation mode in edit/view mode, it cannot
+            // render in index mode for the same use case/context
+            // XXX edit should go first.
+            'EnrollmentFlowSteps' => ['edit', 'view'],
+            'CoreEnroller.AttributeCollectors' => ['edit'],
+            'CoreEnroller.EnrollmentAttributes' => ['index']
+          ],
+          // What model will have a counter-badge after the tab title
+          'counter' => ['CoreEnroller.EnrollmentAttributes'],
         ]
       ]
     );
diff --git a/app/src/Lib/Traits/TabTrait.php b/app/src/Lib/Traits/TabTrait.php
index 66f029f25..311bf3cef 100644
--- a/app/src/Lib/Traits/TabTrait.php
+++ b/app/src/Lib/Traits/TabTrait.php
@@ -1,6 +1,10 @@
 <?php
 /**
+<<<<<<<< HEAD:app/src/Lib/Traits/TabTrait.php
  * COmanage Registry Tab Trait
+========
+ * COmanage Registry Tab Subnav Element
+>>>>>>>> 9a427e22 (feature-cfm31-subnavigation (#217)):app/templates/element/subnavigation/inlineList.php
  *
  * Portions licensed to the University Corporation for Advanced Internet
  * Development, Inc. ("UCAID") under one or more contributor license agreements.
@@ -25,8 +29,10 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
+
 declare(strict_types = 1);
 
+<<<<<<<< HEAD:app/src/Lib/Traits/TabTrait.php
 namespace App\Lib\Traits;
 
 trait TabTrait
@@ -68,4 +74,31 @@ public function setTabsConfig(array $tabsConfig): void
     $this->tabsConfig = $tabsConfig;
   }
 
-}
\ No newline at end of file
+}
+========
+$curAction = $this->request->getParam('action');
+$curController = $this->request->getParam('controller');
+$isNested = true;
+
+extract($vv_sub_nav_attributes, EXTR_PREFIX_ALL, 'vv_subnavigation');
+
+$curId = $this->request->getQuery($vv_primary_link)
+  ?? $vv_obj->id
+  ?? end($vv_bc_title_links[0]['target']);
+?>
+
+<?php foreach($vv_subnavigation_nested['tabs'] as $tab): ?>
+  <li class="list-inline-item">
+    <?php
+    // Construct Element Title
+    $title = $this->element('subnavigation/tabTitle', compact('tab', 'curId', 'isNested'));
+    // Construct Target URL
+    $url = $this->Tab->constructLinkUrl($tab, $curId, $isNested);
+    // Calculate Tab Style Class(es)
+    $linkClass = $this->Tab->getLinkClass($tab, $isNested);
+    // Import <a> element in the DOM
+    print $this->Html->link($title, $url, ['class' => $linkClass, 'escape' => false]);
+    ?>
+  </li>
+<?php endforeach; ?>
+>>>>>>>> 9a427e22 (feature-cfm31-subnavigation (#217)):app/templates/element/subnavigation/inlineList.php
diff --git a/app/templates/EnrollmentFlowSteps/fields-nav.inc b/app/templates/EnrollmentFlowSteps/fields-nav.inc
deleted file mode 100644
index 7eebea083..000000000
--- a/app/templates/EnrollmentFlowSteps/fields-nav.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * COmanage Registry Enrollment Flow Steps Nav
- *
- * Portions licensed to the University Corporation for Advanced Internet
- * Development, Inc. ("UCAID") under one or more contributor license agreements.
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * UCAID licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @link          https://www.internet2.edu/comanage COmanage Project
- * @package       registry
- * @since         COmanage Registry v5.0.0
- * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-
-$subnav = [
-  'name' => 'enrollment_flow',
-  'active' => 'steps'
-];
\ No newline at end of file
diff --git a/app/templates/Petitions/fields-nav.inc b/app/templates/Petitions/fields-nav.inc
index 1609fca83..2e475199b 100644
--- a/app/templates/Petitions/fields-nav.inc
+++ b/app/templates/Petitions/fields-nav.inc
@@ -1,6 +1,10 @@
 <?php
 /**
+<<<<<<<< HEAD:app/templates/Petitions/fields-nav.inc
  * COmanage Registry Petition Links
+========
+ * COmanage Registry Tab Trait
+>>>>>>>> 9a427e22 (feature-cfm31-subnavigation (#217)):app/src/Lib/Traits/TabTrait.php
  *
  * Portions licensed to the University Corporation for Advanced Internet
  * Development, Inc. ("UCAID") under one or more contributor license agreements.
@@ -25,6 +29,7 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
+<<<<<<<< HEAD:app/templates/Petitions/fields-nav.inc
 $topLinks = [
   [
     'icon'  => 'resume',
@@ -36,3 +41,37 @@ $topLinks = [
     ]
   ]
 ]; 
+========
+declare(strict_types = 1);
+
+namespace App\Lib\Traits;
+
+trait TabTrait
+{
+  /**
+   * Tabs configuration
+   *
+   * @var array
+   */
+  private array $tabsConfig = [];
+
+  /**
+   * @return array
+   */
+  public function getTabsConfig(): array
+  {
+    return $this->tabsConfig;
+  }
+
+  /**
+   * @param   array  $tabsConfig
+   *
+   * @return void
+   */
+  public function setTabsConfig(array $tabsConfig): void
+  {
+    $this->tabsConfig = $tabsConfig;
+  }
+
+}
+>>>>>>>> 9a427e22 (feature-cfm31-subnavigation (#217)):app/src/Lib/Traits/TabTrait.php