diff --git a/docs/ssvc-calc/css.css b/docs/ssvc-calc/css.css
index 833e01bd..f147c57b 100644
--- a/docs/ssvc-calc/css.css
+++ b/docs/ssvc-calc/css.css
@@ -1,4 +1,4 @@
-/* css version 2.2.9 */
+/* css version 2.2.10 */
 #helper {
     background-color: rgba(255,255,255,0.95);
     border: 1px solid grey;
@@ -464,3 +464,7 @@ pre {
 textPath {
 cursor: pointer;
 }
+.blackbody .swal2-popup {
+  background: #222;
+  color: #eee;
+}
diff --git a/docs/ssvc-calc/findex.html b/docs/ssvc-calc/findex.html
index 4bdeaf63..c695dcf1 100644
--- a/docs/ssvc-calc/findex.html
+++ b/docs/ssvc-calc/findex.html
@@ -52,9 +52,10 @@
     <link rel="stylesheet" href="main.css">
     <link rel="stylesheet" href="css.css?v=1663537129">
     <script src="ungraph.js?v=1663537129"></script>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11" async defer></script>
   </head>
   <body class="text-center whitebody">
-    <img src="moon_icon.png" class="cert-tweet" alt="CERT Logo"
+    <img src="moon_icon.png" class="cert-tweet" alt="CERT Logo" style="display:none"
          onclick="$('body').toggleClass('blackbody').toggleClass('whitebody')"/>
     <div class="tright" style="display:none">
       <a href="javascript:void(0)" onclick="$('#helper').show()"
@@ -97,48 +98,39 @@ <h3 class="brand">
 
       <main class="inner cover">
 	<h4 class="cover-heading">
-	  <select id="graph-ungraph" class="form-control mauto"
-		  onchange="swapg(this)">
-	    <option value="Graphic">Mode: Graphic</option>
-	    <option value="Analyst">Mode: Analyst</option>		
-	  </select>	      
-	  Dryad - SSVC Calc App
+	  Sample Decision Models:
 	  <select id="tree_samples" class="form-control impselector embedded" style="border: 1px solid"
 		   onchange="tree_process(this)">
 	    <option value="">Select</option>
 	    <option value="import">Import Tree</option>
 	  </select>
-	  
+	  <button class="btn btn-sm btn-outline-info" onclick="promptMultipleCVEs()">
+	    Multiple CVEs
+	  </button>
 	  <div class="cover_heading_append d-none">
 	    (CISA Coordinator v2)
 	  </div>
 	  <button type="button" class="btn btn-secondary" id="exportopen"
 		  data-toggle="tooltip" data-placement="bottom"
-		  title="Show Export" style="display:none"
+		  title="Show Export" 
 		  onclick="export_show(false)">
-	    Export</button>
-	  
+	    Export
+	  </button>
 	</h4>
 	<div class="alert" id="topalert" role="alert">
 	  This is an alert!
 	</div>
-	<p class="lead graphy">
+	<p class="lead graphy-old" style="display:none">
 	  <button type="button" class="btn btn-primary" id="dt_start"
 		  data-toggle="tooltip" data-placement="bottom"
-		  title="Start walking the SSVC decision tree"
-		  onclick="dt_start()">
-	    Start Decision</button>
+		  title="Use SSVC Decision Tree to evaluate one or more vulnerabilities"
+		  onclick="evaluate_vuls()">
+	    Evaluate Vulnerability</button>
 	  <button type="button" class="btn btn-danger" id="dt_clear"
 		  data-toggle="tooltip" data-placement="bottom"
 		  title="Clear all decisions and start over"
-		  onclick="dt_clear()">
-	    Clear All</button>
-	  <button type="button" class="btn btn-info" id="dt_full_tree"
-		  data-toggle="tooltip" data-placement="bottom"
-		  title="Explore the full decision tree of this SSVC Instance"
-		  onclick="show_full_tree()">
-	    Show Full Tree
-	  </button>
+		  onclick="check_all()">
+	    Check All</button>
 	  <a href="javascript:void(0)" title="View previous score"
 	     alt="View previous score" id="table_toggle" style="display:none"
 	     onclick="cve_table_toggle()">
@@ -151,13 +143,15 @@ <h4 class="cover-heading">
 	    <tbody><tr></tr></tbody>
 	  </table>
 	</p>
+	<section id="evaluate_section"></section>
 	<div id="zoomcontrol" class="graphy embedded d-none">
 	  <div class="d-none">&#128269;</div>
 	  <input type="range" orient="vertical" alt="Zoom Graph"
 		 max="100" min="0" value="100" title="Zoom Graph"
 		 onchange="svgzoom(this)">
-	  </div>
-	<div id="graph" class="position-relative graphy embedded" style="margin-left: 20px">
+	</div>	
+	<div id="graph" class="position-relative graphy embedded"
+	     style="border: 1px solid rgba(1,1,1,0.1)">
 	</div>
 	<div id="ungraph" class="position-relative d-none">
 	  <table class="table table-borderless">
@@ -429,9 +423,9 @@ <h4>Decision Tree Usage:</h4>
     </div>
     <div id="exporter" class="d-none">
       <div class="row justify-content-center position-absolute exportdiv">
-	<div class="export-header">
-	  <h3> Export Calculated Score</h3>
-	  <button type="button" aria-label="Close" class="close h3" onclick="$(this).parent().parent().remove()">
+	<div class="export-header" style="padding-bottom:8px">
+	  <h3> Export Calculated SSVC Score</h3>
+	  <button type="button" aria-label="Close" class="close h3" onclick="export_close()">
 	    <span aria-hidden="true">×</span>
 	  </button>
 	</div>
@@ -439,60 +433,69 @@ <h3> Export Calculated Score</h3>
 	    <table class="table table-borderless w-auto">
 	      <tbody>
 		<tr>
-		  <td>
-		    <input type="text" placeholder="ID CVE/VU#"
-			   class="form-control exportId">
+		  <td style="padding:2px">
+		    <label>
+		    Timestamp: <input type="text" placeholder="timestamp UTC like 2025-01-01T12:00:00Z" name="timestamp"
+			   class="form-control timestamp" pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?Z" style="width:auto; display:inline-block;min-width:24ch;">
+		    </label>
+		    <label class="custom-control custom-switch">
+		      <input class="custom-control-input" type="checkbox" name="include_outcome" checked>
+		      <span class="custom-control-label">Include Outcomes</span>
+		    </label>
+		    <label class="custom-control custom-switch">
+		      <input type="checkbox" class="custom-control-input export-resources"
+			     onchange="export_optional(this.checked)">
+		      <span class="custom-control-label text-muted">Provide resource information</span>
+		    </label>
 		  </td>
 		</tr>
-		<tr>
-		  <td>
-		    <select  class="form-control exportRole">
-		      <option value="" disabled selected>Select Role</option>
-		      <option>Coordinator</option>
-		      <option>Supplier</option>
-		      <option>Deployer</option>
-		      <option>Other</option>
-		    </select>
+		<tr class="export-optional d-none">
+		  <td style="padding:2px">
+		    <div style="border: 1px dotted grey">
+		      For Vulnerability:
+		     <span class="vulninfo text-muted"></span>
+		    
+		    <ul style="margin-bottom:1px">
+		      <li style="list-style:none; position:relative; border: 1px dashed grey;">
+		      <input type="text" placeholder="URL of Decision Tree schema" name="decision_point_resources-0-uri"class="form-control">
+		      <input type="text" placeholder="Description of Decision Tree URL" name="decision_point_resources-0-summary" class="form-control">
+		      <button class="btn" title="Add Row" style="position:absolute; right:0px; bottom: 0px"
+			      aria-label="Add Row"
+			      onclick="duplicate(this.parentNode)">
+			 <span aria-hidden="true">&#8853;</span>
+		      </button>
+		      </li>
+		    </ul>
+		    <ul style="margin-bottom:1px">
+		      <li style="list-style:none; position:relative; border: 1px dashed grey;">
+			<input type="text" placeholder="URL of resources used for selection" name="references-0-uri" class="form-control">
+			<input type="text" placeholder="Description of the Resources URL" name="references-0-summary" class="form-control">
+			<button class="btn" title="Add Row" style="position:absolute; right:0px; bottom: 0px"
+			      aria-label="Add Row"
+			      onclick="duplicate(this.parentNode)">
+			  <span aria-hidden="true">&#8853;</span>
+			</button>			
+		      </li>
+		    </ul>
+		    </div>
 		  </td>
-		</tr>
+		</tr>		
 		<tr>
-		  <td>
-		    <div>
-		      <span class="text ssvcvector d-inline">
-		      </span>
-		      <span onclick="copym('#graph .ssvcvector')">
-			<img src="icons8-copy-60.png"
-			     class="icon8"/>
-		      </span>
-		      <span onclick="create_permalink('copy')">
-			<img src="icons8-copy-link-48.png"
-			     class="icon8"/>
-		      </span>
-		      <br/>
-		      <span class="permalink d-none"
-			    style="font-size:1px; position:fixed">
-		      </span>
-		    </div>
+		  <td style="padding:2px">
+		    <label class="custom-control custom-switch">
+			<input type="checkbox" unchecked="" class="custom-control-input includetree" value="">
+			<span class="custom-control-label text-muted">Include decision tree in export</span>
+		    </label>
 		    
-		    <input type="checkbox" class="includetree" unchecked>
-		    <span class="text-muted">
-		      Include decision tree in export
-		    </span>
-		    <div>
-		      Contact: 
-		      <input type="text" id="contact" class="form-control"
-			     value="DHS CISA can be contacted at cisa@cisa.dhs.gov"/>
-		    </div>
-		    <br/>
 		    <div class="btn-group primary-button Exporter">
 		      <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 			Export
 		      </button>
 		      <div class="dropdown-menu">
-			<a class="dropdown-item" href="javascript:void(0)"
-			   onclick="export_json()">JSON</a>
-			<a class="dropdown-item" href="javascript:void(0)"
-			   onclick="export_pdf()">PDF</a>
+			<button class="dropdown-item" href="javascript:void(0)"
+				onclick="export_json()">JSON</button>
+			<button class="dropdown-item" href="javascript:void(0)" disabled
+				onclick="export_pdf()">PDF</button>
 			<!-- 
 			     <div class="dropdown-divider"></div>
 			     <a class="dropdown-item" href="#">Separated link</a>
diff --git a/docs/ssvc-calc/index.md b/docs/ssvc-calc/index.md
index 7e9df37f..57513cb9 100644
--- a/docs/ssvc-calc/index.md
+++ b/docs/ssvc-calc/index.md
@@ -1,11 +1,16 @@
-# SSVC Calculator
+---
+hide:
+  - navigation
+  - title
+---
+
+# Dryad SSVC Calculator
 
 <style>
 .sembed {
   min-width: 1200px;
   min-height: 1100px;
-  margin-left: -40%;
-  margin-top: -15%;
+  margin-top: -5%;
   z-index: 1;
   position: relative;
 }
diff --git a/docs/ssvc-calc/ssvc.js b/docs/ssvc-calc/ssvc.js
index 93b6fc0d..0c23ecd7 100644
--- a/docs/ssvc-calc/ssvc.js
+++ b/docs/ssvc-calc/ssvc.js
@@ -20,28 +20,27 @@
  */
 
 /* SSVC code for graph building */
-const _version = "5.1.8"
+const _version = "6.0.2"
 const _tool = "Dryad SSVC Calculator "+_version
-var showFullTree = false
+var showFullTree = false;
+/* The registryurl is now relative to local folder using symlink for convenience*/
+const registry_url = "https://raw.githubusercontent.com/CERTCC/SSVC/refs/heads/main/data/json/ssvc_object_registry.json";
+const SSVC = {"tool_version": _version, decision_points: [], decision_trees: []}
 var diagonal,tree,svg,duration,root
 var treeData = []
-/* Deefault color array of possible color options */
-var acolors = ["#28a745","#ffc107","#EE8733","#dc3545","#ff0000","#aa0000","#ff0000"]
-var lcolors = {"Track":"#28a745","Track*":"#ffc107","Attend":"#EE8733","Act":"#dc3545"}
+/* Default color array of possible color options
+["#28a745","#ffc107","#EE8733","#dc3545","#ff0000","#aa0000","#ff0000"]
+
+ */
+var acolors = [  "#28a745", "#72b741", "#b0c13f", "#e6be3d", "#ffc107",
+		 "#fba145", "#f37d4f", "#e65b53", "#d93f4e", "#dc3545"];
+var lcolors = {};
 var ssvc_short_keys = {};
-/* These variables are for decision tree schema JSON aka SSVC Provision Schema */
-var export_schema = {decision_points: [],decisions_table: [], lang: "en",
-		     version: "2.0", title: "SSVC Provision table"}
+/* These variables are for decision Selection schema */
+var export_schema = { };
+var valueselect_schema = { "timestamp": "2025-08-24T15:05:00Z",  "schemaVersion": "2.0.0", "target_ids": [], "selections": [], "decision_point_resources" : [], "references": []};
 /* If a new analysis is being done use this for export */
 var current_score = [];
-var current_tree = "Deployer.json";
-var roll_tree_map = {
-		     "Supplier": "Supplier.json",
-		     "Deployer": "Deployer.json",
-		     "Coordinator-Publish": "Coordinator-Publish.json",
-		     "Coordinator-Triage": "Coordinator-Triage.json",
-			 "CISA-Coordinator" : "CISA-Coordinator.json"
-		    };
 var current_schema = "SSVC_Computed.schema.json";
 /* A dictionary of elements that are children of a decision point*/
 var ischild = {};
@@ -63,6 +62,24 @@ jQuery.fn.simClick = function () {
 	e.dispatchEvent(evt);
     });
 };
+function check_all(ev) {
+    const mdiv = ev.target.parentElement.parentElement;
+    const els = $(mdiv).find('input[type="checkbox"].dp_input');
+    const dto = $(mdiv).find('input[type="checkbox"].dt_outcome');
+    els.each(function(_,el) {
+	el.checked = true;
+    });
+    show_full_tree();
+    dto.each(function(_,dinput) {
+	outcome_set(dinput, true);
+    });
+}
+function export_optional(show) {
+    if(show)
+	$('tr.export-optional').removeClass("d-none");
+    else
+	$('tr.export-optional').addClass("d-none");	
+}
 function reset_form() {
     /* This is to clear stupid Firefox cached form values*/
     $('select').prop('selectedIndex',0);	    
@@ -83,48 +100,81 @@ function select_add_option(s,opt) {
 		 .html(opt));
     };
 }
