diff --git a/src/components/selectionbar/SubgraphNode.vue b/src/components/selectionbar/SubgraphNode.vue
index 608f1859e..f5289bd38 100644
--- a/src/components/selectionbar/SubgraphNode.vue
+++ b/src/components/selectionbar/SubgraphNode.vue
@@ -4,39 +4,92 @@
     class="workflows-sidebar-tab bg-[var(--p-tree-background)]"
   >
   <template #body>
-        <OrderList v-model="items" dataKey="id" breakpoint="575px" pt:pcListbox:root="w-full sm:w-56">
-            <template #option="{ option }">
-                {{ option }}
-            </template>
-        </OrderList>
+      <TreeExplorer
+        v-model:expandedKeys="expandedKeys"
+        :root="renderedRoot"
+      >
+        <template #node="{ node }">
+        <SubgraphNodeWidget :node="node"/>
+        </template>
+      </TreeExplorer>
   </template>
   </SidebarTabTemplate>
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { ref, watch, computed } from 'vue';
+import { watchDebounced } from '@vueuse/core'
 import OrderList from 'primevue/orderlist';
 
 import { useI18n } from 'vue-i18n'
 
 import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
+import TreeExplorer from '@/components/common/TreeExplorer.vue'
+import SubgraphNodeWidget from '@/components/selectionbar/SubgraphNodeWidget.vue'
 import { useCanvasStore } from '@/stores/graphStore'
+import { buildTree } from '@/utils/treeUtil'
 const { t } = useI18n()
 
 const canvasStore = useCanvasStore()
 
 const items = ref(null)
+const expandedKeys = ref<Record<string, boolean>>({})
 
-watch(() => canvasStore.selectedItems,
-(selectedItems) => {
-  const node = selectedItems[0] ?? {}
+watchDebounced(items,() => {
+  console.log(items.value.map(i => `${i[0].title}: ${i[1].name}`))
+  }, { debounce: 500 }
+)
+
+const widgetTree = computed(() => {
+  const node = canvasStore.selectedItems[0] ?? {}
   const interiorNodes = node?.subgraph?.nodes ?? []
   if (!interiorNodes) {
     items.value = null
     return
   }
-  const intn =  interiorNodes.map((n) => 
-    n.widgets.map((w) => [n.title, w.name])).flat(1)
-  items.value = intn
+  const intn = interiorNodes.map((n) =>
+    n.widgets?.map((w) => [n.id, n.title, w.name]) ?? []).flat(1)
+  //items.value = intn
+  //TODO: filter enabled/disabled items while keeping order
+  console.log(intn)
+  return buildTree(intn, (item: [unknown, unknown]) =>
+    [`${item[1]}: ${item[2]}`]
+  )
 })
+
+
+
+const renderedRoot = computed<TreeExplorerNode<ComfyNodeDefImpl>>(() => {
+  const fillNodeInfo = (node: TreeNode): TreeExplorerNode<ComfyNodeDefImpl> => {
+    const children = node.children?.map(fillNodeInfo)
+
+    return {
+      key: node.key,
+      label: node.leaf ? node.data.display_name : node.label,
+      leaf: node.leaf,
+      data: node.data,
+      label: node.label,
+      getIcon() {
+        if (this.leaf) {
+          return 'pi pi-circle-fill'
+        }
+      },
+      children,
+      draggable: node.leaf,
+      handleClick(e: MouseEvent) {
+        if (this.leaf) {
+          //FIXME Implement
+        } else {
+          toggleNodeOnEvent(e, this)
+        }
+      }
+    }
+  }
+  console.log(widgetTree.value)
+  const ret =  fillNodeInfo(widgetTree.value)
+  console.log(ret)
+  return ret
+})
+
+
 </script>
diff --git a/src/components/selectionbar/SubgraphNodeWidget.vue b/src/components/selectionbar/SubgraphNodeWidget.vue
new file mode 100644
index 000000000..59d7bdbf8
--- /dev/null
+++ b/src/components/selectionbar/SubgraphNodeWidget.vue
@@ -0,0 +1,35 @@
+<template>
+  <div ref="container" class="node-lib-node-container">
+    <TreeExplorerTreeNode :node="node">
+      <template #actions>
+        <Button
+          size="small"
+          :icon="'pi pi-bookmark-fill'"
+          text
+          severity="secondary"
+          @click.stop="onClick"
+        />
+      </template>
+    </TreeExplorerTreeNode>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Button from 'primevue/button'
+
+import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
+import { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
+
+const props = defineProps<{
+  node: RenderedTreeExplorerNode<ComfyNodeDefImpl>
+}>()
+
+function onClick(e) {
+}
+</script>
+
+<style scoped>
+.node-lib-node-container {
+  @apply h-full w-full;
+}
+</style>