+function arrayReduce(arr,n) {
+    if(n > arr.length)
+	return arr.concat(Array(n-arr.length).fill(arr.at(-1)))
+    return arr.filter(function(_,i) {
+        if (i === 0 || i === arr.length - 1) return true;
+        const step = (arr.length-1)/(n-1);
+        for (let j = 1; j < n - 1; j++) 
+            if (Math.round(j * step) === i)
+		return true;
+        return false;
+    });
+}
+
 $(function () {
+    /* document.ready() */
     reset_form();
-    Object.keys(roll_tree_map).forEach(function(x) {
-	var display = roll_tree_map[x].replace(".json","");
-	$('#tree_samples').append($('<option>')
-				  .attr({value:roll_tree_map[x]})
-				  .html(display))
-    });
     $('#topalert').width($('main').width());
     window.onresize = function() { $('#topalert').width($('main').width())}
-    $('[data-toggle="tooltip"]').tooltip();
-    if(localStorage.getItem("beenhere")) {
-	tooltip_cycle_through();
-    } else {
-	$('#helper').show();
-	localStorage.setItem("beenhere",1);
-    }
-    //load_tsv_score();
-    //tree_process("CISA-Coordinator-v2.01.json");
-    if(location.hash != "") {
-	/*  IF location specifies are tree and its valid, preload the right tree
-	   "SSVCv2/E:A/V:S/T:T/M:H/D:C/1632171335/&CVE-2014-01-01&Coordinator" 
-	*/	
-	plparts = location.hash.substr(1).split("&");
-	if((plparts.length > 1) && (plparts[1] in roll_tree_map)) {
-	    current_tree = roll_tree_map[plparts[1]];
-	    $('#tree_samples').val(current_tree);
+    $.getJSON(registry_url).done(function(registry) {
+	let defaultTree;
+	if (registry.types && registry.types.DecisionPoint &&
+	    registry.types.DecisionPoint.namespaces) {
+	    const namespaces = registry.types.DecisionPoint.namespaces;
+	    for (const nsKey in namespaces) {
+		const namespace = namespaces[nsKey];
+		if (namespace.keys) {
+		    for (const key in namespace.keys) {
+			const keyEntry = namespace.keys[key];
+			if (keyEntry.versions) {
+			    for (const version in keyEntry.versions) {
+				const versionEntry = keyEntry.versions[version];
+				if (versionEntry.obj && versionEntry.values) {
+				    let mdata = {data: versionEntry.obj};
+				    SSVC.decision_points.push(mdata);
+				}
+			    }
+			}
+		    }
+		}
+	    }
 	}
-	/* For some reason when .val() is used the cloning of this export does not
-	 carry over the value .attr of "value" works right */
-	if((plparts.length > 2) && (plparts[2] != "")) 
-	    $('.exportId').attr("value",plparts[2]);
-    }
-    select_add_option($('#tree_samples'),current_tree);    
-    $.getJSON(current_tree).done(function(idata) {
-	parse_json(idata);
-    }).fail(function() {
-	console.log("Failed to Load CISA tree.  Loading default tree");
+	if (registry.types && registry.types.DecisionTable &&
+	    registry.types.DecisionTable.namespaces) {
+	    const namespaces = registry.types.DecisionTable.namespaces;
+	    for (const nsKey in namespaces) {
+		const namespace = namespaces[nsKey];
+		if (namespace.keys) {
+		    for (const key in namespace.keys) {
+			const keyEntry = namespace.keys[key];
+			if (keyEntry.versions) {
+			    for (const version in keyEntry.versions) {
+				const versionEntry = keyEntry.versions[version];
+				if (versionEntry.obj && versionEntry.obj.decision_points) {
+				    let mdata = {data : versionEntry.obj, displayname: versionEntry.obj.name + " (" + versionEntry.obj.version + ")"};
+				    if(versionEntry.obj.name.indexOf("Deployer") > -1) {
+					mdata['selected'] = true;
+					defaultTree = versionEntry.obj;
+				    }
+				    SSVC.decision_trees.push(mdata);
+				}
+			    }
+			}
+		    }
+		}
+	    }
+	}
+	parse_json(defaultTree);
+	SSVC.decision_trees.forEach(function(dpd, i) {
+	    $('#tree_samples').append($('<option>')
+				      .attr({value: i, selected: dpd.selected})
+				      .text(dpd.displayname));
+	});
     });
-    export_tree();
-    load_tsv_score();
-})
+
+});
 var raw = [];
 
 document.onkeyup = function(evt) {
@@ -213,25 +263,40 @@ function dynamic_mwb(w) {
     return result;
 }
 function export_show(novector) {
-    console.log(novector);
-    $('#exportopen').show();
-    var ptranslate = "translate(120,-250)";
-    if(window.innerWidth <= 1000)
-	ptranslate = "translate(30,-90) scale(0.4,0.4)";
-    d3.select("#pgroup").transition()
-	.duration(600).attr("transform", ptranslate);
-    var q = $('#exporter').html();
-    $('.exportActive .exportdiv').remove();
-    $('.exportActive').removeClass('exportActive');
-    if($('#graph-ungraph').val() == "Analyst")
-	$('#ungraph').append(q).addClass('exportActive');
-    else
-	$('#graph').append(q).addClass('exportActive');
-    if($('#cve_samples').val().match(/^(cve|vu)/i))
-	$('.exportId').val($('#cve_samples').val())
-    if(novector == true)
-	return
-    setTimeout(make_ssvc_vector,1000);
+    $('.cover-container').css({opacity:0.5,pointerEvents:"none"});
+    $('#exporter').removeClass('d-none');
+    $('#exporter input').each(function(_,inp) {
+	inp.value = "";
+    });
+    
+    $('#exporter .timestamp').val((new Date()).toISOString());
+    $('#exporter .duplicated').remove();
+    let vuls = $('#evaluate_section > div');
+    let resources = $('.export-optional > td > div');
+    let diff = vuls.length - resources.length;
+    if (diff > 0) {
+	let pr = resources[0].parentElement;
+	for (let i = 0; i < diff; i++) 
+            pr.appendChild(resources[0].cloneNode(true));
+    } else if (diff < 0) {
+	for (let i = resources.length - 1; i >= vuls.length; i--) 
+            resources[i].remove();
+    }
+    resources = $('.export-optional > td > div');
+    for(let i=0; i<vuls.length; i++) {
+	const vuel = vuls[i].querySelector('.vuid')
+	let span = resources[i].querySelector('.vulninfo');
+	if(vuel && span) {
+	    if(vuel.value)
+		span.innerText = vuel.value;
+	    else
+		span.innerText = String(i);
+	}
+    }
+}
+function export_close() {
+    $('.cover-container').css({opacity:1.0,pointerEvents:"revert"})
+    $('#exporter').addClass('d-none');
 }
 function make_ssvc_vector() {
     console.log($('.exportId').val());
@@ -293,10 +358,10 @@ function export_tree() {
 	   reduce((z,y,i) => {
 	       z[yhead[i]] = y
 	       if(!toptions[i]) {
-		   toptions[i] = [{label: y, description: y}]
+		   toptions[i] = [{label: y, definition: y}]
 	       }
 	       else if (!toptions[i].find(t => t.label == y))
-		   toptions[i].push({label: y, description:y})
+		   toptions[i].push({label: y, definition:y})
 	       return z
 	   },{}))
     /* Now the decision points should be moved to the end of the array */
@@ -317,48 +382,127 @@ function export_tree() {
        {"TechnicalImpact":"laborious"},{"SafetyImpact":"none"},
        {"Decision":"defer"}]" */
 }
+function simpleCopy(objin) {
+    try {
+	return JSON.parse(JSON.stringify(objin));
+    } catch(err) {
+	console.log("Perhaps not a JSON object",err);
+	return {}
+    }
+}
+function add_selection(value_selection,inp) {
+    let h4 = inp.parentElement.parentElement.parentElement.childNodes[0];
+    const dp = JSON.parse(h4.getAttribute("data-dp"));
+    const valueSet = {key: inp.getAttribute("data-dpvkey"),
+		      name: inp.value};
+    let findex = value_selection.selections.findIndex(function(selectdp) {
+	return selectdp.version == dp.version &&
+	    selectdp.namespace == dp.namespace &&
+	    selectdp.key == dp.key
+    });
+    if(findex > -1) {
+	value_selection.selections[findex].values.push(valueSet)
+    } else {
+	value_selection.selections.push({values:[valueSet],
+					 name: inp.name,
+					 version: dp.version,
+					 namespace: dp.namespace,
+					 definition: dp.definition,
+					 key: dp.key});
+    }
+}
+function duplicate(li) {
+    const lastli = li.parentElement.lastElementChild;
+    if(li.dataset.xdelete == "delete") {
+	return lastli.remove();
+    }
+    const nli = lastli.cloneNode(1);
+    nli.querySelectorAll("input").forEach(function(inp) {
+	let regex = new RegExp("^([^\-]+)\-([0-9]+)\-([^\-]+)$")
+	inp.name = inp.name.replace(regex,function() {
+	    let args = Array.from(arguments);
+	    if(args.length > 2 && args[2].match(/^[0-9]+$/)) {
+		let incr = parseInt(args[2]) + 1;
+		args[2] = incr;
+		/*Remove first and last two elements */
+		return args.slice(1,-2).join("-");
+	    }
+	    return inp.name
+	});
+    });
+    const btn = nli.querySelector("button");
+    if(btn) {
+	btn.innerHTML = "&#8854";
+	btn.style.color = "red";
+	nli.dataset.xdelete = "delete";
+	nli.classList.add("duplicated");
+	li.parentElement.appendChild(nli);
+    }
+}
+
 function export_json() {
-    var includetree = $('.exportActive .includetree').is(':checked')
-    $('.Exporter').css({'pointer-events':'none'});
-    var tstamp = new Date()
-    var oexport = { role: $('.exportActive .exportRole').val() || "Unknown",
-		    id: $('.exportActive .exportId').val() || "Unspecified",
-		    version: "2.0",
-		    generator: _tool
-		  }
-    oexport['computed'] = $('.exportActive .ssvcvector').html();
-    
-    oexport['timestamp'] =  $('.exportActive .ssvcvector').html().split('/').
-	slice(-2,-1)[0]
-    final_outcome = $('#graph svg g.node text:last').text();
-    /* If final_outcome is empty look for analyst mode value */
-    if($('#graph-ungraph').val() == "Analyst" || (!final_outcome)) {
-	final_outcome = $('h4.hfinal').html();
+    let oexport = {};
+    let value_selections = [];
+    let add_outcome = $('#exporter input[name="include_outcome"]').is(':checked');
+    let download_filename = "SSVC_" + (new Date()).toISOString().replace(":","-")  + "_json.txt"
+    let export_options = [];
+    if($('.export-resources').is(':checked')){
+	export_options = Array.from($('.export-optional > td > div'));
+	let includetree = $('#exporter .includetree').is(':checked');
+	if (includetree) {
+	    if(export_schema.current_tree &&
+	       export_schema.current_tree.schemaVersion == "2.0.0") {
+		oexport['decision_tree'] = expot_schema.current_tree;
+	    } else  {
+		let rindex = $('#tree_samples').val();
+		if(rindex.match(/^[0-9]+$/)) { 
+		    let index = parseInt(rindex);
+		    if(SSVC.decision_trees[index] && SSVC.decision_trees[index].data)
+			oexport['decision_tree'] = SSVC.decision_trees[index].data;
+		}
+	    }
+	}	
     }
-    /* Copy current_score as is to options that were selected */
-    oexport['options'] = current_score;
-    if(current_score.findIndex(x => final_keyword in x) < 0) {
-	/* Add final_keywrod only if not exists see GitHub issue #190 */
-	var last_option = {};
-	last_option[final_keyword] = final_outcome;
-	oexport['options'].push(last_option);
-    }
-    oexport['$schema'] = location.origin + location.pathname + current_schema
-    oexport['decision_tree_url'] = location.origin + location.pathname +
-	current_tree;
+    $('#evaluate_section > div').each(function(i,div) {
+	value_selection = simpleCopy(valueselect_schema);
+	value_selection.timestamp = $('#exporter .timestamp').val();
+	div.querySelectorAll("input").forEach(function(inp) {
+	    /* Add checks if outcome should be included*/
+	    if(inp.classList.contains("dt_outcome") && (!add_outcome))
+		return;
+	    if(inp.classList.contains('vuid'))
+		value_selection.target_ids.push(inp.value.toUpperCase());
+	    else if(inp.checked && inp.hasAttribute("data-dpvkey"))
+		add_selection(value_selection, inp);
+	});
+	/* If export_options is enabled go ahead and add them*/
+	if(export_options[i]) {
+	    export_options[i].querySelectorAll("input").forEach(function(inp) {
+		if(inp.value) 
+                    value_selection = set_deep(value_selection,inp.name,inp.value);
+	    });
+	}
+	value_selections.push(value_selection);
+    });
+    value_selections.forEach(function(_,i) {
+	['decision_point_resources','references'].forEach(function(res) {
+	    if(!value_selections[i][res].length)
+		delete value_selections[i][res];
+	})
+    });
+    if(value_selections.length == 1)
+	download_filename = "SSVC_" + value_selections[0].target_ids[0] +
+	(new Date()).toISOString().replace(":","-")  + "_json.txt"
+    oexport.evaluations = value_selections;
+	
     var a = document.createElement("a")
-    var download_filename = oexport.id+"_"+oexport.role+"_json.txt"
-    if (includetree) {
-	oexport['decision_tree'] = export_schema
-	download_filename = "tree_and_path-"+ oexport.id + "_" + oexport.role +
-	    "_json.txt"	
-    } 
+    
     a.href = "data:text/plain;charset=utf-8,"+
 	encodeURIComponent(JSON.stringify(oexport,null,2))
     a.setAttribute("download", download_filename)
     a.click()
     a.remove()
-    $('.Exporter').css({'pointer-events':'all'});    
+    export_close();
 }
 
 function readFile(input) {
@@ -412,6 +556,17 @@ function tree_process(w) {
 	    $('#dtreecsvload').click()
 	return
     }
+    if(ptree.match(/^\d+$/)) {
+        const index = parseInt(ptree);
+        if( index in SSVC.decision_trees && SSVC.decision_trees[index].data) {
+            /* This is a SSVC.decision_point index find it and return */
+            return parse_json(SSVC.decision_trees[index].data);
+        }
+    }
+    if(ptree.indexOf("json:") == 0) {
+        /* ptree itself is the payload with json: in the front*/
+        return parse_json(JSON.parse(ptree.substring(5)));
+    }
     $.get(ptree, function(idata) {
         if(ptree.match(/\.json$/i))
 	    parse_json(idata)
@@ -668,7 +823,7 @@ function create_short_keys(x,uniq_keys) {
     }
 }
 function schemaTransform(dtnew) {
-    const dtobj = JSON.parse(JSON.stringify(dtnew));
+    const dtobj = simpleCopy(dtnew);
     const dtold = {};
     let finalkey;
     if('outcome' in dtobj)
@@ -708,10 +863,239 @@ function schemaTransform(dtnew) {
     return dtold;
 
 }
+function evaluate_vuls() {
+    $('#evaluate_section').toggle();
+}
+function outcome_set(dinput, enabled) {
+    if(enabled) {	
+	dinput.parentElement.style.opacity = 1.0;
+	dinput.checked = true;
+    } else {
+	dinput.parentElement.style.opacity = 0.4;
+	dinput.checked = false;
+    }
+}
+function check_select(ev) {
+    const input = ev.target;
+    /* Container for this decision point */
+    const dpContainer = input.parentElement.parentElement.parentElement;
+    const groupContainer = dpContainer.parentElement;
+    let valueSet = {};
+    valueSet[final_keyword] = [];
+    groupContainer.querySelectorAll('input[type="checkbox"].dp_input').forEach(function(xinput) {
+	if(xinput.checked) {
+	    if((xinput.name in valueSet) &&(!valueSet[xinput.name].includes(xinput.value)))
+		valueSet[xinput.name].push(xinput.value);
+	    else
+		valueSet[xinput.name] = [xinput.value]
+	}
+    });
+    export_schema.decisions_table.forEach(function(dt) {
+	let matched = Object.keys(valueSet).every(function(key) {
+	    if(key == final_keyword)
+		return true;
+	    if((key in dt) && (valueSet[key].includes(dt[key]))) {
+		return true;
+	    } else {
+		return false;
+	    }
+	    console.log(key,dt[key],valueSet[key], matched);
+	});
+	//console.log(dt,matched);
+	if(matched && (!valueSet[final_keyword].includes(dt[final_keyword]))) {
+	    valueSet[final_keyword].push(dt[final_keyword]);
+	}
+    });
+    //console.log(valueSet);
+    const outcomes = Array.from(groupContainer.querySelectorAll("input.dt_outcome"));
+    groupContainer.querySelectorAll("input.dt_outcome").forEach(function(dinput) {
+	//console.log(dinput.value,valueSet[final_keyword]);
+	if(!valueSet[final_keyword].includes(dinput.value)) {
+	    outcome_set(dinput, false);
+	} else {
+	    outcome_set(dinput, true);
+	}
+    });
+    const finddpIndex = $(input).data("dpdepth");
+    const nodes = d3.selectAll("g.node.depth-"+String(finddpIndex));
+    function traverse_remove(xnode) {
+	if(!xnode.__data__) {
+	    console.log("Error no nodes to descend!");
+	}
+	if(!xnode.__data__._schildren) {
+	    console.log("Error no node _schildren data to restore from!");
+	}
+	let removeValues = [];
+	xnode.__data__.children = Array.from(xnode.__data__._schildren);
+	dpContainer.querySelectorAll("input").forEach(function(cinput) {
+	    if(!cinput.checked) 
+		removeValues.push($(cinput).data("dpvdepth"));
+	});
+	removeValues.reverse().forEach(function(rindex) {
+	    removevalueIndex = parseInt(rindex);
+	    xnode.__data__.children.splice(removevalueIndex,1);
+	});
+	update(xnode.__data__);
+    }    
+    
+    if(nodes.length) {
+	nodes[0].forEach(function(xnode) {
+	    if(xnode.__data__) {
+		if(xnode.__data__._schildren) {
+		    traverse_remove(xnode);
+		} else if(xnode.__data__.children) {
+		    let removevalueIndex = $(input).data("dpvdepth");
+		    xnode.__data__._schildren = Array.from(xnode.__data__.children);
+		    xnode.__data__.children.splice(removevalueIndex,1);
+		    update(xnode.__data__);
+		}
+	    }
+	});
+    }
+}
+function process_ssvc(ssvc, winput) {
+    /* Assume flat SSVC namespace for now */
+    function set_ssvc(dpInput, ssvc) {
+	dpInput.setAttribute("public-update", ssvc.data.timestamp);
+	dpInput.setAttribute("public-provider", ssvc.provider);
+	/* Update the title like Exploitation with this data*/
+	try {
+	    let h4 =  dpInput.parentElement.parentElement.parentElement.childNodes[0];
+	    h4.setAttribute("title", "Updated using public provider "
+			    + ssvc.provider +  " on " + ssvc.data.timestamp);
+	    
+	} catch (err) {
+	    console.log(err);
+	}
+    }
+    function reset_dp(dpInput) {
+	/* Check if dpInput has been changed by logic above*/
+	if(dpInput.checked && (!dpInput.hasAttribute("public-update"))) {
+	    dpInput.click();
+	} else if((!dpInput.checked) && dpInput.getAttribute("public-update")) {
+	    dpInput.click();
+	}
+	/* below will also work but for readability above is better.
+	   if (dpInput.checked !== Boolean(dpInput.getAttribute("public-update"))) {
+	   dpInput.click();
+	   }
+	*/
+    }
+    let dpContainer = winput.parentElement.parentElement.nextSibling;
+    if('data' in ssvc && 'schemaVersion' in ssvc.data) {
+	/* Uses official SSVC schema*/
+	if(ssvc.data.schemaVersion == "1-0-1") {
+	    ssvc.data.selections.forEach(function(selection, i) {
+		//const name = selection.name.toLowerCase();
+		//const value = '\\"label\\":\\"' + name + '\\"';
+		//const match = '[data-dp*="' + value + '" i]';
+		const match = 'input[name*="' + selection.name.toLowerCase() + '" i]';
+		const dpInputs = dpContainer.querySelectorAll(match);
+		dpInputs.forEach(function(dpInput) {
+		    dpInput.removeAttribute("public-update");
+		    selection.values.forEach(function(value) {
+			if(value.toLowerCase() == dpInput.value.toLowerCase()) 
+			    set_ssvc(dpInput, ssvc);
+		    });
+		    reset_dp(dpInput);
+		});
+	    });
+	}
+    } else if(ssvc.data.version == "2.0.3") {
+	ssvc.data.options.forEach(function(option) {
+	    const name = Object.keys(option).pop().toLowerCase();
+	    const value = Object.values(option).pop();
+            const match = 'input[name*="' + name + '" i]';
+            const dpInputs = dpContainer.querySelectorAll(match);
+            dpInputs.forEach(function(dpInput) {
+		dpInput.removeAttribute("public-update");
+		try {
+		    dpInput.parentElement.parentElement.parentElement.childNodes[0].removeAttribute("title");
+		} catch(err) {
+		    console.log(err);
+		}		
+		if(Array.isArray(value)) {
+		    value.forEach(function(tvalue) {
+			if(tvalue.toLowerCase() == dpInput.value.toLowerCase()) 
+			    set_ssvc(dpInput, ssvc);
+		    });
+		} else {
+		    if(value.toLowerCase() == dpInput.value.toLowerCase())
+			set_ssvc(dpInput, ssvc);
+		}
+		reset_dp(dpInput);
+	    });
+	});
+    }
+}				 
+
+function cve_get(ev) {
+    const winput = ev.target;
+    const checkbox = winput.parentElement.parentElement.querySelector("input[name='use_public']");
+    if(checkbox && (!checkbox.checked))
+	return;
+    let api_url = "https://cveawg.mitre.org/api/cve/";
+    const vuid = winput.value.toUpperCase();
+    const ssvc = {};
+    if(vuid.match(/^CVE-(1999|2\d{3})-(?!0{4})(0\d{3}|[1-9]\d{3,})$/)) {
+	$.getJSON(api_url + vuid).done(function(cveJson) {
+	    if(!('containers' in cveJson))
+		return;
+	    winput.removeAttribute("data-ssvc");
+	    winput.setAttribute("data-cve", JSON.stringify(cveJson));
+	    /* Match either cna or adp in that order for first SSVC record */
+	    if(('cna' in cveJson.containers) &&
+	       ('metrics' in cveJson.containers['cna']) &&
+	       (cveJson.containers['cna'].metrics.length > 0)) {
+		let provider = "cna";
+		let cna = cveJson.containers['cna'];
+		if(cna.providerMetadata && cna.providerMetadata.shortName)
+                        provider = "cna:" + cna.providerMetadata.shortName;
+		if(cna.metrics.some(function(metric) {
+		    if(('other' in metric) && ('type' in metric.other) &&
+		       (metric.other.type.toLowerCase() == "ssvc")) {
+			ssvc['provider'] = provider;
+			ssvc['data'] = metric.other.content;
+			return true;
+		    }
+		})) {
+		    winput.setAttribute("data-ssvc",JSON.stringify(ssvc));
+		    process_ssvc(ssvc, winput);
+		    return true;
+		}
+	    }
+	    if('adp' in cveJson.containers) {
+		if(cveJson.containers.adp.some(function(adp) {
+		    let provider = "adp";
+		    if(adp.providerMetadata && adp.providerMetadata.shortName)
+			provider = "adp:" + adp.providerMetadata.shortName;
+		    if(('metrics' in adp) && (adp.metrics.length > 0)) {
+			return adp.metrics.some(function(metric) {
+			    if(('other' in metric) && ('type' in metric.other) &&
+			       (metric.other.type.toLowerCase() == "ssvc")) {
+				ssvc['provider'] = provider;
+				ssvc['data'] = metric.other.content;
+				return true;
+			    }
+			});
+		    }
+		})) {
+                    winput.setAttribute("data-ssvc",JSON.stringify(ssvc));
+                    process_ssvc(ssvc, winput);
+                    return true;
+		}
+	    }
+	});
+    } else {
+	console.log("Not a CVE Record "+vuid);
+    }
+    /* https://cveawg.mitre.org/api/cve/CVE-2025-6241 */
+}
 function parse_json(xraw,paused) {
     $('.bcomplex').remove();
     $('.graphy').not('#zoomcontrol').show();
     $('#ungraph').addClass('d-none');
+    $('#evaluate_section').html('');
     var zraw = [];
     isparent = {};
     var tm;
@@ -727,6 +1111,7 @@ function parse_json(xraw,paused) {
 	   schemas together*/
 	tm = tm.decision_tree;
     }
+    tm.current_tree = xraw;
     /* Clear also non grphic trees */
     $('#ughtr').html('');
     $('#ugbtr').html('');
@@ -749,6 +1134,7 @@ function parse_json(xraw,paused) {
     ischild = tm.decision_points.reduce(
 	(x,y) => {
 	    /* Use either key or label to create a hash of everyone */
+	    
 	    xkeys[y.label] = y;
 	    if("key" in y)
 		xkeys[y.key] = y.label
@@ -829,18 +1215,59 @@ function parse_json(xraw,paused) {
     var duniq_keys = {};
     /* unique keys for choices under decision points*/
     var ouniq_keys = {};
-    lcolors = {};    
-    tm.decision_points.map(x => {
+    lcolors = {};
+    let evaluate_div = $("<div>").css({display: "flex","justify-content":"center"});
+    tm.decision_points.map((x,index) => {
+	let h4 = $("<h4>").text(x.label)
+	    .css({"border-bottom": "2px solid aqua","font-size": "unset"})
+	    .attr({"data-dp":JSON.stringify(x),title: x.label});
+	const dpcol = $("<div>").append(h4);
+	dpcol.css({display: "inline-block", padding: "2px",border: "2px solid aqua"});
 	create_short_keys(x,duniq_keys);
-	var options_data = {}
-	var options_html = x.options.reduce((h,r) => {
+	var options_data = {};
+	const ocolors = arrayReduce(acolors, x.options.length);
+	const h5 = document.createElement("h5");
+	h5.innerText = x.label;
+	var options_html = x.options.reduce((h,r,i) => {
+	    const input = $("<input>").attr({type: "checkbox",
+					     checked: true,
+					     name: x.label,
+					     value: r.label,
+					     "data-dpvkey": r.key,
+					     "data-dpdepth": index,
+					     "data-dpvdepth": i});
+	    const label = $("<label>").css({padding: '0px 0px 0px 2px',
+							  margin: "0px"});
+	    const ldiv = $("<div>").css({"text-align": "left",
+					 "border": "1px solid steelblue",
+					 "width": "fit-content",
+					 "padding": "0px 8px 0px 8px",
+					 "border-radius": "3px",
+					 "margin-bottom": "3px"});
+	    if(index == tm.decision_points.length -1) {
+		lcolors[r.label] = ocolors[i];
+		/* When colors are present assume white for font*/
+		ldiv.css({"background": ocolors[i], color: "white"});
+		input.addClass("dt_outcome").css({display:"none"});
+	    } else {
+		/* Decision Point Input */
+		input.addClass("dp_input").click(check_select);
+	    }
+	    /* ADA compliant with id field*/
+	    label.append(input);
+	    label.append($("<span>").text(r.label));
+	    dpcol.append(ldiv.append(label));
 	    create_short_keys(r,ouniq_keys);
-	    options_data[r.label] = r.description;
+	    options_data[r.label] = r.definition;
 	    var rlabel = r.label[0].toLocaleUpperCase()+r.label.substr(1);
 	    var spclass = 'popup-'+safedivname(r.label);
-	    var div_add = "<div class='popupidiv "+spclass+"'><b>"+rlabel+"</b>&nbsp;"+r.description+"<hr /></div>";
-	    return  h + div_add;
-	},"<h5>"+x.label+"</h5>")
+	    var div_add = $('<div>').addClass('popupidiv '+ spclass)
+		.append($('<b>').css({color:ocolors[i]}).text(rlabel))
+		.append($('<span>').text(" " + r.definition))
+		.append($('<hr>'));
+	    return  h + div_add[0].outerHTML;
+	}, h5.outerHTML)
+	evaluate_div.append(dpcol);
 	var hdiv = safedivname(x.label)
 	if($("."+hdiv).length != 1) {
 	    //console.log(hdiv,"new");	    
@@ -889,39 +1316,91 @@ function parse_json(xraw,paused) {
 	//console.log(options_data);
 	$("."+hdiv).attr("data-options",JSON.stringify(options_data));	
     });
+    let cve_input = $("<input>").addClass("form-control vuid").attr({"placeholder":"CVE/Identifier"})
+    cve_input[0].addEventListener('blur', cve_get);
+    cve_input[0].addEventListener('keydown', function(ev) {
+	if (event.key === 'Enter') 
+	    cve_get(ev);
+    });
+    let cve_div = $("<label>").append(cve_input).css({padding: "0px 4px 0px 4px"});
+    let autoscore_div = $("<label>").addClass("custom-control custom-switch d-inline-block").append($("<input>").attr({"type": "checkbox","name":"use_public","class": "custom-control-input","checked": true})).append($("<span>").addClass("custom-control-label").text(" Use public CVE API data").css("padding-right","3px")) 
+    let check_allb = $("<button>").addClass("btn btn-danger").html("Check All").on("click",check_all);
+    let line_div = $("<div>").append(cve_div).append(autoscore_div).append(check_allb);
+    $('#evaluate_section').append($("<div>").css({border: "1px solid rgba(1,1,1,0.1)",
+						  padding: "1px"}).append(line_div).append(evaluate_div));
     $("."+lastdiv).addClass("Decision");
-    var classes = []
+    var classes = [];
+    const ocolors = arrayReduce(acolors, decisions[0].options.length);    
     var decision_div = decisions[0].options.reduce((h,r,ir) => {
 	var srlabel = safedivname(r.label);
 	classes.push(srlabel);
-	if(("color" in r) && (r.color)) {
-	    lcolors[r.label] = r.color;
-	} else if(acolors[ir]) {
-	    r.color = acolors[ir];
+	if(ocolors[ir]) {
+	    r.color = ocolors[ir];
 	} else {
 	    r.color = "#fefefe";
 	}
 	return h + $("<div>").append($("<strong/>").addClass("decisiontab").
 				     css({color:r.color}).html(r.label))
-	    .append("&nbsp"+r.description+"<hr>")
+	    .append("&nbsp"+r.definition+"<hr>")
 	    .addClass("popupidiv popup-"+srlabel)[0].outerHTML;
     },"<h5>"+final_keyword+"</h5>")
     if($("."+classes[0]).length != 1) {
 	$("."+classes[0]).remove()
 	$('body').append($('<div/>').addClass("d-none "+classes[0]))
     }
-    //console.log(classes)
-    //console.log(decision_div)
     $("."+classes[0]).addClass(classes.join(" ")).html(decision_div)
-    var currentRole = Object.keys(roll_tree_map)
-	.filter(x => roll_tree_map[x] == current_tree).shift()
-    if(currentRole)
-	select_add_option($('.exportRole'),currentRole);
     /* If a new tree is loaded and the user is in Simple mode
      just start simple mode decision */
     permalink();
     $('#dtreecsvload').hide();
 }
+function promptMultipleCVEs() {
+    Swal.fire({
+	title: 'Enter multiple CVEs',
+	input: 'textarea',
+	inputPlaceholder: 'CVE-2023-12345\nCVE-2024-67890\nCVE-2025-00001',
+	inputAttributes: {'aria-label': 'Type CVEs here' },
+	footer: '<label style="display:flex;align-items:center;gap:6px;"> ' +
+	    '<input type="checkbox" id="swal-use-public-cve" checked><span>Use public CVE API data</span></label>',
+	showCancelButton: true,
+	confirmButtonText: 'Add CVEs',
+	cancelButtonText: 'Cancel',
+	preConfirm: (value) => {
+	    let cves = value.split(/[\n,]+/).map(c => c.trim()).filter(Boolean);
+	    let useAPI = document.getElementById('swal-use-public-cve').checked;
+	    if (cves.length === 0) {
+		Swal.showValidationMessage('Please enter at least one CVE');
+		return false;
+	    }
+	    return { cves, useAPI };
+	}
+    }).then((result) => {
+	if (result.isConfirmed && result.value) {
+	    let cves = result.value.cves;
+	    let useAPI = result.value.useAPI;
+	    if(cves.length > 0) {
+		if(cves.length > 1) 
+		    $('#graph').hide();		
+		let container = $('#evaluate_section');
+		let currentDivs = container.children('div');
+		let currentCount = currentDivs.length;
+		if (currentCount > cves.length) {
+		    currentDivs.slice(cves.length).remove();
+		} else if (currentCount < cves.length) {
+		    let template = currentDivs.first();
+		    for (let i = currentCount; i < cves.length; i++) {
+			template.clone(true).appendTo(container);
+		    }
+		}
+		container.children('div').each(function (i) {
+		    $(this).find('input[name="use_public"]').attr("checked",useAPI);
+		    let cve_input = $(this).find('.vuid').val(cves[i]);
+		    cve_get({target: cve_input[0]});
+		});
+	    } 
+	}
+    });
+}
 function shwhelp(w) {
     var iconPos = w.getBoundingClientRect();
     var tm = $(w).data('tdiv');
@@ -959,7 +1438,7 @@ function create_export_schema_dtable(yi,x) {
 	/* Add labels that do not exist */
 	if(export_schema.decision_points[c]['options']
 	   .filter(d => ('label' in d) && (d.label == b)).length != 1)
-	    export_schema.decision_points[c]['options'].push({label: b, description:b})
+	    export_schema.decision_points[c]['options'].push({label: b, definition:b})
 	a[x[c]] = b
 	return a; },{}))
 }
@@ -1042,9 +1521,9 @@ function parse_file(xraw) {
 	detect_version = "v1"
     topalert("Decision tree has been updated with "+raw.length+" nodes, with "+
 	     y.length+" possible decisions using "+detect_version+" CSV/TSV file, You can use it now!","success")
-    dt_clear()
+    dt_clear();
     export_schema.decision_points[export_schema.decision_points.length-1].
-	options.map((x,i) => lcolors[x.label] = acolors[i] )
+	options.map((x,i) => lcolors[x.label] = ocolors[i] )
 }
 
 function add_invalid_feedback(xel,msg) {
@@ -1118,7 +1597,7 @@ function draw_graph() {
 	if(window.innerWidth <= 750)
 	    default_translate =  "translate(30,0) scale(0.42)"
     }
-    $('#zoomcontrol').show();
+    $('#zoomcontrol').removeClass('d-none').show();
     $('#zoomcontrol input').val(100);
     $('#graph').html($('<div>').attr({"id":"frbdiv"}).css({"position": "fixed","font-size": "x-small"})
 			.on("click",togglehelp).append($('<input>')
@@ -1183,22 +1662,20 @@ function update(source) {
 	.on("contextmenu",dorightclick)
 	.on("mouseover",showdiv)
 	.on("mouseout",hidediv);
-
     nodeEnter.append("circle")
 	.attr("r", 1e-6)
-	.attr("class",function(d) {
+	.attr("class",function(d, i) {
 	    if(!('children' in d))
-		return "junction gvisible finale";
+		return "junction gvisible finale ";
 	    return "junction gvisible"
 	})
-	.style("fill", function(d) {
+	.style("fill", function(d, i) {
 	    if(d._children) return "lightsteelblue"
 	    if(!('children' in d)) {
 		/* Last node no children */
 		var dname = d.name.split(":").shift();
 		if(dname in lcolors) 
 		    return undefined;
-
 	    }
 	    return undefined;
 	}  );
@@ -1334,6 +1811,12 @@ function update(source) {
 	}
     }
     setTimeout(update_links,1500);
+    var xMin = d3.min(nodes, function(d) { return d.x; });
+    var xMax = d3.max(nodes, function(d) { return d.x; });
+
+    var yOffset = 90;
+    var xOffset = -xMin + yOffset;
+    svg.attr("transform", "translate(" + 100 + "," + xOffset + ")");
 }
 function pathclick(w) {
     var sid = $(this).attr("csid")
@@ -1518,6 +2001,8 @@ function revert(d) {
     console.log(d);
 }
 function doclick(d) {
+    console.log(d);
+    return;
     if(showFullTree === false) {
 	hidediv();
 	if(('clickkill' in d) &&
@@ -1638,39 +2123,30 @@ function showme(divid,vul_flag) {
 
 function dt_start() {
     current_score = [];
-    showFullTree = false
+    showFullTree = true;
     $('svg.mgraph').remove();
     $('.exportActive .exportdiv').remove();
-    $('#exportopen').hide();
-    var xraw = JSON.parse(JSON.stringify(raw));
-    treeData=grapharray(xraw);
+    var xraw = simpleCopy(raw);
+    treeData=grapharray_open(xraw);
     draw_graph();
-    /* reset all Complex decision select boxes*/
-    $('.bcomplex select').each(function(_,x) { console.log(x.selectedIndex = 0)});    
-    setTimeout(function() {
-	$('circle.junction').parent().simClick()
-	/* Disable click on the first node */
-	treeData[0].clickkill = true
-    }, 900)
 }
 function dt_clear() {
-    showFullTree = false;
+    showFullTree = true;
     current_score = [];
     raw.map(x => {  x.children=[]; delete x._children;});
     /* Clear all graph to start */
     $('#zoomcontrol').hide();
     $('svg.mgraph').remove();
     $('#graph').html('');
-    $('#exportopen').hide();
 }
 
 function show_full_tree() {
-    showFullTree = true
-    $('.exportActive .exportdiv').remove()
-    $('svg.mgraph').remove()
-    var xraw = JSON.parse(JSON.stringify(raw))
-    treeData=grapharray_open(xraw)
-    draw_graph()
+    showFullTree = true;
+    $('.exportActive .exportdiv').remove();
+    $('svg.mgraph').remove();
+    var xraw = simpleCopy(raw);
+    treeData=grapharray_open(xraw);
+    draw_graph();
 }
 
 
@@ -1718,6 +2194,48 @@ function createHeaders(keys) {
     }
     return result;
 }
+function set_deep(obj,prop,val) {
+    /* For the Object obj set the property of a prop to val
+       recursively. example set_deep({a:{b:{c:{"good"}}}},"a-b-c","bad")
+       will return {a:{b:{c:{"bad"}}}} */
+    if(typeof(obj) != "object")
+	return undefined;
+    let fobj = simpleCopy(obj);
+    var x = fobj;
+    let props = prop.split("-");
+    let fprop = props.pop();
+    for(var i=0; i<props.length; i++) {
+	if(props[i] in x) {
+	    x = x[props[i]];
+	    continue;
+	} else {
+	    if(i+1 < props.length) {
+		if (props[i+1].match(/^\d+$/))
+		    x[props[i]] = [];
+		else
+		    x[props[i]] = {};
+	    } else if (fprop.match(/^\d+$/))  {
+		/* Last element and is an array */
+		x[props[i]] = [];
+	    } else {
+		x[props[i]] = {};
+	    }
+	    x = x[props[i]];
+	}
+    }
+    /* If the value is being set to be undefined then delete this property
+       of this object */
+    if(val === undefined) {
+	if (fprop.match(/^\d+$/)) {
+	    x.splice(parseInt(fprop),1);
+	} else {
+	    delete x[fprop];
+	}
+    } else {
+	x[fprop] = val;
+    }
+    return fobj;
+}
 function deepsearch(obj,dir) {
     var xobj = obj
     var path = dir.split(".")
@@ -1729,18 +2247,25 @@ function deepsearch(obj,dir) {
     }
     return xobj
 }
-
+function fake_pdf() {
+    $('body').append($('<div>').addClass('exportActive'))
+    $('.exportActive').append($('<input>').addClass('exportRole').val('developer'))
+    $('.exportActive').append($('<input>').addClass('exportId').val('developer'))
+    $('.exportActive').append($('<input>').attr({id:'contact',value:'developer'}))
+    $('.exportActive').append($('<div>').addClass('ssvcvector').html('developer'))
+    $('.exportActive').append($('<input>').addClass('includetree').attr({type: 'checkbox','checked':1}))
+}
 function export_pdf() {
     $('.Exporter').css({'pointer-events':'none'})
-    var vul = $('.exportActive .exportId').val().toUpperCase();
+    var vul = $('#evaluate_section .vuid').val().toUpperCase();
     if((vul == "") || (vul.indexOf("CVE") < 0)) {
 	createPDF(vul,"No further information available");
 	console.log("No vul information such as CVE");
 	return;
     }
-    var cve_json_url = "https://olbat.github.io/nvdcve/";
-    $.getJSON(cve_json_url+vul+".json").done(function(d) {
-	var f = deepsearch(d,"cve.description.description_data.0.value");
+    var cve_json_url = "https://cveawg.mitre.org/api/cve/"
+    $.getJSON(cve_json_url+vul.toUpperCase()).done(function(d) {
+	var f = deepsearch(d,"containers.cna.descriptions.0.value");
 	if((!f) || (f == ""))
 	    f = "No further information available"
 	createPDF(vul,f);
@@ -1754,13 +2279,15 @@ function export_pdf() {
 }
 function createPDF(vulnerability,cveinfo) {
     //    Requirements for new updates for the ssvc-calc tool.
-    var role = $('.exportActive .exportRole').val() || "Unknown";
-    var vulid = $('.exportActive .exportId').val() || "Unspecified";
-    var includetree = $('.exportActive .includetree').is(':checked');        
+    var role = "Evaluator";
+    var vulid = vulnerability;
+    var includetree = true;
     const { jsPDF } = window.jspdf;
     const doc = new jsPDF({putOnlyUsedFonts:true});
-    var coord = $('.cover_heading_append').html().replace(/^\s+(.+)\s+/g,'$1')
-    var vulnerability = $('.exportActive .exportId').val();
+    let coord = "";
+    if(export_schema.current_tree && export_schema.current_tree.definition) {
+	coord = export_schema.current_tree.definition;
+    }    
     if(vulnerability == "")
 	vulnerability = "ID-Pending"
     var title = "SSVC score for "+vulnerability+" "+coord
@@ -1842,7 +2369,7 @@ function createPDF(vulnerability,cveinfo) {
     xOffset = 12;
     doc.text("Summary",xOffset,yOffset+13);
     doc.setFontSize(12);
-    var vector_string = $('.exportActive .ssvcvector').html()
+    var vector_string = "SSVC v2"
 
     doc.setFont("helvetica","normal");
     doc.text("Recommendation:",xOffset,yOffset+20);    
@@ -1854,7 +2381,7 @@ function createPDF(vulnerability,cveinfo) {
     doc.setFont("courier",'italic');
     var ycve = vulnerability.toUpperCase()
     if(ycve.indexOf("CVE") == 0) {
-	var link = 'https://nvd.nist.gov/vuln/detail/'+ycve
+	var link = 'https://www.cve.org/CVERecord?id=' + ycve
 	doc.setTextColor(0,0,255);
 	doc.textWithLink(vulnerability, xOffset+40, yOffset+40, {url: link});
 	doc.setLineWidth(0.5);
@@ -1978,7 +2505,7 @@ function createPDF(vulnerability,cveinfo) {
     doc.setFont("helvetica",'bold');
     doc.text("Contact:",xOffset,ynow);
     doc.setFont("courier",'normal');
-    doc.text($('#contact').val(),xOffset+20,ynow);
+    doc.text("SSVC Contact",xOffset+20,ynow);
     var safetime = ts.toGMTString().replace(/[^a-z0-9]+/ig,'-');
     var fulltree = includetree ? "-with-full-tree" : ""
     var dfilename = "SSVC-"+role+"-"+vulid+"-"+safetime+fulltree+".pdf";
@@ -2166,8 +2693,12 @@ function appendtree(doc,dfilename) {
     doc.setFontSize(16);
     doc.setFont("helvetica",'bold');
     doc.setTextColor(0);
-    var coord = $('.cover_heading_append').html().replace(/^\s+(.+)\s+/g,'$1')
-    doc.text("Full SSVC Tree "+coord,10,10);
+    let coord = "";
+    if(export_schema.current_tree && export_schema.current_tree.definition) {
+	coord = export_schema.current_tree.definition;
+    }
+    doc.text("Full SSVC Tree " + coord,10,10);
+    
     /* top left corner */
     var tlc = 180;
     var gap = 8;
@@ -2181,17 +2712,17 @@ function appendtree(doc,dfilename) {
 	var drawColor = "#4682b4";
 	/* Gloabl values to sigmoid_connect can also use it*/
 	var m = ax.decisions_table[index][final_keyword];
-	doc.setFontSize(14)
+	doc.setFontSize(10)
 	doc.setFont("courier",'bold');
 	doc.setTextColor(0);
 	if(m in lcolors) {
 	    doc.setTextColor(lcolors[m]);
 	    fillColor = lcolors[m];
-	    // silver lining?
 	    drawColor = "#505050";
 	}
+	/* This text is outcome in plain english like Defer, Scheduled etc.*/
 	doc.text(m,tlc+5, yc)
-	if(index%3 == 1) {
+	if(index%3 == 1 && mdecision_points.length >= 2) {
 	    doc.setFont("helvetica",'bold');
 	    doc.setTextColor(0)
 	    doc.setFontSize(12)
@@ -2204,7 +2735,7 @@ function appendtree(doc,dfilename) {
 	    doc.text(ax.decisions_table[0][m],tlc-10,yc-7,12)
 	    doc.text(ax.decisions_table[2][m],tlc-10,yc+5,-12)
 	}
-	if(index%6 == 3) {
+	if(index%6 == 3 && mdecision_points.length >= 3) {
 	    doc.setTextColor(0)
 	    /* (r,flen,xstart,yc) */
 	    doc.setFont("helvetica",'bold');
@@ -2219,7 +2750,7 @@ function appendtree(doc,dfilename) {
 	    doc.text(ax.decisions_table[3][m],tlc-60,yc+10,-20)
 	}
 
-	if(index%12 == 6) {
+	if(index%12 == 6 && mdecision_points.length >= 4) {
 	    doc.setTextColor(0)
 	    doc.setFont("helvetica",'bold');
 	    /* (r,flen,xstart,yc) */
@@ -2234,7 +2765,7 @@ function appendtree(doc,dfilename) {
 	    doc.text(ax.decisions_table[6][m],tlc-103,yc+5,-45)
 	}
 
-	if(index%36 == 18) {
+	if(index%36 == 18 && mdecision_points.length >= 5) {
 	    doc.setTextColor(0)
 	    /* (r,flen,xstart,yc) */
 	    doc.setFont("helvetica",'bold');
@@ -2251,7 +2782,7 @@ function appendtree(doc,dfilename) {
 	doc.setLineWidth(0.6);
 	doc.setDrawColor(drawColor);
 	doc.setFillColor(fillColor);
-	circles.push([tlc,yc,3,"FD",drawColor,fillColor])
+	circles.push([tlc,yc,2,"FD",drawColor,fillColor])
 	//doc.circle(tlc,yc,3,"FD");
     }
     //doc.circle(circles[0][0],circles[0][1],circles[0][2],circles[0][3])
@@ -2323,7 +2854,7 @@ function appendtree(doc,dfilename) {
 	    var clabel = y.label[0].toUpperCase()+y.label.substr(1);
 	    doc.text(clabel,20,ynow);
 	    doc.setTextColor(0,0,0);
-	    var tinfo = y.description;
+	    var tinfo = y.definition;
 	    var f = tinfo.match(/.{1,45}(\s|$)/g);
 	    doc.setFont("courier",'normal');
 	    q = doc.getStringUnitWidth(clabel)
@@ -2434,14 +2965,9 @@ function copym(containerid,ispurl) {
 }
 
 function svgzoom(w) {
-    var zf = w.value/w.max;
-    if(zf > 0.95) {
-	var vbox = $('svg.mgraph').attr('viewBox');
-	console.log("The viewbox should be left as-is "+vbox);
-	return;
-    }
-    var fh = parseInt($('svg.mgraph').attr("height"));
-    var fw = parseInt($('svg.mgraph').attr("width"));
-    var vbox = "0 0 "+String(parseInt(fw/zf)) + " " + String(parseInt(fh/zf))
+    const zf = w.value/w.max;
+    const fh = parseInt($('svg.mgraph').attr("height"));
+    const fw = parseInt($('svg.mgraph').attr("width"));
+    const vbox = "0 0 "+String(parseInt(fw/zf)) + " " + String(parseInt(fh/zf))
     $('svg.mgraph').attr('viewBox',vbox);
 }
diff --git a/docs/ssvc-calc/ssvc_object_registry.json b/docs/ssvc-calc/ssvc_object_registry.json
new file mode 120000
index 00000000..5d447289
--- /dev/null
+++ b/docs/ssvc-calc/ssvc_object_registry.json
@@ -0,0 +1 @@
+../../data/json/ssvc_object_registry.json
\ No newline at end of file
diff --git a/docs/ssvc-explorer/findex.html b/docs/ssvc-explorer/findex.html
new file mode 100644
index 00000000..aaab2090
--- /dev/null
+++ b/docs/ssvc-explorer/findex.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>SSVC Policy Explorer</title>
+    <script src="https://code.jquery.com/jquery-3.5.1.min.js"
+	    integrity="sha384-ZvpUoO/+PpLXR1lu4jmpXWu80pZlYUAfxl5NsBMWOEPSjUn/6Z/hRTt8+pR6L4N2"
+	    crossorigin="anonymous">
+    </script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3.min.js"
+	    integrity="sha384-N8EP0Yml0jN7e0DcXlZ6rt+iqKU9Ck6f1ZQ+j2puxatnBq4k9E8Q6vqBcY34LNbn"
+	    crossorigin="anonymous"></script>
+    <script src="simple.js?v=2025081910"></script>
+  </head>
+  <body>
+    <div>
+      <div>
+	<form autocomplete="off">
+	  <span style="font-size: 20px;font-weight: bold; vertical-align:top">Sample Decision Models:</span>
+	  <input type="file" name="fileupload" style="display:none" onchange="readFile(this)">
+	  <select onchange="loadSSVC(this.options[this.selectedIndex].value)" id="sampletrees"
+		  style="font-size: 18px;background: white;border-radius: 13px;padding: 0px 4px 0px 4px;font-weight: bolder;" autocomplete="off">
+	  </select>
+	  <span> </span>
+	  <div style="vertical-align:top; display:inline-block">
+	    <button type="button" data-customize="1"
+		    style="display: inline-block; background-color: #007bff; padding: 2px; color: white; border-radius: 4px;"
+		    onclick="customize(this)">Customize</button>
+	    &nbsp;
+	    <button style="background-color: #dc3545; color: white;" type="button"
+		    data-clear=""> CLEAR </button>
+	    &nbsp;
+	    <button type="button" data-toggleall="1"
+		    style="display: inline-block; background-color: #007bff; padding: 2px; color: white; border-radius: 4px;"
+		    onclick="toggleAll()">Toggle All</button>
+	  </div>
+	  <div style="padding: 8px 0px 0px 0px;position: relative; display:none" data-session="1">
+	    SSVC Custom Trees
+	    <select name="customdp" style="font-size: 18px;background: white;border-radius: 8px;padding: 0px 4px 0px 4px;" onchange="fun_execute(this)">
+	      <option>Manage </option>
+	      <option value="restore_session">Restore Session</option>
+	      <option value="delete_session">Delete Old Sessions</option>
+	      <option value="delete_dtree">Delete Current Tree</option>
+	      <option value="rename_dtree">Rename Current Tree</option>
+	      <option value="download_ssvc_json">Download (JSON)</option>
+	      <option value="download_ssvc_csv">Download (CSV)</option>
+	    </select>
+	    <a style="display:none" data-download-json="1">Download (JSON)</a>
+	    <a style="display:none" data-download-csv="1">Download (CSV)</a>
+	  </div>
+	  
+	</form>
+	<p>
+	  <form id="ssvcForm" autocomplete="off">
+	  </form>
+	</p>
+      </div>
+      <div id="ssvcPopup" style="position: absolute; display:none;top: 50%; left: 50%;transform: translate(-50%, -50%); background-color: #fff; border: 4px solid #ccc; padding: 10px; border-radius: 6px; width: auto; max-height: 80%;overflow-y: auto;">
+	<div data-customdp="1">
+	  <h4 style="text-align: center">Customize Decision Point</h4>
+	  <form onSubmit="return false();" style="text-align:left" autocomplete="off">
+	    <div style="padding-bottom:10px">
+	      <select name="customdp" style="background: transparent; border-radius: 6px; padding: 0px 4px 0px 4px;font-weight: bolder;">
+		<option value="">Choose/Create Decision Point</option>
+	      </select>
+	    </div>
+	    <div style="display: table-row">
+	      <label style="display:table-cell">Name</label>
+	      <input required type="text" style="min-width: 300px;display:table-cell" name="obj-name" placeholder="Name (Exploitation)">
+	    </div>
+	    <div  style="display:table-row">
+	      <label style="display:table-cell">Namespace</label>
+	      <input required type="text" style="min-width: 300px;display:table-cell" name="obj-namespace" placeholder="Namespace (x_com.example#psirt)">
+	      <br>
+	      <label style="display:none">
+		<input type="checkbox" name="translate-only" unchecked>
+		(Translation only)
+	      </label>
+	      <label style="display:none">
+		<select name="lang" disabled> 
+		  <option value="ar-SA">Arabic (Saudi Arabia)(ar-SA)</option><option value="bn-BD">Bangla (Bangladesh)(bn-BD)</option><option value="bn-IN">Bangla (India)(bn-IN)</option><option value="cs-CZ">Czech (Czech Republic)(cs-CZ)</option><option value="da-DK">Danish (Denmark)(da-DK)</option><option value="de-AT">Austrian German(de-AT)</option><option value="de-CH">"Swiss" German(de-CH)</option><option value="de-DE">Standard German (Germany)(de-DE)</option><option value="el-GR">Modern Greek(el-GR)</option><option value="en-AU">Australian English(en-AU)</option><option value="en-CA">Canadian English(en-CA)</option><option value="en-GB">British English(en-GB)</option><option value="en-IE">Irish English(en-IE)</option><option value="en-IN">Indian English(en-IN)</option><option value="en-NZ">New Zealand English(en-NZ)</option><option value="en-US">US English(en-US)</option><option value="en-ZA">English (South Africa)(en-ZA)</option><option value="es-AR">Argentine Spanish(es-AR)</option><option value="es-CL">Chilean Spanish(es-CL)</option><option value="es-CO">Colombian Spanish(es-CO)</option><option value="es-ES">Castilian Spanish (es-ES)</option><option value="es-MX">Mexican Spanish(es-MX)</option><option value="es-US">American Spanish(es-US)</option><option value="fi-FI">Finnish (Finland)(fi-FI)</option><option value="fr-BE">Belgian French(fr-BE)</option><option value="fr-CA">Canadian French(fr-CA)</option><option value="fr-CH">"Swiss" French(fr-CH)</option><option value="fr-FR">Standard French(fr-FR)</option><option value="he-IL">Hebrew (Israel)(he-IL)</option><option value="hi-IN">Hindi (India)(hi-IN)</option><option value="hu-HU">Hungarian (Hungary)(hu-HU)</option><option value="id-ID">Indonesian (Indonesia)(id-ID)</option><option value="it-CH">"Swiss" Italian(it-CH)</option><option value="it-IT">Standard Italian (Italy)(it-IT)</option><option value="ja-JP">Japanese (Japan)(ja-JP)</option><option value="ko-KR">Korean (Republic of Korea)(ko-KR)</option><option value="nl-BE">Belgian Dutch(nl-BE)</option><option value="nl-NL">Standard Dutch (The Netherlands)(nl-NL)</option><option value="no-NO">Norwegian (Norway)(no-NO)</option><option value="pl-PL">Polish (Poland)(pl-PL)</option><option value="pt-BR">Brazilian Portuguese(pt-BR)</option><option value="pt-PT">European Portuguese (Portugal)(pt-PT)</option><option value="ro-RO">Romanian (Romania)(ro-RO)</option><option value="ru-RU">Russian (Russian Federation)(ru-RU)</option><option value="sk-SK">Slovak (Slovakia)(sk-SK)</option><option value="sv-SE">Swedish (Sweden)(sv-SE)</option><option value="ta-IN">Indian Tamil(ta-IN)</option><option value="ta-LK">Sri Lankan Tamil(ta-LK)</option><option value="th-TH">Thai (Thailand)(th-TH)</option><option value="tr-TR">Turkish (Turkey)(tr-TR)</option><option value="zh-CN">Mainland China simplified characters(zh-CN)</option><option value="zh-HK">Hong Kong traditional characters(zh-HK)</option><option value="zh-TW">Taiwan traditional characters(zh-TW)</option>
+		</select>
+		Language 
+		    
+	      </label>
+	    </div>
+	    <div  style="display: table-row">
+	      <label for="dpVersion" style="display:table-cell">Version</label>
+	      <input required type="text" style="min-width: 300px;display:table-cell" name="obj-version" placeholder="Version (1.0.0)">
+	    </div>
+	    <div style="display: table-row">
+	      <label style="display:table-cell">Definition</label>
+	      <textarea required style="display:table-cell; min-height: 30px; min-width: 300px;" name="obj-definition" placeholder="Definition" onchange="textAreaAutoSize(this)"></textarea>
+	    </div>
+	    <div style="display: table-row">
+	      <label style="display: table-cell">Decision Point Values</label>
+	      <button type="button" style="display:table-cell" onclick="dpValueClone(this)">(+) Add</button>
+	    </div>
+	    <div style="display: table-row" data-clone="1">
+	      <label style="border-left: 1px solid cyan; display: table-cell"> &nbsp; Value</label>
+	      <input required type="text" name="obj-values-0-name" style="min-width: 300px;display: table-cell">
+	    </div>
+	    <div style="display: table-row" data-clone="1">
+	      <label style="border-left: 1px solid cyan; display: table-cell;"> &nbsp; Definition</label>
+	      <textarea required name="obj-values-0-definition" style="display: table-cell; min-height: 30px; min-width: 300px;" onchange="textAreaAutoSize(this)"></textarea>
+	    </div>
+	    <div style="display: table-row" data-clone="1">
+	      <label style="border-left: 1px solid cyan; display: table-cell"> &nbsp; Value</label>
+	      <input required type="text" name="obj-values-1-name" style="min-width: 300px;display: table-cell">
+	    </div>
+	    <div style="display: table-row" data-clone="1">
+	      <label style="border-left: 1px solid cyan; display: table-cell;"> &nbsp; Definition</label>
+	      <textarea required name="obj-values-1-definition" style="display: table-cell;min-height: 30px; min-width: 300px;" onchange="textAreaAutoSize(this)"></textarea>
+	    </div>
+	  </form>
+	  <button onclick="updateTree()" data-update="1" style="margin-top: 10px;padding: 8px 12px;border: none;background-color: #007bff;color: #fff;border-radius: 4px;cursor: pointer; float:right">Update</button>
+	  <button onclick="popupEnd()" style="margin: 10px 10px 0px 0px;;padding: 8px 12px;border: none;background-color: #ff2121;color: #fff;border-radius: 4px;cursor: pointer; float:right">Cancel</button>
+	</div>
+	<div data-yesno="1" style="display:none">
+	  <h4 style="text-align: center">Would you like to proceed?</h4>
+	  <button style="margin-top: 10px;padding: 8px 12px;border: none;background-color: #007bff;color: #fff;border-radius: 4px;cursor: pointer; float:right">Yes</button>
+	  <button style="margin: 10px 10px 0px 0px;;padding: 8px 12px;border: none;background-color: #ff2121;color: #fff;border-radius: 4px;cursor: pointer; float:right">No</button>	  
+	</div>
+	
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/docs/ssvc-explorer/index.md b/docs/ssvc-explorer/index.md
new file mode 100644
index 00000000..c9e4bdfc
--- /dev/null
+++ b/docs/ssvc-explorer/index.md
@@ -0,0 +1,22 @@
+---
+hide:
+  - navigation
+  - title
+---
+
+# SSVC Policy Explorer
+
+<style>
+.sembed {
+  min-width: 1200px;
+  min-height: 1100px;
+  z-index: 1;
+  position: relative;
+}
+</style>
+
+<iframe src="findex.html" class="sembed" style="border: 0px"></iframe>
+
+<script>
+  console.log("Loaded");
+</script>
diff --git a/docs/ssvc-explorer/simple.js b/docs/ssvc-explorer/simple.js
new file mode 100644
index 00000000..008e1adf
--- /dev/null
+++ b/docs/ssvc-explorer/simple.js
@@ -0,0 +1,2536 @@
+const __version__ = "1.0.10";
+const SSVC = {
+    "outcomes": [],
+    "results": {},
+    "decision_points": [],
+    "decision_trees" : [],
+    "form": null,
+    "dpMap":{},
+    "default_namespace": "x_com.example#psirt",
+    "namespaces": [],
+    "__version__": __version__
+};
+function niceString(str) {
+    if (str.length)
+	return str.charAt(0).toUpperCase() + str.slice(1);
+    return "";
+}
+function add_dash_n(str, strSet) {
+    if(!(str in strSet))
+	return str;
+    const regex = /(-\d+)$/;
+    const match = str.match(regex);
+    let newNumber = -1;
+    let nstr = str + newNumber.toString();
+    if (match) {
+	const numberPart = parseInt(match[1], 10); 
+	newNumber = numberPart - 1;
+	nstr = str.replace(regex, newNumber.toString());
+    } 
+    while(nstr in strSet) {
+	newNumber = newNumber - 1;
+	nstr = str.replace(regex, newNumber.toString());
+    }
+    return nstr;
+}
+function name_version(obj) {
+    if(obj.name && obj.version)
+	return obj.name + " (" + obj.version + ")";
+    else if (obj.name)
+	return obj.name + " (0.0.1)";
+    else
+	return "";
+}
+function dtreeSort(a, b) {
+    const nameA = a.data.namespace.toUpperCase() + a.data.name.toUpperCase()
+	  + a.data.version.toUpperCase();
+    const nameB = b.data.namespace.toUpperCase() + b.data.name.toUpperCase()
+	  + b.data.version.toUpperCase();
+    if (nameA < nameB) 
+	return -1;
+    if (nameA > nameB)
+	return 1;
+    return 0;
+}
+function simpleCopy(inobj) {
+    return JSON.parse(JSON.stringify(inobj));
+}
+window.addEventListener("beforeunload", function(e) {
+    if(sessionStorage.getItem("ssvc-pending")) {
+	var confirmationMessage = 'Are you sure to leave the page?';
+	const event = (e || window.event);
+	event.preventDefault();
+	event.returnValue = confirmationMessage;
+	return confirmationMessage;
+    }
+    return null;
+});
+function applyStyle(div, props) {
+    Object.entries(props).forEach(function(k,_) {
+	div.style[k[0]] = k[1];
+    });
+}
+function topalert(msg, level, timeOut) {
+    const colors = {
+        "danger": "#dc3545",
+        "info": "#0d6efd",
+        "warn": "#ffc107",
+        "success": "#198754"
+    };
+
+    let div = document.querySelector("[data-topalert]");
+    if (!div) {
+        div = document.createElement("div");
+        div.setAttribute("data-topalert", "1");
+        const props = {
+            width: "100%",
+            top: "0px",
+            left: "0px",
+            "text-align": "center",
+            color: "white",
+            border: "2px solid transparent",
+            "border-radius": "4px",
+            padding: "12px",
+            opacity: 0,
+            "font-size": "1.2em",
+            "transition": "opacity 0.5s ease",
+            "z-index": "9999",
+            "background-color": "transparent",
+            position: "relative"   
+        };
+        applyStyle(div, props);
+        document.body.prepend(div);
+    }
+
+    if (!msg) {
+        div.style.opacity = 0;
+        div.style.backgroundColor = "transparent";
+        div.innerHTML = "";
+        return;
+    }
+
+    div.innerHTML = ""; 
+    div.innerText = msg + " ";
+
+    const span = document.createElement("span");
+    span.innerHTML = "&#x2715;";
+    applyStyle(span, {
+        cursor: "pointer",
+        color: "white",
+        padding: "2px 6px",
+        border: "1px solid white",
+        "border-radius": "2px",
+        margin: "3px"
+    });
+    div.appendChild(span);
+
+    div.onclick = () => div.remove();
+
+    div.style.backgroundColor = colors[level] || colors["info"];
+    div.style.display = "block";
+    div.style.opacity = 0.95;
+
+    if (timeOut) {
+        if (div._timer) clearTimeout(div._timer);
+        div._timer = setTimeout(() => {
+            div.style.opacity = 0;
+            setTimeout(() => div.remove(), 600); 
+        }, timeOut * 1000); 
+    }
+}
+
+
+function compareObj(o1,o2) {
+    const keys = Object.keys(o1);
+    if(keys.length != Object.keys(o2).length)
+	return false;
+    for(let i=0; i < keys.length; i++) {
+	const key = keys[i];
+	if(o1[key] != o2[key]) {
+	    return false;
+	}
+    }
+    return true;
+}
+function h5button(text, current, type) {
+    const h5 = document.createElement("h5");
+    h5.innerText = text;
+    h5.style.display = "inline-block";
+    if(current)
+	h5.style.backgroundColor = "#007bff";
+    else
+	h5.style.backgroundColor = "#555555";	      
+    h5.style.padding = "2px";
+    h5.style.color = "white";
+    h5.style.borderRadius = "4px";
+    h5.setAttribute("data-tabs", type);
+    h5.addEventListener("click", function() {
+	const btn = this;
+	const current = btn.getAttribute("data-tabs");
+	btn.parentElement.querySelectorAll("[data-tabs]").forEach(function(el) {
+	    el.style.backgroundColor = "#555555";
+	});
+	btn.style.backgroundColor = "#007bff";
+	btn.parentElement.querySelectorAll("[data-tab]").forEach(function(el) {
+	    if(el.getAttribute("data-tab") == current)
+		el.style.display = "block";
+	    else
+		el.style.display = "none";
+	});
+    });
+    return h5;
+}
+function lock_unlock(lock) {
+    const select = SSVC.form.parentElement.querySelector("[id='sampletrees']");
+    const btnAll = SSVC.form.parentElement.querySelector("[data-toggleall]");
+    if(lock) {
+	const nextel = select.nextElementSibling;
+	/* Add custom data entry points */
+	select.style.display = "none";
+	select.parentElement.children[0].innerText = "Custom Decision Model";
+	if(nextel.tagName.toUpperCase() == "DIV") {
+	    const inp = nextel.querySelector("input[name='namespace'");
+	    if(inp)
+		inp.value = "";
+	} else {
+	    const div = document.createElement("div");
+	    const clbtn = SSVC.form.parentElement.querySelector("[data-clear]");
+	    let dt;
+	    if(clbtn.hasAttribute("data-json")) {
+		dt = JSON.parse(clbtn.getAttribute("data-json"));
+	    } else {
+		dt = {namespace: SSVC.default_namespace,
+		      name: "Custom Decision Tree",
+		      definition: "Uploaded Custom Decistion Tree from CSV",
+		      version: "1.0.1"};
+	    }
+	    div.style.display = "inline-block";
+	    applyStyle(div, {border: "1px dotted darkblue",
+			     display: "inline-block",
+			     borderRadius: "2px",
+			     padding: "4px"
+			    });
+	    ["name","namespace","definition","version"].forEach(function(nprop) {
+		const label = document.createElement("label");
+		const input = document.createElement("input");
+		input.name = nprop;
+		const nproper = niceString(nprop);
+		input.placeholder = "Decision Tree " + nproper;
+		input.value = dt[nprop];
+		applyStyle(input, {background: "transparent",
+				   padding: "0px 2px",
+				   display: "inline",
+				   fontWeight: "bolder",
+				   border: "1px solid #198754"});
+		applyStyle(label, {display: "block",
+				   textAlign: "right",
+				   fontWeight: "bolder"});
+		label.innerText = nproper + ": ";
+		label.append(input);
+		div.append(label);
+		
+	    });
+	    select.after(div);
+	}
+	select.setAttribute("disabled", true);
+	btnAll.setAttribute("disabled", true);
+	btnAll.style.opacity = 0.5;
+	sessionStorage.setItem("ssvc-pending",1);
+    }else {
+	select.parentElement.children[0].innerText = "Sample Decision Models::";
+	
+	if(select.nextElementSibling.nodeName.toUpperCase() == "DIV") {
+	    select.nextElementSibling.remove();
+	}
+	select.style.display = "inline-block";
+	select.removeAttribute("disabled");
+	btnAll.removeAttribute("disabled");
+	btnAll.style.opacity = 1.0;
+	sessionStorage.removeItem("ssvc-pending");	
+    }
+    
+}
+function clear() {
+    const sampletrees = SSVC.form.parentElement.querySelector("[id='sampletrees']");
+    const nextel = sampletrees.nextElementSibling;
+    if(nextel.tagName.toUpperCase() == "DIV")
+	nextel.remove();
+    sessionStorage.removeItem("ssvc-pending");
+    sampletrees.style.display = "inline-block";
+    sampletrees.disabled = false;
+    sampletrees.dispatchEvent(new Event('change'));
+    const cbtn = SSVC.form.parentElement.querySelector("[data-customize='1']");
+    cbtn.innerHTML = "Customize";
+    const btnAll = SSVC.form.parentElement.querySelector("[data-toggleall]");
+    btnAll.disabled = false;
+    btnAll.style.opacity = 1.0;
+}
+function toNumberTable(table, headers) {
+    const encoders = {};
+    const numberTable =  table.map(function(row) {
+	return headers.reduce(function(r,head) {
+	    const col = row[head];
+	    if(head in encoders) {
+		if (!(col in encoders[head])) {
+		    const max = Math.max.apply(this,Object.values(encoders[head]));
+		    encoders[head][col] = max + 1;
+		}
+	    } else {
+		encoders[head] = {};
+		encoders[head][col] = 0;
+	    }
+	    r.push(encoders[head][row[head]]);
+	    return r;
+	}, []);
+    });
+    return numberTable;
+}
+function csvline(cols) {
+    cols = cols.map(x => x.replace('"','\\"'))
+    return '"' + cols.join('","') + '"\n';
+}
+function get_decision_point(name, version, namespace) {
+    /* version 1.0.0 name mapping in CSV files */
+    if(name in SSVC.dpMap && !version) {
+	version = SSVC.dpMap[name]["version"]
+	namespace = SSVC.dpMap[name]["namespace"];
+	/* Check if name is remapped in CSVs*/	
+	if("name" in SSVC.dpMap[name]) 
+	    name = SSVC.dpMap[name]["name"];
+    }
+    if(!version)
+	version = "1.0.0";
+    if(!namespace)
+	namespace = "ssvc";
+    for(let i = 0; i < SSVC.decision_points.length; i++) {
+	if(SSVC.decision_points[i].data.name == name &&
+	   SSVC.decision_points[i].data.namespace == namespace &&
+	   SSVC.decision_points[i].data.version == version) {
+	    return SSVC.decision_points[i].data;
+	}
+    }
+    return {};
+}
+function update_stats() {
+    SSVC.results = {};
+    SSVC.form.querySelectorAll("[data-outcome]").forEach(function(el) {
+	let outcome;
+	if(el.querySelector("input"))
+	    outcome = el.querySelector("input").value	
+	else
+	    outcome = el.innerText;
+	if(outcome in SSVC.results )  {
+	    if(el.parentElement.style.display != "none")
+		SSVC.results[outcome] += 1;
+
+	} else {
+	    if(el.parentElement.style.display != "none")
+		SSVC.results[outcome] = 1;
+	    else
+		SSVC.results[outcome] = 0;
+	}
+    });
+    let outcomeMax = Math.max.apply(this, Object.values(SSVC.results));
+    Object.keys(SSVC.results).forEach( function(outcome) {
+	outcome = outcome.replaceAll('"','\\"');	    
+	let rlabel = SSVC.form.querySelector('[data-result="'+outcome+'"] > label > span');
+	rlabel.innerText = " (" + String(SSVC.results[outcome]) + ")";
+	let dbar = document.createElement("span");
+	dbar.innerHTML = "&nbsp;";
+	dbar.style.marginLeft = "6px";
+	dbar.style.display = "inline-block";
+	dbar.style.width = String(parseInt(70 * SSVC.results[outcome]/outcomeMax)) + "px";
+	dbar.style.backgroundColor = "#5480de";
+	/* dbar.style.position = "fixed"; */
+	rlabel.appendChild(dbar);
+	
+    });
+    const dtstamp = (new Date()).toISOString().replace(/[^0-9a-zA-Z]/g,"-")
+    const download_filename = "SSVC_Custom_" + dtstamp + "_json.txt";
+    let clbutton = SSVC.form.parentElement.querySelector("[data-clear]");
+    let jsonTreedump = clbutton.getAttribute("data-json");
+    const btn = SSVC.form.parentElement.querySelector("[data-download-json]");
+    btn.href = "data:text/plain;charset=utf-8,"+
+	encodeURIComponent(jsonTreedump);
+    btn.setAttribute("download", download_filename);
+    const btncsv = SSVC.form.parentElement.querySelector("[data-download-csv]");
+    let CSV = SSVC.form.parentElement.querySelector("[data-tab='CSV']").dataset.csv;
+    if(!CSV) {
+	/* Force render to ensure the elment is visible properly*/
+	let tab = SSVC.form.parentElement.querySelector("[data-tab='CSV']");
+	let oldv = tab.style.display;
+	tab.style.display = "block";
+	CSV = SSVC.form.parentElement.querySelector("[data-tab='CSV']").innerText;
+	tab.style.display = oldv;
+    }
+    btncsv.href = "data:text/plain;charset=utf-8," +
+	encodeURIComponent(CSV);
+    const csv_filename = "SSVC_Custom_" + dtstamp + ".csv";    
+    btncsv.setAttribute("download", csv_filename);
+}
+
+function createSSVC(csv, uploaded) {
+    SSVC.results = {};
+    const exporter = { "ssvcV1_0_1": {
+	"id": "CVE-1999-1234",
+	"selections": [],
+	"timestamp": (new Date()).toISOString(),
+	"schemaVersion": "1-0-1"
+    }};
+    const ssvcTable = [];
+    let jsonTree = {}
+    let CSV = "";
+    let outcomeTitle;
+    let lines = [];
+    let headers = [];
+    let dset = [[]];
+    if(typeof(csv) === "object") {
+	/* This is JSON data more powerful use it */
+	jsonTree = simpleCopy(csv);
+	if(('schemaVersion' in jsonTree) && 
+	   (jsonTree.schemaVersion === '2.0.0') &&
+	   ('decision_points' in jsonTree)) {
+	    if(('outcome' in jsonTree) &&
+	       (jsonTree.outcome in jsonTree.decision_points)) 
+		outcomeTitle = jsonTree.decision_points[jsonTree.outcome].name;
+	    let hkeys = [];
+	    SSVC.dpMap = {};
+	    Object.entries(jsonTree.decision_points).forEach(function([k,dp], i) {
+		/* Dynamically build the name map per Tree. Assumption is there
+		   are NO two decision points with the same name */
+		if(dp.name in SSVC.dpMap)
+		    topalert("danger", "Duplicate Names found in Decision Table can cause confusion", 0);
+		SSVC.dpMap[dp.name] = {name: dp.name, version: dp.version,
+				       namespace: dp.namespace, data: dp};
+		dset[i] = dp.values.map(x => x.name)
+		if(k != jsonTree.outcome) {
+		    headers.push(dp.name);
+		    hkeys.push(k);
+		}
+	    });
+	    headers.push(outcomeTitle);
+	    hkeys.push(jsonTree.outcome);
+	    if('mapping' in jsonTree)
+		jsonTree.mapping.forEach(function(dvpair) {
+		    const line = hkeys.map(function(k) {
+			const vk = dvpair[k];
+			const dp = jsonTree.decision_points[k];
+			for(let i = 0; i < dp.values.length; i++) 
+			    if(dp.values[i].key == vk) 
+				return dp.values[i].name;
+		    });
+		    lines.push(line);
+		});
+	}
+    } else {
+	lines = csv.split('\n');
+	headers = lines.shift().split(',');
+	if(headers[0] == "row") {
+	    /* CSV with row numbering setup so remove the first element*/
+	    headers.shift();
+	}
+    }
+    const form = SSVC.form;
+    const main = document.createElement("main");
+    function destroytip() {
+	let div = SSVC.form.querySelector("[data-temp]");
+	if(div)
+	    div.remove();
+    }
+    function tooltip(event, info) {	
+	let div = SSVC.form.querySelector("[data-temp]");
+	if(!div) {
+	    div = document.createElement("div");
+	    div.setAttribute("data-temp",1);
+	}
+	div.innerText = info;
+	const style = {
+	    "display": "block",
+	    "backgroundColor": "#333",
+	    "opacity": "0.9",
+	    "maxWidth": "300px",
+	    "color": "white",
+	    "borderRadius": "8px",
+	    "position": "absolute",
+	    "left": String(event.pageX + 10) + "px",
+	    "top": String(event.pageY + 10) + "px",
+	    "padding": "4px",
+	    "border": "2px solid aqua"
+	};
+	Object.assign(div.style,style);
+	SSVC.form.appendChild(div);
+    }
+    function helptip(event) {
+	let dp = {};
+	/* Check for Decision Point or Outcome and return helptip */
+	const isdp = ["data-dp","data-outcomename"].some(function(fdp) {
+	    if(event.target.hasAttribute(fdp)) {
+		/* A Decision Point help tip  */
+		dp = get_decision_point(event.target.getAttribute(fdp));
+		if(dp.definition) {
+		    tooltip(event, dp.definition);
+		    return true;
+		}
+	    }
+	    /* This is more like continue */
+	    return false;
+	});
+	if(isdp)
+	    return false;
+	/* A Decision Point value helptip */
+	const dpInput = event.target.querySelector("input");
+	if(dpInput) {
+	    if(dpInput.parentElement.parentElement.getAttribute("data-help")) {
+		dp = JSON.parse(dpInput.parentElement.parentElement.getAttribute("data-help"));
+	    } else {
+		dp = get_decision_point(dpInput.name);
+		if(dp.definition) 
+		    dpInput.parentElement.parentElement.setAttribute("data-help",JSON.stringify(dp));
+	    }
+	} 
+	if(dp.values) {	 
+	    for(let i=0; i<dp.values.length; i++) {
+		if(dp.values[i].name.toLowerCase() == dpInput.value.toLowerCase()) {
+		    return tooltip(event,dp.values[i].definition);
+		}
+	    }
+	}
+    }
+    if(uploaded) {
+	/* Remove any name conflict */
+	headers.forEach(function(dpName,i) {
+	    while(dpName in SSVC.dpMap) {
+		let idx = 1;
+		dpName = dpName + "-" + idx;
+		idx = idx + 1;
+	    }
+	    headers[i] = dpName;
+	    SSVC.dpMap[dpName] = {"namespace": "x_com.example#psirt",
+				  "version": "1.0.0"};
+	});
+    }
+    main.style.display = "flex";
+    main.style.verticalAlign = "top";
+    const allrows = document.createElement("div");
+    CSV = CSV + csvline(headers);
+    lines.forEach(function(line) {
+	if(!line)
+	    return;
+	let cols;
+	if(Array.isArray(line)) {
+	    cols = line;
+	} else {
+	    cols = line.split(',');
+	    if(cols[0].match(/^\d+$/)) {
+		/* Remove first element of columns if they are row numbers */
+		cols.shift();
+	    }
+	}
+	CSV = CSV + csvline(cols);	
+	const row = {};
+	const rowDiv = document.createElement("div");
+	rowDiv.style.display = "table-row";
+	headers.forEach(function(dpName,i) {
+	    const colDiv = document.createElement("div");
+	    colDiv.innerText = cols[i];
+	    colDiv.style.padding = "0px";
+	    colDiv.style.border = "1px solid cyan";
+	    colDiv.style.display = "table-cell";
+	    if( i == headers.length - 1) 
+		colDiv.setAttribute("data-outcome", cols[i]);
+	    rowDiv.append(colDiv);
+	    row[dpName] = cols[i];
+	});
+	rowDiv.style.display = "none";
+	rowDiv.setAttribute("data-row",JSON.stringify(row));
+	allrows.append(rowDiv);
+	ssvcTable.push(row);
+    });
+    const rowDiv = document.createElement("div");
+    rowDiv.style.display = "table-row";
+    headers.forEach(function(header, i) {
+	const div = document.createElement('div');
+	div.style.padding = "0px";
+	div.style.border = "1px solid cyan";
+	div.style.display = "inline-block";
+	const hdiv = document.createElement("div");
+	hdiv.innerText = header;
+	hdiv.style.padding = "4px";
+	hdiv.style.borderBottom = "1px solid cyan";
+	hdiv.style.fontWeight = "bold";
+	hdiv.setAttribute("data-dp",header);
+	hdiv.setAttribute("data-dpIndex",i);	
+	if(i == headers.length -1 ) {
+	    hdiv.setAttribute("data-outcomeName",header);
+	}
+	hdiv.addEventListener("mouseenter", helptip);
+	hdiv.addEventListener("mouseleave", destroytip);	
+	div.append(hdiv);
+	const chdiv = hdiv.cloneNode(true);
+	chdiv.style.border = "1px solid cyan";
+	chdiv.style.display = "table-cell";
+	rowDiv.appendChild(chdiv);
+	if(!dset[i].length) {
+	    /* We may not get the right order for CSV imports*/
+	    dset[i] = ssvcTable.reduce(function(acc,row) {
+		if(!acc.includes(row[header]))
+		    acc.push(row[header]);
+		return acc;
+	    }, []);
+	}
+	let j = -1;
+	dset[i].forEach(function(value) {
+	    j++;
+	    const inputDiv = document.createElement('div');
+	    inputDiv.style.padding = "4px";
+	    const input = document.createElement('input');
+	    input.type = "checkbox";
+	    input.setAttribute("data-dpdepth", i);
+	    input.setAttribute("data-dpvdepth", j);
+	    input.name = header;
+	    const vlabel = document.createElement('label');
+	    vlabel.innerText = value;
+	    input.value = value; 
+	    if(i ==  headers.length -1 ) {
+		/* Last column for results */
+		inputDiv.setAttribute("data-result",value);
+		inputDiv.style.opacity = 0.6;
+		outcomeTitle = header;
+		inputDiv.style.fontWeight = "bolder";
+		inputDiv.style.border = "1px solid cyan";
+		/* inputDiv.style.position = "relative"; */
+		const spanCount = document.createElement("span");
+		spanCount.innerText = " ()";
+		vlabel.appendChild(spanCount);
+	    }
+	    /* Add this except for last row
+	       Last row is our results row. */
+	    vlabel.addEventListener("click", function(el) {
+		this.previousSibling.click();
+	    });
+	    inputDiv.append(input);
+	    inputDiv.append(vlabel);
+	    inputDiv.addEventListener("mouseenter", helptip);
+	    inputDiv.addEventListener("mouseleave", destroytip);
+	    div.append(inputDiv);
+	});
+	main.appendChild(div);
+    });
+    if(uploaded) {
+	/*Create Custom Decision Points and add them to popup */
+	const newdps = Object.keys(ssvcTable[0]).reduce(function(ac,name) {
+	    if(name != outcomeTitle) {
+		let version = "1.0.0";
+		let namespace = "demo/custom"
+		ac[name] = {"filename": "memory:" + name ,
+			    "data": {"namespace": namespace,
+				     "name": name,
+				     "version": version,
+				     "definition": name,
+				     "schemaVersion": "1-0-1",
+				     "values": []
+				    }
+			   }
+	    }
+	    return ac;
+	}, {});
+	ssvcTable.forEach(function(row) {
+	    Object.keys(row).forEach(function(dpName) {
+		const value = row[dpName];
+		if(newdps[dpName]) {
+		    if(newdps[dpName].data.values.findIndex(function(nvalue) {
+			return nvalue.name == value;}) < 0) {
+			newdps[dpName].data.values.push({"name": value, "definition": value, "key": value[0]});
+		    }
+		}
+
+	    });
+	});
+	/*Append new decision points */
+	SSVC.decision_points.push.apply(SSVC.decision_points,
+					Object.values(newdps));
+    }
+    
+    SSVC.decision_table = ssvcTable;
+    const numberTable = toNumberTable(SSVC.decision_table,Object.keys(SSVC.decision_table[0]));
+    const features = [];
+    const results = []
+    numberTable.forEach(function(row) {
+	const outcome = row.pop();
+	if(SSVC.results[outcome])
+	    SSVC.results[outcome] = SSVC.results[outcome] + 1;
+	else
+	    SSVC.results[outcome] = 1;
+	results.push(outcome);
+	features.push(row);
+    });
+    if(Object.keys(SSVC.results).length > 1) {
+	const labels = SSVC.decision_table.map(function(x) {
+	    return x[outcomeTitle];
+	});
+	const featureImportance = computeFI(features,labels);
+	if(Object.keys(featureImportance).length == features[0].length) { 
+	    const pfdiv = document.createElement("div");
+	    pfdiv.style.display = "table-row";
+	    for(let i=0; i < features[0].length; i++) {
+		const fdiv = document.createElement("div");
+		fdiv.innerText = featureImportance[i]['importance'].toFixed(4);
+		fdiv.style.display = "table-cell";
+		fdiv.style.border = "1px solid cyan";
+		pfdiv.appendChild(fdiv);
+	    }
+	    const fdiv = document.createElement("div");
+	    fdiv.innerText = "<= Feature Importance";
+	    pfdiv.appendChild(fdiv);
+	    allrows.prepend(pfdiv);
+	}
+    } else {
+	console.log("There are no features to select importance from");
+    }
+    allrows.prepend(rowDiv);
+    allrows.style.display = "table";
+    allrows.setAttribute("data-tab","table");
+    form.appendChild(main);
+    form.appendChild(h5button("SSVC Table", "current", "table"));
+    form.appendChild (document.createTextNode (" "));
+    form.appendChild(h5button("JSON", null, "JSON"));
+    form.appendChild (document.createTextNode (" "));
+    form.appendChild(h5button("CSV", null, "CSV"));
+    form.appendChild (document.createTextNode (" "));
+    form.appendChild(h5button("Graph", null, "GRAPH"));    
+    const btn = SSVC.form.parentElement.querySelector("[data-clear]");
+    btn.style.backgroundColor = "#dc3545";
+    btn.style.color = "white";
+    btn.innerText = " CLEAR ";
+    btn.type = "button";
+    if(typeof(csv) == "object")
+	btn.setAttribute("data-json", JSON.stringify(csv,null,2));
+    else
+	btn.setAttribute("data-csv", csv);
+    btn.addEventListener("click",clear);
+    form.appendChild(allrows);
+    const code = document.createElement("code");
+    code.style.display = "none";
+    code.style.border = "1px solid gray";
+    code.style.width =  "fit-content"
+    code.style.backgroundColor = "#eee";
+    code.style.padding = "6px";    
+    code.style.whiteSpace = "pre-wrap";
+    code.style.maxWidth = "90%";
+    code.setAttribute("data-tab","JSON");
+    code.innerText = JSON.stringify(jsonTree, null, 4);
+    form.appendChild(code);
+    const tcode = code.cloneNode();
+    tcode.setAttribute("data-tab","CSV");
+    tcode.innerText = CSV;
+    tcode.dataset.csv = CSV;
+    form.appendChild(tcode);
+    const tgraph = document.createElement("div");
+    tgraph.id = "graph"
+    tgraph.setAttribute("data-tab","GRAPH");
+    tgraph.style.display = "none";
+    tgraph.innerText = "Graph not available for CSV data";
+    form.appendChild(tgraph);
+    if(jsonTree.decision_points)
+	graphModule.dt_graph(csv);
+    function filterData(ev) {
+	exporter.ssvcV1_0_1.selections = [];
+	if(main.querySelectorAll("input:checked").length == 0) {
+	    SSVC.form.querySelectorAll('[data-row]').forEach(function(row) {
+		row.style.display="none";
+	    });
+	    return update_stats();
+	}
+	const div = ev.target.parentElement;
+	const ldivs = Array.from(SSVC.form.querySelectorAll("main > div"));
+	ldivs.pop();
+	ldivs.forEach(function(div) {
+	    div.style.opacity = 1.0;
+	});
+	if(div && div.hasAttribute("data-result")) {
+	    const results = div.parentElement.querySelectorAll("input:checked");
+	    main.querySelectorAll("input").forEach(inp => inp.checked= false);
+	    if(results.length == 0) {
+		SSVC.form.querySelectorAll('[data-row]').forEach(function(row) {
+                    row.style.display="none";
+		});
+		return update_stats();
+	    }
+	    /* This is clicking on outcome be wary */
+	    topalert("When filtering by Outcome the Decision Point values can look confounded!","warn",4);
+	    ldivs.forEach(function(div) {
+		div.style.opacity = 0.6;
+	    });
+	    let counter = 0;
+	    ssvcTable.forEach(function(mrow,i) {
+		let row = simpleCopy(mrow);
+		let drows = SSVC.form.querySelectorAll("[data-row]");
+		drows[i].style.display = "none";
+		results.forEach(function(result) {
+		    result.checked = true;
+		    result.parentElement.style.opacity = 1.0;
+		    if(row[result.name] == result.value) {
+			counter++;
+			drows[i].style.display = "table-row";
+			delete row[result.name];
+			Object.entries(row).forEach(function([dpname,dpvalue]) {
+			    let sel = 'input[name="'+dpname +
+				'"][value="'+dpvalue+'"]';
+			    let inp = SSVC.form.querySelector(sel);
+			    if(inp)
+				inp.checked = true;
+			});
+		    }
+		});
+	    });
+	    const h5 = form.querySelector("h5");
+            let text = String(counter) + " of " + String(ssvcTable.length)
+            h5.innerText = "-- SSVC Table (selected " + text + ") -- ";
+	    return update_stats();
+	}
+	if(ev.target && ev.target.tagName.toUpperCase() == "INPUT"
+	   && ev.target.type.toLowerCase() == "checkbox") {
+	    graphModule.graph_dynamic(ev.target);
+	}
+	main.querySelectorAll("[data-result]").forEach(function(result) {
+	    result.style.fontWeight = "normal";
+	    result.style.opacity = "0.6";
+	    const inp = result.querySelector("input");
+	    if(inp)
+		inp.checked = false;
+	});
+	const selections = {};
+	main.querySelectorAll("input:checked").forEach(function(input) {
+	    const div = input.parentElement;
+	    /*Ignoore outcome checkboxes that are checked */
+	    if(div && div.hasAttribute("data-result"))
+		return;
+	    if(input.name in selections)
+		selections[input.name].push(input.value);
+	    else
+		selections[input.name] = [input.value];
+	});
+	let rows = ssvcTable;
+	Object.keys(selections).forEach(function(decision_point) {
+	    const dp = get_decision_point(decision_point);
+	    exporter.ssvcV1_0_1.selections.push({"namespace": dp.namespace || "ssvc",
+						 "version": dp.version || "1.0.0",
+						 "values": selections[decision_point],
+						 "name": decision_point});
+	    let chosen = selections[decision_point];
+	    rows = rows.filter(function(row) {
+		if(chosen.includes(row[decision_point])){
+		    if(outcomeTitle in row) {
+			return row;
+		    }
+		}
+	    });
+	});
+	form.querySelectorAll("[data-row]").forEach(function(trow) {
+	    trow.style.display = "none";
+	});
+	rows.forEach(function(row) {
+	    form.querySelectorAll("[data-row]").forEach(function(trow) {
+		let crow = JSON.parse(trow.getAttribute("data-row"));
+		if(compareObj(crow,row))
+		    trow.style.display = "table-row";
+	    });
+	    const rowTitle = row[outcomeTitle].replaceAll('"','\\"');
+	    main.querySelectorAll('[data-result="'+rowTitle+'"]').forEach(function(result) {
+		result.style.fontWeight = "bolder";
+		result.style.opacity = "1.0";
+		const inp = result.querySelector("input");
+		if(inp)
+		    inp.checked = true;
+	    });
+	});
+	const h5 = form.querySelector("h5");
+	let text = String(rows.length) + " of " + String(ssvcTable.length)
+	h5.innerText = "-- SSVC Table (selected " + text + ") -- ";
+	exporter.ssvcV1_0_1.timestamp =  (new Date()).toISOString();
+	/* always display JSON Tree
+	   code.innerHTML = JSON.stringify(exporter, null, 4);
+	*/
+	update_stats();
+    }
+    main.addEventListener('change', filterData);
+    update_stats();
+}
+
+
+function calculateEntropy(decision_table, targetCol) {
+  const valueCounts = {};
+  decision_table.forEach(row => {
+    const value = row[targetCol];
+    valueCounts[value] = (valueCounts[value] || 0) + 1;
+  });
+
+  const totalCount = decision_table.length;
+  let entropy = 0;
+  for (const count of Object.values(valueCounts)) {
+    const p = count / totalCount;
+    entropy -= p * Math.log2(p);
+  }
+  return entropy;
+}
+
+function calculateInformationGain(decision_table,featureCol, targetCol) {
+    const totalEntropy = calculateEntropy(decision_table, targetCol);
+    const featureSet = new Set(decision_table.map(row => row[featureCol]));
+    const featureValues = Array.from(featureSet);
+
+  let weightedEntropy = 0;
+  featureValues.forEach(value => {
+      const subset = decision_table.filter(row => row[featureCol] === value);
+      const subsetEntropy = calculateEntropy(subset, targetCol);
+      const subsetWeight = subset.length / decision_table.length;
+      weightedEntropy += subsetWeight * subsetEntropy;
+  });
+
+  return totalEntropy - weightedEntropy;
+}
+
+/* const entropyMain = calculateEntropy(SSVC.decision_table, outcome); */
+/* calculateInformationGain(SSVC.decision_table, decision_point, outcome); */
+
+function loadSSVC(fileurl) {
+    SSVC.form.innerHTML = "";
+    if(fileurl == "upload_file") {
+	SSVC.form.parentElement.querySelector("input[type='file']").click();
+	return;
+    }
+    if(fileurl.indexOf("csv:") == 0) {
+	/* fileurl itself is the payload with csv: in the front*/
+	return createSSVC(fileurl.substring(4)); 
+    }
+    if(fileurl.indexOf("json:") == 0) {
+	/* fileurl itself is the payload with json: in the front*/
+	return createSSVC(JSON.parse(fileurl.substring(5))); 
+    }
+    if(fileurl.match(/^\d+$/)) {
+	const index = parseInt(fileurl);
+	if( index in SSVC.decision_trees && SSVC.decision_trees[index].data) {
+	    /* This is a SSVC.decision_point index find it and return */
+	    return createSSVC(SSVC.decision_trees[index].data);
+	}
+    }
+    fetch(fileurl).then(function(d) {
+	d.text().then(function(csv) {
+	    try {
+		const json = JSON.parse(csv);
+		createSSVC(json);
+	    }catch(err) {
+		console.log("Assuming the uplaoded document is CSV");
+		createSSVC(csv);
+	    }
+	});
+    });
+}
+async function get_decision_points() {
+    /* Use the URL registry = await response.json(); */
+    const response = await fetch("https://raw.githubusercontent.com/CERTCC/SSVC/refs/heads/main/data/json/ssvc_object_registry.json");
+    const registry = await response.json();
+    if (registry.types && registry.types.DecisionPoint &&
+	registry.types.DecisionPoint.namespaces) {
+	const namespaces = registry.types.DecisionPoint.namespaces;
+	for (const nsKey in namespaces) {
+	    const namespace = namespaces[nsKey];
+	    if (namespace.keys) {
+		for (const key in namespace.keys) {
+		    const keyEntry = namespace.keys[key];
+		    if (keyEntry.versions) {
+			for (const version in keyEntry.versions) {
+			    const versionEntry = keyEntry.versions[version];
+			    if (versionEntry.obj && versionEntry.values) {
+				let mdata = {data: versionEntry.obj};
+				SSVC.decision_points.push(mdata);
+			    }
+			}
+		    }
+		}
+	    }
+	}
+    }
+    if (registry.types && registry.types.DecisionTable &&
+	registry.types.DecisionTable.namespaces) {
+	const namespaces = registry.types.DecisionTable.namespaces;
+	for (const nsKey in namespaces) {
+	    const namespace = namespaces[nsKey];
+	    if (namespace.keys) {
+		for (const key in namespace.keys) {
+		    const keyEntry = namespace.keys[key];
+		    if (keyEntry.versions) {
+			for (const version in keyEntry.versions) {
+			    const versionEntry = keyEntry.versions[version];
+			    if (versionEntry.obj && versionEntry.obj.decision_points) {
+				let mdata = {data: versionEntry.obj, displayname: name_version(versionEntry.obj)};
+				if(versionEntry.obj.name.indexOf("Deployer") > -1)
+				    mdata['selected'] = true;
+				SSVC.decision_trees.push(mdata);
+			    }
+			}
+		    }
+		}
+	    }
+	}
+    }    
+    SSVC.decision_points.sort(dtreeSort); 
+    load_trees();
+}
+
+function deepSet(form, obj, path) {
+    if(!path)
+	path = "";
+    for (const key in obj) {
+	if (typeof obj[key] === "object") {
+	    deepSet(form, obj[key], path ? path + "-" + key : key);
+	} else {
+	    const fullpath = path ? path + "-" + key : key;
+	    const input = form.elements.namedItem("obj-" + fullpath);
+	    if(input) {
+		input.value = obj[key];
+		input.defaultValue = obj[key];
+		if(input.onchange)
+		    input.onchange(input);
+	    } else {
+		console.log("Unassigned value ", key, fullpath, obj[key]);
+	    }
+	}
+    }
+}
+function match_name_ns_vers(obj,selectobj) {
+    const props = ["name", "namespace", "version"];
+    return props.every(function(prop) {
+	return obj.data.hasOwnProperty(prop) &&
+	    selectobj.hasOwnProperty(prop) &&
+	    obj.data[prop] == selectobj[prop];
+    });
+}
+function prepare_form(vForm, vSelect, selectdp, preFill, vars) {
+    if(!vSelect.hasAttribute("detect-change"))
+       vSelect.addEventListener("change",function(ev) {
+	   const el = ev.target;
+	   if(!el.value)
+	       return clear_popup_form(vSelect, vForm);
+	   const obj = JSON.parse(el.value);
+	   Object.keys(obj).forEach(function(key) {
+	       vForm.querySelectorAll("[data-temp]").forEach(function(div) {
+		   div.remove();
+	       });
+	       if(vars in obj) {
+		   const drows = obj[vars].length * 2;
+		   const crows = vForm.querySelectorAll("[data-clone]").length;
+		   const diff = (drows - crows)/2;
+		   for(let i=0; i < diff; i++)
+		       vForm.querySelector("button").click();
+	       }
+	       deepSet(vForm, obj);
+	   });
+       }); 
+    vSelect.setAttribute("detect-change","1");
+    preFill.forEach(function(obj) {
+	let info;
+	/* Drop down for decision points has more information*/
+	if (obj.data.namespace && obj.data.name && obj.data.version) 
+	    info = obj.data.namespace + "/" + name_version(obj.data);
+	else
+	    info = obj.data.name;
+	const opt = new Option(info, JSON.stringify(obj.data));
+	if(selectdp.name  && match_name_ns_vers(obj,selectdp)) {
+	    opt.selected = true;
+	    selectdp['obj'] = true; 
+	}
+	vSelect.appendChild(opt);
+    });
+    if(selectdp.obj) {
+	vSelect.dispatchEvent(new Event("change"));
+    }
+}
+function popupStart(selector) {
+    const popup = SSVC.form.parentElement.parentElement.querySelector("[id='ssvcPopup']"); 
+    popup.previousElementSibling.style.opacity = "0.3";
+    popup.previousElementSibling.style.pointerEvents = "none";
+    popup.style.display = "block";
+    /* The matching div under popup to display and work with */
+    let rpopup;
+    Array.from(popup.children).forEach(function(el) {
+	if(el.hasAttribute(selector)) {
+	    el.style.display = "block";
+	    rpopup = el;
+	} else {
+	    el.style.display = "none";
+	}
+    });
+    return rpopup;
+}
+function popupEnd() {
+    const popUp = SSVC.form.parentElement.parentElement.querySelector("[id='ssvcPopup']");
+    popUp.previousElementSibling.style.opacity = "1.0";
+    popUp.previousElementSibling.style.pointerEvents = "all";
+    popUp.style.display = "none";
+    return popUp;
+}
+
+async function popupConfirm(message) {
+    const rpopUp = popupStart("data-yesno");
+    rpopUp.querySelector("h4").innerText = message;
+    return new Promise(function(success, fail ) {
+	rpopUp.querySelectorAll("button").forEach(function(el) {
+	    el.onclick = function() { success(el.innerText); popupEnd();}
+	});
+	
+    });
+}
+function clear_popup_form(iSelect, rpopUp) {
+    iSelect.selectedIndex = 0;
+    rpopUp.querySelectorAll("[data-temp]").forEach(function(el) {
+	el.remove();
+    });
+    rpopUp.querySelectorAll("input,textarea").forEach(function(input) {
+	input.value="";
+    });
+}
+
+function disable_current_dps(options) {
+    /* Disable already used DPs */
+    const current_dps = [];
+    SSVC.form.querySelector("main").querySelectorAll("[data-dp]").forEach(function(el) {
+	try {
+	    const dp = get_decision_point(el.getAttribute("data-dp"));
+	    current_dps.push(dp);
+	} catch(err) {
+	    console.log("Error while trying to detect current Decision Points " + err);
+	}
+    });
+    options.forEach(function(option) {
+	if(option.value && (!option.selected)) {
+	    try {
+		const odp = JSON.parse(option.value);
+		current_dps.forEach(function(cdp) {
+		    if(match_name_ns_vers({"data": odp},cdp))
+			option.setAttribute("disabled",1);
+		});
+	    } catch(err) {
+		console.log("Error while trying to match Decision Points to current options" + err);
+	    }
+	}
+    });
+}
+
+function popupEditDP(w) {
+    topalert();
+    const rpopUp = popupStart("data-customdp");
+    const dpForm = rpopUp.querySelector("form");
+    const dpSelect = dpForm.querySelector("select");
+    let options = dpSelect.querySelectorAll("option");
+    let dpName = "-1";
+    let dpIndex = "-1";
+    options.forEach(function(option) {
+	if(option.getAttribute("disabled"))
+	    option.removeAttribute("disabled");
+    });
+    if(options.length < 2) {
+	/*First time popup is running for Decision Points */
+	prepare_form(dpForm, dpSelect, {}, SSVC.decision_points, "values");
+	options = dpSelect.querySelectorAll("option");
+    } else if(SSVC.decision_points.length > options.length - 1) {
+	/* Add any new Decision Points that were imported or added */
+	for(let i=options.length - 1; i < SSVC.decision_points.length; i++) {
+	    const obj = SSVC.decision_points[i];
+	    const info = obj.data.namespace + "/" + name_version(obj.data);
+	    const opt = new Option(info, JSON.stringify(obj.data));
+	    dpSelect.appendChild(opt);
+	}
+	options = dpSelect.querySelectorAll("option");	
+    }
+
+    if(w.parentElement.hasAttribute("data-outcomeName")) {
+	dpSelect.setAttribute("data-outcomeName",
+			      w.parentElement.getAttribute("data-outcomeName"));
+	rpopUp.querySelector("h4").innerHTML = "Customize Outcome";	
+	
+    } else if(w.hasAttribute("data-adddp")) {
+	dpSelect.removeAttribute("data-outcomeName");
+	/* This is a new Decision Point so Add Decision Point is the action */
+	rpopUp.querySelector("h4").innerHTML = "Add Decision Point";
+	rpopUp.querySelector("[data-update]").innerText = "Add";
+    } else {
+	dpSelect.removeAttribute("data-outcomeName");
+	rpopUp.querySelector("h4").innerHTML = "Customize Decision Point";
+	rpopUp.querySelector("[data-update]").innerText = "Update";	
+	dpName = w.parentElement.getAttribute("data-dp");
+	dpIndex = w.parentElement.getAttribute("data-dpIndex");
+	const selectdp = get_decision_point(dpName);
+	if(selectdp.name) {
+	    dpSelect.setAttribute("data-selectdp", JSON.stringify(selectdp));
+	    const i = SSVC.decision_points.findIndex(function(dp) {
+		return match_name_ns_vers(dp,selectdp);
+	    });
+	    if (i > -1) {
+		dpSelect.options.selectedIndex = i + 1;
+		dpSelect.dispatchEvent(new Event("change"));
+	    }
+	} else {
+	    /* This decision point is unknown to us */
+	    dpSelect.removeAttribute("data-selectdp");
+	    clear_popup_form(dpSelect, rpopUp);
+	}
+    }
+    
+    dpForm.setAttribute("data-dpIndex", dpIndex);
+    dpForm.setAttribute("data-dp", dpName);
+    disable_current_dps(options);
+}
+function toggleAll(doselect) {
+    const main = SSVC.form.querySelector('main');
+    if (arguments.length < 1) {
+	const selected = main.querySelectorAll('input[type="checkbox"]:not(:checked)').length;
+	if (selected)
+	    doselect = true;
+	else
+	    doselect = false;
+    }
+    let tempel;
+    main.querySelectorAll("input[type='checkbox']").forEach(function(el) {
+	el.checked = doselect;
+	tempel = el;
+    });
+    main.dispatchEvent(new Event('change'));
+    /* Put full tree back like it was */
+    try {
+	const jsonData = document.querySelector("[data-tab='JSON']").innerText;
+	const jsonTree = JSON.parse(jsonData);
+	graphModule.dt_graph(jsonTree);
+    } catch(err) {
+	console.log("Reset form error " + err);
+    }
+}
+function selectCustom(name, datatree, fIndex) {
+    let clbutton = SSVC.form.parentElement.querySelector("[data-clear]");
+    clbutton.setAttribute("data-json", JSON.stringify(datatree, null, 2));
+    const sample = SSVC.form.parentElement.querySelector("[id='sampletrees']");
+    if(sample.querySelector("[selected]"))
+	sample.querySelector("[selected]").removeAttribute("selected");
+    if(fIndex < 0) {
+	const opt = new Option(name, String(fIndex * -1), false, true);
+	if(name) {
+	    opt.text = "[Private] " + name
+	    opt.selected = true;
+	    opt.setAttribute("data-customdt",1);
+	}
+	sample.appendChild(opt);
+    } else {
+	sample.querySelectorAll("option").forEach(function(option) {
+	    if(option.textContent == name) 
+		option.value = fIndex;
+	});
+    }
+    toggleAll(true);
+}
+function customize(w) {
+    const clbutton = SSVC.form.parentElement.querySelector("[data-clear]");
+    if(w.innerHTML == "Customize") {
+	clbutton.removeAttribute("data-changed");
+	topalert("Edit, Remove or Add Decision Points, update Outcomes to create a new Decision Model and save it as a Decision Tree","success",0);
+	toggleAll(true);
+	w.innerHTML = "Save Changes";
+	lock_unlock(true);
+	SSVC.form.querySelectorAll("input[type='checkbox']").forEach(function(checkbox) {
+	    checkbox.disabled = true;
+	    checkbox.nextSibling.style.opacity = 0.5;
+	});
+	const divOutcome = SSVC.form.querySelector("[data-outcomeName]");
+	const span = document.createElement("span");
+	span.innerHTML = "&#9998;";
+	span.style.color = "#007bff";
+	span.addEventListener("click",function() {
+	    popupEditDP(this);
+	});
+	divOutcome.appendChild(span);
+	const alldps = SSVC.form.querySelectorAll("[data-dp]");
+	/* There are two displays of each DP*/
+	const dplength = alldps.length/2;
+	alldps.forEach(function(el, i) {
+	    if(el.querySelector("span"))
+		return;
+	    const span = document.createElement("span");
+	    span.innerHTML = "&#9998;";
+	    span.style.color = "#007bff";
+	    span.title = "Edit Decision Point";
+	    span.addEventListener("click",function() {
+		popupEditDP(this);
+	    });
+	    const delspan = document.createElement("span");
+	    delspan.title = "Delete Decision Point";
+	    delspan.innerHTML = "&#8854;";
+	    delspan.addEventListener("click", function(ev) {
+		deleteDP(this);
+	    });
+	    delspan.style.color = "red";
+	    el.appendChild(span);
+	    if(!((i == dplength -1) || (i == dplength*2 -1)))
+		el.appendChild(delspan);
+	    el.setAttribute("TM",String(i) + "- " + String(dplength));
+	    if((i == dplength - 2) || (i == dplength*2 - 2)) {
+		const addspan = document.createElement("span");
+		addspan.innerHTML = "&#8853";
+		addspan.style.color = "#28a745";
+		addspan.setAttribute("data-adddp",1);
+		addspan.addEventListener("click", function(ev) {
+		    popupEditDP(this);
+		});
+		el.appendChild(addspan);
+	    }
+	});
+	SSVC.form.querySelectorAll("[data-outcome]").forEach(function(el) {
+	    const inp = document.createElement("input");
+	    inp.value = el.innerText;
+	    inp.dataset.initialvalue = el.innerText;
+	    inp.addEventListener('change', function() {
+		if (inp.value !== inp.dataset.initialValue) {
+		    clbutton.setAttribute("data-changed", "1");
+		}
+	    });
+	    el.innerText = "";
+	    el.appendChild(inp);
+	});
+    } else {
+	/* new Decision Tree Setup  */
+	if(!clbutton.hasAttribute("data-changed")) {
+	    return alert("Nothing has changed!");
+	}
+	let jsonTree = {};
+	if(clbutton.hasAttribute("data-json")) {
+	    jsonTree = JSON.parse(clbutton.getAttribute("data-json"));
+	}
+	const sample = SSVC.form.parentElement.querySelector("[id='sampletrees']");
+	const nextel = sample.nextElementSibling;
+	let current = sample[sample.selectedIndex].innerText
+	if(nextel.tagName.toUpperCase() == "DIV") {
+	    nextel.querySelectorAll("input").forEach(function(inp) {
+		if(!inp.value) 
+		    jsonTree["error"] = "Value for " + niceString(inp.name) 
+		    + " CANNOT be empty!";
+		jsonTree[inp.name] = inp.value;
+	    });
+	}
+	if(jsonTree.error)
+	    return alert(jsonTree.error);
+	if(!validate_namespace(jsonTree.namespace)) 
+	    return;
+	w.innerHTML = "Customize";
+	lock_unlock(false);
+	SSVC.form.querySelectorAll("input[type='checkbox']").forEach(function(checkbox) {
+	    checkbox.disabled = false;
+	    checkbox.nextSibling.style.opacity = 1.0;
+	});
+	SSVC.form.querySelectorAll("[data-dp]").forEach(function(el) {
+	    if(el.querySelector("span"))
+		el.querySelector("span").remove();
+	});
+	SSVC.form.innerHTML = "";
+	createSSVC(jsonTree, false);
+	/* Find if this is already a custom built tree and
+	   update it if needed */
+	let findex = SSVC.decision_trees.findIndex(function(dt) {
+	    if(dt.custom)
+		return dt.displayname == current;
+	    else 
+		current = name_version(jsonTree);
+	});
+	
+	topalert("Latest values have been saved locally!","success",3);
+	if(findex > -1) {
+	    SSVC.decision_trees[findex]["data"] = jsonTree;
+	} else {
+	    /* Now findex will basicaly represent the last element
+	       in the SSVC.decision_trees */
+	    findex = -1 * SSVC.decision_trees.length;
+	    SSVC.decision_trees.push({data: jsonTree, displayname: current, custom: 1});
+	}
+	selectCustom(current, jsonTree, findex);
+	let custom_ssvc = {};
+	["decision_trees","decision_points"].forEach(function(dtype) {
+	    custom_ssvc[dtype] = [];
+	    SSVC[dtype].forEach(function(dtdp) {
+		if(dtdp.custom)
+		    custom_ssvc[dtype].push(dtdp);
+	    });
+	})
+	localStorage.setItem("custom_ssvc", JSON.stringify(custom_ssvc));
+	SSVC.form.parentElement.querySelector("[data-session]").style.display = "block";
+    }
+}
+function load_trees() {
+    const sampletrees = SSVC.form.parentElement.querySelector("[id='sampletrees']");
+    sampletrees.innerHTML = "";
+    const displaySet = {};
+    SSVC.decision_trees.forEach(function(decision_tree, i) {
+	const opt = new Option(decision_tree.displayname, i , decision_tree.selected, decision_tree.selected);
+	if(decision_tree.custom) {
+	    opt.setAttribute("data-customdt","1");
+	    opt.innerText =  "[Private] " +opt.innerText
+	}
+	if(displaySet[opt.innerText])
+	    opt.innerText = add_dash_n(opt.innerText, displaySet);
+	sampletrees.appendChild(opt);
+	if(decision_tree.selected)
+	    loadSSVC(String(i));
+	displaySet[opt.innerText] = 1;
+    });
+    sampletrees.appendChild(new Option("Upload CSV/JSON","upload_file"));
+}
+async function delete_session() {
+    if(await popupConfirm("Are you sure, you want to delete all custom Decision Trees?") == "Yes") {
+	localStorage.removeItem("custom_ssvc");
+	for (let i = 0; i < SSVC.decision_trees.length; i++) {
+	    if(SSVC.decision_trees[i].custom) {
+		SSVC.decision_trees.splice(i, 1);
+		i--; 
+	    }
+	}
+	topalert("All custom decision trees have been removed", "warn");
+	load_trees();
+	SSVC.form.parentElement.querySelector("[data-session]").style.display = "none";	
+    } else {
+	topalert("Good! Custom decision trees have been retained!", "success", 3);
+    }
+}
+async function delete_dtree() {
+    const sampletrees = SSVC.form.parentElement.querySelector("[id='sampletrees']");
+    const delete_tree = sampletrees.options[sampletrees.selectedIndex].innerText;
+    const opt = sampletrees.options[sampletrees.selectedIndex];
+    if(!opt.hasAttribute("data-customdt")) {
+	return alert("The default trees cannot be deleted");
+    }
+    if(await popupConfirm("Are you sure, you want to delete custom Decision Tree \""+ delete_tree  + "\"?") == "Yes") {
+	let old_tree = simpleCopy(SSVC.decision_tree[parseInt(opt.value)]);
+	SSVC.decision_tree.splice(parseInt(opt.value), 1);
+	sampletrees.options[sampletrees.selectedIndex].remove();
+	sampletrees.dispatchEvent(new Event("change"));
+	const saved = JSON.parse(localStorage.getItem("custom_ssvc"));
+	let savedIndex = saved.decision_trees.findIndex(function(dt) {
+	    return match_name_ns_vers(dt,old_tree.data);
+	});
+	if(savedIndex > -1)
+	    saved.decision_trees.splice(savedIndex,1);
+	localStorage.setItem("custom_ssvc", JSON.stringify(saved));
+    } else {
+	topalert("Good! Nothing was deleted!", "success", 3);
+    }
+}
+function rename_dtree() {
+    const sampletrees = SSVC.form.parentElement.querySelector("[id='sampletrees']");
+    const opt = sampletrees.options[sampletrees.selectedIndex];
+    if(!opt.hasAttribute("data-customdt")) {
+        alert("The default trees cannot be deleted");
+	return;
+    }
+    const old_index = parseInt(sampletrees.options[sampletrees.selectedIndex].value);
+    if(SSVC.decision_trees[old_index] && SSVC.decision_trees[old_index].data) {
+	const old_tree = SSVC.decision_trees[old_index];
+	const old_name = old_tree.data.name;
+	const new_name = prompt("Enter new name for the current decision tree \"" + old_name + "\":");
+	SSVC.decision_trees[old_index].data.name = new_name;
+	opt.innerText = name_version(SSVC.decision_trees[old_index].data);
+	SSVC.decision_trees[old_index].displayname = opt.innerText;
+	const saved = JSON.parse(localStorage.getItem("custom_ssvc"));
+        let savedIndex = saved.decision_trees.findIndex(function(dt) {
+            return match_name_ns_vers(dt,old_tree.data);
+	});
+        if(savedIndex > -1)
+            saved.decision_trees[savedIndex] = SSVC.decision_trees[old_index];
+	localStorage.setItem("custom_ssvc", JSON.stringify(saved));
+    }
+}
+function download_ssvc_csv() {
+    download_ssvc('csv');
+}
+function download_ssvc_json() {
+    download_ssvc('json');
+}
+function download_ssvc(dtype) {
+    const btn = SSVC.form.parentElement.querySelector("[data-download-" + dtype + "]");
+    btn.click();
+}
+function restore_session() {
+    if(localStorage.getItem("custom_ssvc")) {
+	const saved = JSON.parse(localStorage.getItem("custom_ssvc"));
+	delete saved.form;
+	["decision_points","decision_trees"].forEach(function(item) {
+	    console.log(saved[item]);
+	    SSVC[item].push.apply(SSVC[item],saved[item]);
+	});
+	load_trees();
+	topalert("Session variables have been restored!","success",3);
+    } else {
+	topalert("No previous session has been found to restore!","danger");
+    }
+}
+
+document.addEventListener("DOMContentLoaded", function () {
+    console.log("Dom content loaded");
+    SSVC.form = document.getElementById('ssvcForm');
+    get_decision_points();
+    if(localStorage.getItem("custom_ssvc")) {
+	topalert("You have some custom Decision Trees saved from earlier session. " +
+		 "use \"Restore Session\" under \"Custom Trees\" to restore & manage these",
+		 "success",0);
+	SSVC.form.parentElement.querySelector("[data-session]").style.display = "block";
+    }
+});
+
+
+function dpValueClone(el) {
+    const pDiv = el.parentElement.parentElement;
+    pDiv.querySelectorAll("span").forEach(function(x) { x.remove(); });
+    const count = pDiv.querySelectorAll("[data-clone]").length/2 - 1;
+    const delspan = document.createElement("span");
+    delspan.innerHTML = "&#8854;";
+    delspan.addEventListener("click", function(ev) {
+	const el = this;
+	el.parentElement.parentElement.nextSibling.remove();
+	el.parentElement.parentElement.remove();
+    });
+    delspan.style.color = "red";
+    [el.parentElement.nextElementSibling,
+     el.parentElement.nextElementSibling.nextElementSibling].forEach(function(row,i) {
+	 const nrow = row.cloneNode(true);
+	 const nel = nrow.querySelector("input,textarea");
+	 nel.value = "";
+	 if(nel.onchange)
+	     nel.onchange(nel);
+	 nel.name = nel.name.replace(/(\d+)([^\d]*)$/, function(_,n,g) {
+	     return String(count + 1)+g
+	 });
+	 nrow.setAttribute("data-temp","1");
+	 if (i == 0)
+	     nrow.children[0].prepend(delspan);
+	 pDiv.appendChild(nrow);
+     });
+}
+
+function textAreaAutoSize(element) {
+    element.style.height = "1px";
+    element.style.height = String(4 + element.scrollHeight) + "px";
+}
+function set_deep(obj,prop,val) {
+    /* For the Object obj set the property of a prop to val
+       recursively. example set_deep({a:{b:{c:{"good"}}}},"a-b-c","bad")
+       will return {a:{b:{c:{"bad"}}}} */
+    if(typeof(obj) != "object")
+	return undefined;
+    let fobj = simpleCopy(obj);
+    var x = fobj;
+    let props = prop.split("-");
+    let fprop = props.pop();
+    for(var i=0; i<props.length; i++) {
+	if(props[i] in x) {
+	    x = x[props[i]];
+	    continue;
+	} else {
+	    if(i+1 < props.length) {
+		if (props[i+1].match(/^\d+$/))
+		    x[props[i]] = [];
+		else
+		    x[props[i]] = {};
+	    } else if (fprop.match(/^\d+$/))  {
+		/* Last element and is an array */
+		x[props[i]] = [];
+	    } else {
+		x[props[i]] = {};
+	    }
+	    x = x[props[i]];
+	}
+    }
+    /* If the value is being set to be undefined then delete this property
+       of this object */
+    if(val === undefined) {
+	if (fprop.match(/^\d+$/)) {
+	    x.splice(parseInt(fprop),1);
+	} else {
+	    delete x[fprop];
+	}
+    } else {
+	x[fprop] = val;
+    }
+    return fobj;
+}
+function deepGet(inputs) {
+    let fdp = {};
+    inputs.forEach(function(input) {
+	fdp = set_deep(fdp,input.name,input.value);
+    });
+    if(fdp.obj)
+	return fdp.obj;
+    return {};
+}
+function makeTree(jsonTree) {
+    const clbutton = SSVC.form.parentElement.querySelector("[data-clear]");    
+    jsonTree.mapping = [];
+    jsonTree.mapping = enumerateCombinations(jsonTree);
+    SSVC.form.innerHTML = "";
+    jsonTree.key = uniq_key(jsonTree, SSVC.decision_trees.map(x => x.data),"DT_", 2);
+    createSSVC(jsonTree, false);
+    customize({innerHTML: "Customize"});
+    clbutton.setAttribute("data-changed","1");
+    topalert();
+    topalert("New Decision Tree has Outcomes that are evenly laid out! Please update these " +
+	     "as appropriate for your Decision Model, before Saving it!","warn",0);
+}
+async function deleteDP(el) {
+    const dpName = el.parentElement.childNodes[0].textContent;
+    const confirm = await popupConfirm('Do you want to delete Decision Point "' + dpName + '"');
+    if(confirm == "Yes") {
+	try { 
+	    const delDP = el.parentElement.getAttribute("data-dp");
+	    const alldps = Array.from(SSVC.form.querySelectorAll("main [data-dp]")).map(function(el) { return el.getAttribute("data-dp")});
+	    if(alldps.length < 3) {
+		topalert("Minimum two decision points are needed", "danger");
+		return false;
+	    }
+	    const removedp = JSON.parse(el.parentElement.parentElement.getAttribute("data-help"));
+	    console.log(removedp);
+	    const clbutton = SSVC.form.parentElement.querySelector("[data-clear]");
+	    const jsonTree =  JSON.parse(clbutton.getAttribute("data-json"));
+	    const matched = Object.keys(jsonTree.decision_points).some(function(dpkey) {
+		const dp = jsonTree.decision_points[dpkey];
+		if(match_name_ns_vers({data: dp},removedp)) {
+		    delete jsonTree.decision_points[dpkey];
+		    return true;
+		}
+		return false;
+	    });
+	    if(matched)
+		makeTree(jsonTree);
+	    else
+		throw "Could not delete decision point"; 
+	} catch(err) {
+	    topalert(err,"danger");
+	}
+    }
+}
+function find_key(dp,dt) {
+    /* Find a decision points' key attribute in a decision tree*/
+    if('decision_points' in dt) {
+	for (const [fkey, fdp] of Object.entries(dt.decision_points)) {
+	    if(['name','namespace','version'].every(function(prop) {
+		return prop in fdp && prop in dp && dp[prop] == fdp[prop];
+	    }))
+		return fkey;
+	}
+    }
+    return; 
+}
+function uniq_key(obj, arr, prefix, copyLength) {
+    if(!prefix)
+	prefix = "";
+    if(copyLength && String(copyLength).match(/^[0-9]$/)) {
+	copyLength = parseInt(copyLength);
+    } else {
+	copyLength = 1;
+    }
+    let base = obj.name.normalize("NFD")
+        .replace(/[\u0300-\u036f]/g, "")
+        .replace(/[^a-zA-Z0-9_]/g, "")
+        .toUpperCase();
+
+    if (copyLength && copyLength > 0) {
+        base = base.substring(0, copyLength);
+    }
+
+    if (!base[0] || !/[A-Z0-9]/.test(base[0])) {
+        base = "A" + base; 
+    }
+
+    if (base.length === 0) {
+        base = "A";
+    }
+
+    let xkey = prefix + base;
+    let counter = 0;
+
+    while (arr.findIndex(xdp => xdp.key === xkey) > -1) {
+        counter++;
+        xkey = prefix + base + "_" + counter;
+    }
+
+    return xkey;
+}
+
+function validate_namespace(namespace) {
+    if(!namespace.toLowerCase().startsWith("x_")) {
+	/* Only thing allowed is translation  */
+	if(!namespace.match(/\/[a-z\-0-9]*\//i)) {
+	    alert("Changed Decision Point or Tree Namespace cannot use reserved namespaces. Either use x_com.example#psirt format or a pure translation ssvc/de-DE/ is allowed.");
+	    return false;
+	}
+    }
+    return true;
+}
+function enumerateCombinations(dtree) {
+    const decisionPoints = dtree.decision_points;
+    const outcomeKey = dtree.outcome;
+
+    const relevantPoints = Object.entries(decisionPoints)
+	  .filter(([key]) => key !== outcomeKey);
+
+    const pointsWithValues = relevantPoints.map(([id, dp]) => ({
+	id: id,
+	values: dp.values.map(v => v.key)
+    }));
+
+    function cartesianProduct(index, current, result) {
+	if (index === pointsWithValues.length) {
+	    current[outcomeKey] = "0";
+	    result.push(Object.assign({}, current));
+	    return;
+	}
+
+	const point = pointsWithValues[index];
+	Array.from(point.values).forEach(function (value) {
+	    current[point.id] = value;
+	    cartesianProduct(index + 1, current, result);
+	});
+    }
+
+    const result = [];
+    cartesianProduct(0, {}, result);
+
+    const outcomeValues = decisionPoints[outcomeKey].values.map(v => v.key);
+    const outcomeCount = outcomeValues.length;
+    /* Spread outcome evenly across the results array*/
+    const m = result.length;
+    const n = outcomeValues.length;
+    const blockSize = Math.floor(m / n);
+    let remainder = m % n;
+    
+    let index = 0;
+    for (let i = 0; i < n; i++) {
+	let size = blockSize + (remainder > 0 ? 1 : 0);
+	remainder = Math.max(0, remainder - 1);
+	
+	for (let j = 0; j < size; j++) {
+	    result[index][outcomeKey] = outcomeValues[i];
+	    index++;
+	}
+    }
+    return result;
+}
+
+
+function updateTree() {
+    const clbutton = SSVC.form.parentElement.querySelector("[data-clear]");
+    clbutton.removeAttribute("data-changed")
+    let jsonTree = {};
+    if(clbutton.hasAttribute("data-json")) {
+	jsonTree = JSON.parse(clbutton.getAttribute("data-json"));
+    }
+    const popUp = SSVC.form.parentElement.parentElement.querySelector("[id='ssvcPopup']");
+    const updatebtn = popUp.querySelector("[data-update]");    
+    const dpForm = popUp.querySelector("[data-customdp]")
+	  .querySelector("form");
+    const dpSelect = dpForm.querySelector("select");
+    const dpOutcome = dpSelect.getAttribute("data-outcomeName");
+    let changed = false;
+    const inputs = dpForm.querySelectorAll("input,textarea");
+    let dp = deepGet(inputs);
+    for(let i=0; i<inputs.length; i++) {
+	if(inputs[i].type == "checkbox") continue;
+	if(inputs[i].value == "") {
+	    topalert("All input fields are required for a Decision Point",
+		     "danger");
+	    return;
+	}
+	if(inputs[i].defaultValue && inputs[i].defaultValue != inputs[i].value) {
+	    changed = true;
+	    break;
+	}
+    }
+    let olddp = {};
+    /* Get previous decision point so we can compare it to the current */
+    if(dpSelect.hasAttribute("data-selectdp")) 
+	olddp = JSON.parse(dpSelect
+			   .getAttribute("data-selectdp"));
+    /*Check if this decision point is in our registry */
+    let registered = SSVC.decision_points.some(function(x) {
+	if(match_name_ns_vers(x, dp)) {
+	    dp = x.data;
+	    return true;
+	}
+    });
+    
+    if(changed) {
+	/*Check if it is a translation. */
+	if(!validate_namespace(dp.namespace)) {
+	    return;
+	}
+	/* Add data to dpMap and decision_points of global SSVC data */
+	SSVC.dpMap[dp.name] = {"namespace": dp.namespace, "version": dp.version};
+    } else  {
+	if(match_name_ns_vers({"data": dp}, olddp)) {
+	    alert("Nothing has changed");
+	    return;
+	}
+    }
+    let dpvkeys = {}
+    /* Doube verify and make sure tke key uniqueness */
+    dp.values.forEach(function(val,i) {
+	if(!dp.values[i].key)
+	    dp.values[i].key = uniq_key(val, dp.values);
+	if(dp.values[i].key in dpvkeys)
+	    dp.values[i].key = uniq_key(val, dp.values);
+	dpvkeys[dp.values[i].key] = 1;
+    });
+    popupEnd();
+    let oldKey = find_key(olddp,jsonTree);
+    if(!registered) {
+	/* Enforce unique keys for values*/
+	dp.key = uniq_key(dp, SSVC.decision_points.map(x => x.data));
+	const info = dp.namespace + "/" + name_version(dp);
+	let opt = Array.from(dpSelect.querySelectorAll("option"))
+	    .filter(function(x) {
+		return x.innerText == info
+	    });
+	if(opt.length) {
+	    opt[0].value = JSON.stringify(dp);
+	} else {
+	    opt = new Option(info, JSON.stringify(dp));
+	    dpSelect.appendChild(opt);
+	}
+	SSVC.decision_points.push({"filename": "memory:" + dp.namespace
+				   + dp.name, "data": dp, custom: 1});	
+    }
+    if(oldKey) {
+	/* This is to replace a decision point */
+	const oldvalues = simpleCopy(jsonTree.decision_points[oldKey].values);
+	delete jsonTree.decision_points[oldKey];
+	let newKey = dp.namespace + ":" + dp.key + ":" + dp.version;
+	if(dp.namespace.indexOf("x_") > -1)
+	    newKey = dp.namespace.substr(0,3) + ":" + dp.key + ":" + dp.version;
+	jsonTree.decision_points[newKey] = dp;
+	if(dpOutcome) {
+	    jsonTree.outcome = newKey;
+	} 
+	if (olddp.values && olddp.values.length == dp.values.length) {
+	    /* Leave the Tree Outcomes as-is*/
+	    if(jsonTree.mapping.every(function(tmap,i) {
+		let fI = oldvalues.findIndex(value => value.key == tmap[oldKey])
+		if(fI > -1) {
+		    delete jsonTree.mapping[i][oldKey];
+		    tmap[newKey] = dp.values[fI].key;
+		    return true;
+		}
+		return false;
+	    })) {
+		console.log("success");
+		SSVC.form.innerHTML = "";
+		jsonTree.key = uniq_key(jsonTree, SSVC.decision_trees.map(x => x.data),"DT_", 2);
+		createSSVC(jsonTree, false);
+		customize({innerHTML: "Customize"});
+		clbutton.setAttribute("data-changed","1")
+		return;
+	    } else {
+		console.log("Failed");
+		console.log(jsonTree,dp);
+	    }
+	} 
+    } else if(updatebtn.innerText == "Add") {
+	if(!dp.version)
+	    dp.version = "1.0.0";
+	const newKey = dp.namespace + ":" + dp.key + ":" + dp.version;
+	jsonTree.decision_points[newKey] = dp;
+    } else {
+	topalert("Error: Unable to find if this is a new Decision Point or a replacement",
+		 "danger");
+    }
+    /* Somethings have majorly changed, we have to update the decision tree mappings */
+    makeTree(jsonTree);
+}
+function schemaTransform(dtnew) {
+    const dtobj = simpleCopy(dtnew);
+    const dtold = {};
+    let outcomeName;
+    if('outcome' in dtobj)
+	outcomeName = dtobj.outcome;
+    if('decision_points' in dtobj) {
+	dtold['decision_points'] = [];
+	Object.entries(dtobj['decision_points']).forEach(function([k,dp]) {
+	    dp.decision_type = "simple";
+	    if(k == outcomeName)
+		dp.decision_type = "final";
+	    dp.values.forEach(function(dv) {
+		dv.label = dv.name;
+		delete dv.name;
+	    });
+	    dp.options = dp.values;
+	    delete dp.values;
+	    dp.label = dp.name.replaceAll(",","|");
+	    delete dp.name;
+	    dtold.decision_points.push(dp);
+	});
+    }
+    if('mapping' in dtobj) {
+	dtold['decisions_table'] = [];
+	dtobj.mapping.forEach(function(dvpair) {
+	    const dt = {}
+	    Object.entries(dvpair).forEach(function([k,v]) {
+		const dp = dtnew.decision_points[k];
+		const name = dp.name.replaceAll(",","|");
+		for(let i=0; i< dp.values.length; i++) {
+		    if('key' in dp.values[i] && dp.values[i].key == v)
+			dt[name] = dp.values[i].name;
+		}
+	    });
+	    dtold['decisions_table'].push(dt);
+	});
+    }
+    return dtold;
+
+}
+function import_json(json, name) {
+    /* Convert everything to JSON 2.0.0 schema before loading */
+    let outcomeName = "Priority";
+    if(('schemaVersion' in json) && (json.schemaVersion == "2.0.0")) {
+	if(('outcome' in json) && ('decision_points' in json) &&
+	   (json.outcome in json.decision_points)) {
+	    if('name' in json)
+		name = json.name;
+	    else
+		name = "Custom Uploaded ";
+	    SSVC.form.innerHTML = "";
+	    createSSVC(json, false);
+	    /* Insert a new element in the array*/
+	    let fIndex = SSVC.decision_trees.findIndex(function(dtobj) {
+		return match_name_ns_vers(dtobj,json);
+	    });
+	    if(fIndex < 0) {
+		const newname = name_version(json);
+		Object.values(json.decision_points).forEach(function(newdp) {
+		    if(!(SSVC.decision_points.some(function(dtobj) {
+			return match_name_ns_vers(dtobj,newdp);
+		    }))) {
+			if(!newdp.version)
+			    newdp.version = "1.0.0";
+			SSVC.decision_points.push({data: newdp});
+		    }
+		});
+		selectCustom(newname, json, -1*(SSVC.decision_trees.length));
+		SSVC.decision_trees.push({data:json,displayname: newname});
+	    } else {
+		const select = SSVC.form.parentElement.querySelector("[id='sampletrees']");
+		select.value = fIndex;
+		select.dispatchEvent(new Event('change'));
+		topalert("Imported JSON is already in the registry","warn");
+	    }
+	}
+    } else {
+	topalert("Unknown JSON file format","danger");
+    }
+    
+}
+function simpleCSV(csvString) {
+    const rows = [];
+    let row = [];
+    let value = '';
+    let inQuotes = false;
+
+    for (let i = 0; i < csvString.length; i++) {
+        const char = csvString[i];
+        const nextChar = csvString[i + 1];
+
+        if (char === '"' && inQuotes && nextChar === '"') {
+            value += '"';
+            i++; 
+        } else if (char === '"') {
+            inQuotes = !inQuotes;
+        } else if (char === ',' && !inQuotes) {
+            row.push(value);
+            value = '';
+        } else if ((char === '\n' || char === '\r') && !inQuotes) {
+            if (value || row.length > 0) {
+                row.push(value);
+                rows.push(row);
+                row = [];
+                value = '';
+            }
+            if (char === '\r' && nextChar === '\n') i++;
+        } else {
+            value += char;
+        }
+    }
+
+    if (value || row.length > 0) {
+        row.push(value);
+        rows.push(row);
+    }
+
+    return rows;
+}
+
+function readFile(input) {
+    const file = input.files[0];
+    const reader = new FileReader();
+    const name = file.name;
+    reader.readAsText(file);
+    reader.onload = function() {
+	const data = reader.result;
+	if(data.match(/^\s*\{/)) {
+	    const json = JSON.parse(data);
+	    import_json(json, name);
+	} else {
+	    /* Assume CSV convert it to JSON schema version 2.0.0*/
+	    const rows = simpleCSV(data);
+	    let json = simpleCopy(SSVC.decision_trees[0].data);
+	    json.decision_points = {};
+	    json.mapping = [];
+	    json.name = name.substr(0,name.lastIndexOf('.'));
+	    json.key = uniq_key({name: json.name}, SSVC.decision_trees.map(x => x.data));
+	    json.namespace = SSVC.default_namespace + "/csvupload";
+	    json.definition = json.name + " uploaded as CSV";
+	    let headers = rows.shift();
+	    let hasrowIndex = false;
+	    if(headers[0] == "row") {
+		headers.shift();
+		hasrowIndex = true;
+	    }
+	    let keymap = [];
+	    headers.forEach(function(header,i ) {
+		let head = header;
+		if(header.indexOf(":") > -1)
+		    head = header.split(":")[1];
+		let dpkey = uniq_key({name:head},Object.values(json.decision_points));
+		keymap[i] = json.namespace.substr(0,3) + ":" + dpkey + ":1.0.0";
+		json.decision_points[keymap[i]] = {name: head, namespace: json.namespace,
+						   definition: head,
+						   key: dpkey};
+	    });
+	    json.outcome = keymap.at(-1);
+	    let valueSet = result = Array.from({ length: headers.length }, () => []);
+	    let mapping = [];
+	    rows.forEach(function(row) {
+		let nmap = {}
+		row.forEach(function(value,i) {
+		    if(!valueSet[i].some(function(values) { return values.name == value})) {
+			let mkey = uniq_key({name:value}, valueSet[i]);
+			valueSet[i].push({name: value, definition: value,
+					  key: mkey});
+			nmap[keymap[i]] = mkey; 
+		    } else {
+			let lfind = valueSet[i].find(function(valset) {
+			    return valset.name == value;
+			});
+			nmap[keymap[i]] = lfind.key;
+		    }
+		    
+		});
+		mapping.push(nmap);
+	    });
+	    json.mapping = mapping;
+	    console.log(json,valueSet);
+	    for(let i=0; i<Object.keys(json.decision_points).length; i++)
+		json.decision_points[keymap[i]].values = valueSet[i];
+	    import_json(json, json.name);
+	}
+    };
+    reader.onerror = function() {
+	console.log(reader.error);
+	topalert("Reading data in file as text failed","danger")
+    };
+}
+function computeFI(features,labels) {
+    /* compute feature Importance */
+    /* Decision Tree Classifier */
+    function DecisionTreeClassifier() {
+	this.rules = null;
+
+	this.train = function (features, labels) {
+	    const rules = {};
+	    features.forEach((feature, i) => {
+		const key = feature.join(',');
+		if (!rules[key]) rules[key] = {};
+		rules[key][labels[i]] = (rules[key][labels[i]] || 0) + 1;
+	    });
+
+	    this.rules = {};
+	    for (const key in rules) {
+		const outcomes = rules[key];
+		this.rules[key] = Object.keys(outcomes).reduce((a, b) =>
+		    outcomes[a] > outcomes[b] ? a : b
+		);
+	    }
+	};
+
+	this.predict = function (feature) {
+	    const key = feature.join(',');
+	    return this.rules[key] || 'unknown'; 
+	};
+    }
+
+    /* Calculate Accuracy */
+    function calculateAccuracy(model, features, labels) {
+	const predictions = features.map(row => model.predict(row));
+	const correct = predictions.filter((pred, i) => pred === labels[i]).length;
+	return correct / labels.length;
+    }
+    const classifier = new DecisionTreeClassifier();
+    classifier.train(features, labels);
+    const baselineAccuracy = calculateAccuracy(classifier, features, labels);
+    featureNames = Object.keys(SSVC.decision_table[0]);
+    featureNames.pop()
+    const fI = featureNames.map((feature, index) => {
+	const reducedFeatures = features.map(row => row.filter((_, colIndex) => colIndex !== index));
+
+	const reducedClassifier = new DecisionTreeClassifier();
+	reducedClassifier.train(reducedFeatures, labels);
+
+	const reducedAccuracy = calculateAccuracy(reducedClassifier, reducedFeatures, labels);
+
+	return {
+	    feature,
+	    importance: baselineAccuracy - reducedAccuracy
+	};
+    });
+    return fI;
+}
+function fun_execute(w) {
+    if(w.selectedIndex) {
+	try {
+	    let find_fun = new Function("return " + w.value + "()");
+	    find_fun();
+	} catch(err) {
+	    console.log("Error when trying to find dynamic function ", err);
+	}
+	w.selectedIndex = 0;		
+    }
+}
+const graphModule = (function() {
+    const showFullTree = true;
+    const acolors = [  "#28a745", "#72b741", "#b0c13f", "#e6be3d", "#ffc107",
+		       "#fba145", "#f37d4f", "#e65b53", "#d93f4e", "#dc3545"];
+    const lcolors = {};
+    let raw;
+    let treeData;
+    let selector = '#graph';
+
+
+    function pathclick() {};
+    function showdiv() {};
+    function hidediv() {};
+    function dorightclick() {};
+    function doclick() {};
+    function togglehelp() {};
+
+    function create_raw(dt) {
+	const kmap = {};
+	Object.entries(dt.decision_points).forEach(([k, v]) => {
+	    kmap[k] = v.name;
+	});
+	function find_value(k, dp) {
+	    let dpm = dp.values.find(dpv => dpv.key == k);
+	    if(dpm)
+		return dpm.name;
+	}
+	let thash = {};
+	let dps = Object.keys(dt.decision_points);
+	let yraw = dps.map(x => []);
+	let zraw = [];
+	const final_k = dt.outcome;
+	const dpo = dt.decision_points[final_k];
+	const ocolors = arrayReduce(acolors,dpo.values.length);
+	dpo.values.forEach(function(dpv,i) {
+	    lcolors[dpv.name] = ocolors[i];
+	});
+	dt.decision_points[final_k].values.forEacj
+	const final_keyword = dt.decision_points[final_k].name;
+	const mapping = dt.mapping;
+	let id = 1;
+	for(let i=0; i <dt.mapping.length; i++) {
+	    const lhs = find_value(dt.mapping[i][final_k], dt.decision_points[final_k]);
+	    let tname = lhs +":"+
+		dps.map(t => find_value(dt.mapping[i][t],dt.decision_points[t]))
+		.slice(0,-1).join(":");
+	    for( let j=0; j< dps.length-1; j++) {
+		const tparent = dt.decision_points[dps[dps.length-2-j]].name + ":" +
+		      dps.slice(0,dps.length-2-j).map(q =>
+			  find_value(dt.mapping[i][q],dt.decision_points[q])).join(":");
+		if(!(tname in thash))
+		    var yt = {name:tname.replace(/\:+$/,''),
+			      id:id++,
+			      parent:tparent.replace(/\:+$/,''),
+			      props:"{}",children:[]}
+		else
+		    continue
+		thash[yt.name] = 1;
+		tname = tparent;
+		yraw[j].push(yt);
+	    }
+	}
+	for(var j=yraw.length; j> -1; j--)  {
+	    if(yraw.length > 0)
+		zraw = zraw.concat(yraw[j])
+	}
+	zraw[0] = {name:dt.decision_points[dps[0]].name,id:id+254,children:[],parent:null,props:"{}"}
+	return zraw;
+    }
+
+    function grapharray_open(marray){
+	var map = {};
+	for(var i = 0; i < marray.length; i++){
+	    var obj = marray[i];
+	    obj.children= [];
+
+	    map[obj.name] = obj;
+
+	    var parent = obj.parent || '-';
+	    if(!map[parent]){
+		map[parent] = {
+		    children: []
+		};
+	    }
+	    map[parent].children.push(obj);
+	}
+	return map['-'].children;
+    }
+
+    function draw_graph() {
+	var margin = {top: 20, right: 120, bottom: 20, left: 120},
+	    width = 1060 - margin.right - margin.left,
+	    height = 800 - margin.top - margin.bottom
+	if(showFullTree) {
+	    var add_offset = 0
+	    if(raw.length > 60 )
+		add_offset = (raw.length - 60)*5
+	    height = 1300 - margin.top - margin.bottom + add_offset
+	}
+	duration = 750
+	tree = d3.layout.tree()
+	    .size([height, width]);
+
+	diagonal = d3.svg.diagonal()
+	    .projection(function(d) { return [d.y, d.x]; });
+
+	var default_translate =  "translate(" + margin.left + "," + margin.top + ")"
+	var svg_width = width + margin.right + margin.left
+	var svg_height = height + margin.top + margin.bottom
+	if(window.innerWidth <= 1000) {
+	    default_translate =  "translate(10,0) scale(0.75)"
+	    if(window.innerWidth <= 750)
+		default_translate =  "translate(30,0) scale(0.42)"
+	}
+	let zdiv = $('<div>').css({position: "absolute"});
+	let zinp = $('<input>').attr({type: 'range',
+				      min: '0',
+				      max: '100',
+				      value: '100',
+				      accentColor: 'lightskyblue',
+				      orient: 'vertical',
+				      alt: 'Zoom Graph',
+				      title: 'Zoom Graph'});
+	zinp[0].onclick = function() {
+	    const zf = this.value/this.max;
+	    const fh = parseInt($('svg.mgraph').attr("height"));
+	    const fw = parseInt($('svg.mgraph').attr("width"));
+	    const vbox = "0 0 "+String(parseInt(fw/zf)) + " " + String(parseInt(fh/zf))
+	    $('svg.mgraph').attr('viewBox',vbox);
+	}
+	$(selector).html('').append(zdiv.append(zinp));
+	svg = d3.select(selector).append("svg")
+	    .attr("xmlns","http://www.w3.org/2000/svg")
+	    .attr("preserveAspectRatio","none")
+	    .attr("class","mgraph")
+	    .attr("width", svg_width)
+	    .attr("height", svg_height)
+	    .append("g")
+	    .attr("transform", default_translate)
+	    .attr("id","pgroup");
+
+	root = treeData[0];
+	root.x0 = height / 2;
+	root.y0 = 0;
+
+	update(root)
+
+	d3.select(self.frameElement).style("height", "700px");
+    }
+
+    function update(source) {
+	var i = 0
+	var nodes = tree.nodes(root).reverse()
+	var links = tree.links(nodes)
+
+	nodes.forEach(function(d) { d.y = d.depth * 200;})
+
+	var node = svg.selectAll("g.node")
+	    .data(nodes, function(d) { return d.id || (d.id = ++i); });
+
+	var nodeEnter = node.enter().append("g")
+	    .attr("class", "node bof")
+	    .attr("transform", function(d) {
+		return "translate(" + source.y0 + "," + source.x0 + ")";
+	    })
+	    .attr("class", function(d) {
+		var finale = "";
+		if(!('children' in d))
+		    finale = " finale";
+		if('depth' in d)
+		    return "node depth-"+String(d.depth)+finale;
+		return "node depth-none";})
+	    .on("click", doclick)
+	    .on("contextmenu",dorightclick)
+	    .on("mouseover",showdiv)
+	    .on("mouseout",hidediv);
+	nodeEnter.append("circle")
+	    .attr("r", 1e-6)
+	    .attr("class",function(d, i) {
+		if(!('children' in d))
+		    return "junction gvisible finale ";
+		return "junction gvisible"
+	    })
+	    .style("fill", function(d, i) {
+		if(d._children) return "lightsteelblue"
+		if(!('children' in d)) {
+		    /* Last node no children */
+		    var dname = d.name.split(":").shift();
+		    if(dname in lcolors)
+			return undefined;
+		}
+		return undefined;
+	    }  );
+
+	var font = "20px"
+	if(showFullTree)
+	    font = "18px"
+	nodeEnter.append("text")
+	    .attr("x",function(d) { return check_children(d,"-55","+20") })
+	    .attr("y",function(d) { return check_children(d,"-37","0") })
+	    .attr("dy", ".35em")
+	    .attr("class",function(d) {
+		var fclass = d.name.split(":").shift().toLowerCase();
+		if(!('children' in d))
+		    return "gvisible prechk-"+fclass+" finale";
+		return "gvisible prechk-"+fclass;})
+	    .text(function(d) { return d.name.split(":")[0]; })
+	    .style("font-size",font)
+	    .style("fill", function(d) {
+		var t = d.name.split(":").shift();
+		var x;
+		if(t in lcolors)
+		    x = lcolors[t];
+		return x;
+	    })
+
+	/* hidden circle */
+	nodeEnter.append("circle")
+	    .attr("r","10")
+	    .attr("class","ghidden d-none")
+	    .style("fill","steelblue");
+
+	var nodeUpdate = node.transition()
+	    .duration(duration)
+	    .attr("transform", function(d) { return "translate(" + d.y + "," + d.x + ")"; });
+
+	nodeUpdate.select("circle")
+	    .attr("r", 10)
+	    .attr("sid",function(d) { return d.id;})
+	    .attr("nameid",function(d) { if(!d) return "1";
+					 if(d.name) return d.name.split(":").pop();
+				       })
+	    .style("fill", function(d) {
+		if(d._children) return "lightsteelblue"
+		if(!('children' in d)) {
+		    var dname = d.name.split(":").shift()
+		    if(dname in lcolors)
+			return lcolors[dname];
+		}
+		return undefined;
+	    })
+	    .style("stroke",function(d) {
+		if(!('children' in d)) {
+		    var dname = d.name.split(":").shift()
+		    if(dname in lcolors)
+			return undefined;
+		}
+		return "steelblue";
+	    })
+
+
+	nodeUpdate.select("text")
+	    .style("fill-opacity", 1);
+
+	var nodeExit = node.exit().transition()
+	    .duration(duration)
+	    .attr("transform", function(d) { return "translate(" + source.y + "," + source.x + ")"; })
+	    .remove();
+
+	nodeExit.select("circle")
+	    .attr("r", 1e-6);
+
+	nodeExit.select("text")
+	    .style("fill-opacity", 1e-6);
+
+	var link = svg.selectAll("path.link")
+	    .data(links, function(d) { if(d.target) return d.target.id; })
+	link.enter().insert("path","g")
+	    .style("fill","none").style("stroke", "#ccc").attr("class","link")
+	    .attr("id", function(d) { return 'l'+Math.random().toString(36).substr(3); })
+	    .attr("kdata", function(d) { return d.source.name.split(":").shift(); })
+	    .attr("ldata", function(d) { return d.target.name.split(":").pop(); })
+	    .attr("ldeep", function (d) { return d.target.name.split(":").length })
+	    .attr("csid",function(d) { return d.target.id;})
+	    .attr("d", function(d) {
+		var o = {x: source.x0, y: source.y0};
+		return diagonal({source: o, target: o});
+	    })
+
+	link.transition()
+	    .duration(duration)
+	    .attr("d", diagonal);
+
+	link.exit().transition()
+	    .duration(duration)
+	    .attr("d", function(d) {
+		var o = {x: source.x, y: source.y};
+		return diagonal({source: o, target: o});
+	    })
+	    .remove();
+
+	nodes.forEach(function(d) {
+	    d.x0 = d.x;
+	    d.y0 = d.y;
+	});
+	if(showFullTree === false) {
+	    var d = source;
+	    if(('depth' in d) && (!isNaN(parseInt(d.depth)))) {
+		$('g.depth-'+String(d.depth)+' .ghidden').addClass('d-none');
+		$('g.depth-'+String(d.depth)+' .gvisible').show();
+		$('g.depth-'+String(d.depth)).removeClass('opthide');
+		var idepth = String(parseInt(d.depth) + 1)
+		if($('g.depth-'+idepth).length > 0) {
+		    $('g.depth-'+idepth+' .ghidden').removeClass('d-none');
+		    $('g.depth-'+idepth+' .gvisible').hide();
+		    $('g.depth-'+idepth).addClass('opthide');
+		}
+	    }
+	}
+	setTimeout(update_links,1500);
+	var xMin = d3.min(nodes, function(d) { return d.x; });
+	var xMax = d3.max(nodes, function(d) { return d.x; });
+
+	var yOffset = 90;
+	var xOffset = -xMin + yOffset;
+	svg.attr("transform", "translate(" + 100 + "," + xOffset + ")");
+    }
+    function check_children(d,a,b) {
+	if((d.children) && (d.children.length)) return a
+	if((d._children) && (d._children.length)) return a
+	return b
+    }
+
+    function arrayReduce(arr,n) {
+	if(n > arr.length)
+	    return arr.concat(Array(n-arr.length).fill(arr.at(-1)))
+	return arr.filter(function(_,i) {
+	    if (i === 0 || i === arr.length - 1) return true;
+	    const step = (arr.length-1)/(n-1);
+	    for (let j = 1; j < n - 1; j++)
+		if (Math.round(j * step) === i)
+		    return true;
+	    return false;
+	});
+    }
+    
+    function dt_graph(dt) {
+	raw = create_raw(dt);
+	treeData = grapharray_open(raw);
+	draw_graph();
+    }
+
+    function update_links() {
+	$('.pathlink').remove()
+	var i = 0
+	d3.selectAll("path.link").each(function(w) {
+	    var t = $(this);
+	    var id=t.attr("id");
+	    var xd = t.attr("d")
+	    var csid = t.attr("csid")
+	    var depth = parseInt(t.attr("ldeep")) || 0
+	    var text = t.attr("ldata")
+	    var pname = t.attr("kdata")
+	    var xclass = "btext prechk-"+text
+	    var mclass = $(this).attr("class")
+	    if((mclass) && mclass.indexOf("chosen") > -1) {
+		xclass += " chosen"
+	    }
+	    if(showFullTree)
+		xclass += " fullTree"
+	    d3.select("g")
+		.insert("g","path.link").attr("class","pathlink cdepth-"+String(depth)).attr("id","x"+id)
+		.append("path").attr("d",xd).attr("id","f"+id)
+		.style("fill","none").style("stroke","#ccc")
+		.attr("class","xlink");
+	    var doffset = parseInt(70 - (4-depth)*5.5)
+	    var yoffset = -10
+	    if(showFullTree)
+		yoffset = -6
+	    d3.select("g#x"+id).append("text").attr("dx",-6).attr("dy",yoffset).attr("class","gtext")
+		.append("textPath").attr("href","#f"+id).attr("class",xclass)
+		.attr("text-anchor","middle")
+		.attr("id","t"+id)
+		.attr("csid",csid)
+		.attr("parentname",pname)
+		.text(text).attr("startOffset",doffset+"%")
+		.on("click",pathclick)
+		.on("mouseover",showdiv)
+		.on("mouseout",hidediv);
+	});
+    }
+    function graph_dynamic(input) {
+	const dpContainer = input.parentElement.parentElement.parentElement;
+	const finddpIndex = $(input).data("dpdepth");
+	const nodes = d3.selectAll("g.node.depth-"+String(finddpIndex));
+	function traverse_remove(xnode) {
+	    if(!xnode.__data__) {
+		console.log("Error no nodes to descend!");
+	    }
+	    if(!xnode.__data__._schildren) {
+		console.log("Error no node _schildren data to restore from!");
+	    }
+	    let removeValues = [];
+	    xnode.__data__.children = Array.from(xnode.__data__._schildren);
+	    dpContainer.querySelectorAll("input").forEach(function(cinput) {
+		if(!cinput.checked)
+		    removeValues.push($(cinput).data("dpvdepth"));
+	    });
+	    removeValues.reverse().forEach(function(rindex) {
+		removevalueIndex = parseInt(rindex);
+		xnode.__data__.children.splice(removevalueIndex,1);
+	    });
+	    update(xnode.__data__);
+	}
+	if(nodes.length) {
+	    nodes[0].forEach(function(xnode) {
+		if(xnode.__data__) {
+		    if(xnode.__data__._schildren) {
+			traverse_remove(xnode);
+		    } else if(xnode.__data__.children) {
+			let removevalueIndex = $(input).data("dpvdepth");
+			xnode.__data__._schildren = Array.from(xnode.__data__.children);
+			xnode.__data__.children.splice(removevalueIndex,1);
+			update(xnode.__data__);
+		    }
+		}
+	    });
+	}
+    }
+
+    return {
+	graph_dynamic: graph_dynamic,
+	dt_graph: dt_graph,
+	selector: "#graph",
+	__version__: "1.0.9"
+    };
+})();
+
+
+
diff --git a/docs/tutorials/index.md b/docs/tutorials/index.md
index a5f7513b..0f9d6a0b 100644
--- a/docs/tutorials/index.md
+++ b/docs/tutorials/index.md
@@ -25,6 +25,11 @@ For technical reference, including a list of decision points, see [Reference](..
     The decisions modeled in the calculator are based on the [Supplier](../howto/supplier_tree.md),
     [Deployer](../howto/deployer_tree.md), and [Coordinator](../howto/coordination_intro.md) decision models.
 
+!!! tip "SSVC Policy Explorer"
+
+    Ready to explore analyzing SSVC policies and writing your own policy? [SSVC Policy Explorer](../ssvc-explorer/index.md) to help you understand how SSVC decision models can be developed, organized in an interactive way.
+    The decisions modeled in the policy explorer also use the SSVC Registry. 
+
 SSVC can be used in conjunction with other tools and methodologies to help prioritize vulnerability response.
 
 !!! example "CVSS and SSVC"
diff --git a/mkdocs.yml b/mkdocs.yml
index 4824a4ce..3fa4a8ab 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -133,6 +133,7 @@ nav:
     - Learning SSVC:
         - Tutorials: 'tutorials/index.md'
   - Calculator: 'ssvc-calc/index.md'
+  - Policy Explorer: 'ssvc-explorer/index.md'  
   - About:
     - Intro: 'about/index.md'
     - Community Engagement: 'about/contributing.md'
diff --git a/requirements.txt b/requirements.txt
index ce455ac8..a866d825 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 # This file was autogenerated by uv via the following command:
-#    uv export --project=src -o ./requirements.txt
--e .
+#    uv export --project=src --no-editable -o ./requirements.txt
+.
 annotated-types==0.7.0 \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89

- +	+ + Timestamp: + + + + Include Outcomes + + + + Provide resource information +
- +
+ + For Vulnerability: + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - +	+ + + Include decision tree in export + - - - Include decision tree in export - - - Contact: - - - - JSON - PDF + +