Hybridmodels,deletekeypress added

14 files changed, 1205 insertions, 42 deletions

diff --git a/views/schematic.html b/views/schematic.html
index 0e3165f..cbec32e 100644
--- a/views/schematic.html
+++ b/views/schematic.html
@@ -466,8 +466,26 @@ properties form
 		</fieldset>
 		</td></tr>
 
-		<!-- Digital -->
-		<tr id="webtronics_risedelay"><td>
+		<tr id="webtronics_outundef"><td>
+
+		<fieldset >
+		
+			<legend>Out Uundefined:</legend>    
+			<input id="webtronics_outundef_value" type="text" value="0.5">
+		
+		</fieldset>
+		</td></tr>
+
+
+
+
+		</tbody>
+
+		<!-- Digital Models-->
+
+		<tbody id=digital>
+
+		<tr id="webtronics_risedelay" class="digital"><td>
 		<fieldset>
 		
 			<legend>Rise Delay:</legend>    
@@ -476,7 +494,7 @@ properties form
 		</fieldset>
 		</td></tr>
 
-		<tr id="webtronics_falldelay"><td>
+		<tr id="webtronics_falldelay" class="digital"><td>
 		<fieldset>
 		
 			<legend>Fall Delay:</legend>    
@@ -485,7 +503,7 @@ properties form
 		</fieldset>
 		</td></tr>
 
-		<tr id="webtronics_inputload"><td>
+		<tr id="webtronics_inputload" class="digital"><td>
 		<fieldset>
 		
 			<legend>Input Load:</legend>    
@@ -493,6 +511,130 @@ properties form
 		
 		</fieldset>
 		</td></tr>
+
+		<tr id="webtronics_clkdelay" class="digital"><td>
+		<fieldset>
+		
+			<legend>Clk Delay:</legend>    
+			<input id="webtronics_clkdelay_value" type="text" value="1.0e-9">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_setdelay" class="digital"><td>
+		<fieldset>
+		
+			<legend>Set Delay:</legend>    
+			<input id="webtronics_setdelay_value" type="text" value="1.0e-9">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_resetdelay" class="digital"><td>
+		<fieldset>
+		
+			<legend>Reset Delay:</legend>    
+			<input id="webtronics_resetdelay_value" type="text" value="1.0">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_datadelay" class="digital"><td>
+		<fieldset>
+		
+			<legend>Data Delay:</legend>    
+			<input id="webtronics_datadelay_value" type="text" value="1.0">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_enabledelay" class="digital"><td>
+		<fieldset>
+		
+			<legend>Enable Delay:</legend>    
+			<input id="webtronics_enabledelay_value" type="text" value="1.0">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_srdelay" class="digital"><td>
+		<fieldset>
+		
+			<legend>SR Delay:</legend>    
+			<input id="webtronics_srdelay_value" type="text" value="1.0">		
+		</fieldset>
+		</td></tr>
+
+
+
+		<tr id="webtronics_ic" class="digital"> <td>
+		<fieldset>
+		
+			<legend>Ic:</legend>    
+			<input id="webtronics_ic_value" type="text" value="0">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_dataload" class="digital"><td>
+		<fieldset>
+		
+			<legend>Data Load:</legend>    
+			<input id="webtronics_dataload_value" type="text" value="1.0e-12">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_jkload" class="digital"><td>
+		<fieldset>
+		
+			<legend>JK Load:</legend>    
+			<input id="webtronics_jkload_value" type="text" value="1.0e-12">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_tload" class="digital"><td>
+		<fieldset>
+		
+			<legend>T Load:</legend>    
+			<input id="webtronics_tload_value" type="text" value="1.0e-12">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_srload" class="digital"><td>
+		<fieldset>
+		
+			<legend>SR Load:</legend>    
+			<input id="webtronics_srload_value" type="text" value="1.0e-12">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_clkload" class="digital"><td>
+		<fieldset>
+		
+			<legend>Clk Load:</legend>    
+			<input id="webtronics_clkload_value" type="text" value="1.0e-12">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_setload" class="digital"><td>
+		<fieldset>
+		
+			<legend>Set Load:</legend>    
+			<input id="webtronics_setload_value" type="text" value="1.0e-12">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_resetload" class="digital"><td>
+		<fieldset>
+		
+			<legend>Reset Load:</legend>    
+			<input id="webtronics_resetload_value" type="text" value="1.0e-12">		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_enableload" class="digital"><td>
+		<fieldset>
+		
+			<legend>Enable Load:</legend>    
+			<input id="webtronics_enableload_value" type="text" value="1.0e-12">		
+		</fieldset>
+		</td></tr>
+
+
 		</tbody>
 
 		<tbody id="analogs">
@@ -937,14 +1079,14 @@ properties form
 		<fieldset>
 		
 			<legend>Outputlowvalue:</legend>    
-			<input id="webtronics_outlow_value" type="text" value="-1.0">
+			<input id="webtronics_outlow_value" type="text" value="0.0">
 		
 		</fieldset>
 		</td></tr>
 		<tr id="webtronics_outhigh" class="analog"><td>
 		<fieldset>
 		
-			<legend>OutputHighvalue:</legend>    
+			<legend>Output Highvalue:</legend>    
 			<input id="webtronics_outhigh_value" type="text" value="1.0">
 		
 		</fieldset>
@@ -953,7 +1095,7 @@ properties form
 		<tr id="webtronics_cntlarr" class="analog"><td>
 		<fieldset>
 		
-			<legend>ControlArray:</legend>    
+			<legend>Control Array:</legend>    
 			<input id="webtronics_cntlarr_value" type="text" value="0.0">
 		
 		</fieldset>
@@ -961,7 +1103,7 @@ properties form
 		<tr id="webtronics_freqarr" class="analog"><td>
 		<fieldset>
 		
-			<legend>FrequencyArray:</legend>    
+			<legend>Frequency Array:</legend>    
 			<input id="webtronics_freqarr_value" type="text" value="1.0e3">
 		
 		</fieldset>
@@ -969,7 +1111,7 @@ properties form
 		<tr id="webtronics_duty" class="analog"><td>
 		<fieldset>
 		
-			<legend>DutyCycle:</legend>    
+			<legend>Duty Cycle:</legend>    
 			<input id="webtronics_duty_value" type="text" value="0.5">
 		
 		</fieldset>
@@ -1086,7 +1228,6 @@ properties form
 		</td></tr>
 		</tbody>
 
-
 		</table>
 
 		<!--**OPEN LOCAL SPICE MODELS EXPERIMENT<input id="webtronics_part_file" type="file"/>-->
diff --git a/views/script/gui.js b/views/script/gui.js
index e686d49..a9ea209 100644
--- a/views/script/gui.js
+++ b/views/script/gui.js
@@ -24,7 +24,7 @@ var webtronics={
 

   Vlist:/\s*expression|\s*url|.*script/,

   Alist:/^(x|y|x1|y1|x2|y2|dx|dy|cx|cy|r|width|height|style|transform|d|id|xml:space|class|fill|stroke|text-anchor|visibility|fill-opacity|stroke-linejoin|stroke-linecap|stroke-opacity|stroke-width|xmlns|xmlns:wtx|connects|partvalue|flippable|spice|index|font-size|font-weight|font-style|font-family)$/,

-  Elist:/^(path|circle|rect|line|text|g|tspan|svg|wtx:limitswitch|wtx:irev|wtx:rbreak|wtx:inoffset|wtx:gain|wtx:outoffset|wtx:ingain|wtx:outgain|wtx:denoffset|wtx:dengain|wtx:numoffset|wtx:numgain|wtx:fraction|wtx:dendomain|wtx:denlowerlimit|wtx:outlowerlimit|wtx:outupperlimit|wtx:limitrange|wtx:upperdelta|wtx:lowerdelta|wtx:indomain|wtx:xarr|wtx:yarr|wtx:amodel|wtx:coff|wtx:con|wtx:roff|wtx:ron|wtx:log|wtx:vbreak|wtx:ibreak|wtx:isat|wtx:nfor|wtx:rsource|wtx:rsink|wtx:ilimitsource|wtx:ilimitsink|wtx:vpwr|wtx:isource|wtx:isink|wtx:routdomain|wtx:inlow|wtx:inhigh|wtx:hyst|wtx:outic|wtx:numcoeff|wtx:dencoeff|wtx:intic|wtx:denormfreq|wtx:riseslope|wtx:fallslope|wtx:outlow|wtx:outhigh|wtx:cntlarr|wtx:freqarr|wtx:duty|wtx:risetime|wtx:falltime|wtx:clktrig|wtx:pwarr|wtx:ptrig|wtx:rdelay|wtx:fdelay|wtx:rmax|wtx:rmin|wtx:rinit|wtx:vt|wtx:alpha|wtx:beta|wtx:eval1|wtx:eval2|wtx:eval3|wtx:eval4|wtx:eval5|wtx:eval6|wtx:pwlval1|wtx:pwlval2|wtx:pwlval3|wtx:pwlval4|wtx:pwlval5|wtx:pwlval6|wtx:pwlval7|wtx:pwlval8|wtx:pulval1|wtx:pulval2|wtx:pulval3|wtx:pulval4|wtx:pulval5|wtx:pulval6|wtx:pulval7|wtx:amplitude|wtx:phase|wtx:offsetvoltage|wtx:voltageamplitude|wtx:frequency|wtx:delaytime|wtx:dampingfactor|wtx:part|wtx:pins|wtx:analog|wtx:digital|wtx:node|wtx:id|wtx:type|wtx:name|wtx:category|wtx:value|wtx:label|wtx:spice|wtx:risedelay|wtx:inputload|wtx:falldelay|wtx:flip|wtx:model|wtx:measure|metadata|)$/,

+  Elist:/^(path|circle|rect|line|text|g|tspan|svg|wtx:limitswitch|wtx:irev|wtx:rbreak|wtx:inoffset|wtx:gain|wtx:outoffset|wtx:outundef|wtx:ingain|wtx:outgain|wtx:denoffset|wtx:dengain|wtx:numoffset|wtx:numgain|wtx:fraction|wtx:dendomain|wtx:denlowerlimit|wtx:outlowerlimit|wtx:outupperlimit|wtx:limitrange|wtx:upperdelta|wtx:lowerdelta|wtx:indomain|wtx:xarr|wtx:yarr|wtx:amodel|wtx:coff|wtx:con|wtx:roff|wtx:ron|wtx:log|wtx:vbreak|wtx:ibreak|wtx:isat|wtx:nfor|wtx:rsource|wtx:rsink|wtx:ilimitsource|wtx:ilimitsink|wtx:vpwr|wtx:isource|wtx:isink|wtx:routdomain|wtx:inlow|wtx:inhigh|wtx:hyst|wtx:outic|wtx:numcoeff|wtx:dencoeff|wtx:intic|wtx:denormfreq|wtx:riseslope|wtx:fallslope|wtx:outlow|wtx:outhigh|wtx:cntlarr|wtx:freqarr|wtx:duty|wtx:risetime|wtx:falltime|wtx:clktrig|wtx:pwarr|wtx:ptrig|wtx:rdelay|wtx:fdelay|wtx:rmax|wtx:rmin|wtx:rinit|wtx:vt|wtx:alpha|wtx:beta|wtx:eval1|wtx:eval2|wtx:eval3|wtx:eval4|wtx:eval5|wtx:eval6|wtx:pwlval1|wtx:pwlval2|wtx:pwlval3|wtx:pwlval4|wtx:pwlval5|wtx:pwlval6|wtx:pwlval7|wtx:pwlval8|wtx:pulval1|wtx:pulval2|wtx:pulval3|wtx:pulval4|wtx:pulval5|wtx:pulval6|wtx:pulval7|wtx:amplitude|wtx:phase|wtx:offsetvoltage|wtx:voltageamplitude|wtx:frequency|wtx:delaytime|wtx:dampingfactor|wtx:part|wtx:pins|wtx:analog|wtx:digital|wtx:node|wtx:id|wtx:type|wtx:name|wtx:category|wtx:value|wtx:label|wtx:spice|wtx:risedelay|wtx:inputload|wtx:falldelay|wtx:flip|wtx:model|wtx:measure|metadata|)$/,

   /* .lib files contain spice .model devices .mod devices contain .subckt devices and the id must begin with x*/

 //	serverurls:["http://logical.github.io/webtronix/webtronix_server"],

  	serverurls:["webtronix_server"],

@@ -155,6 +155,7 @@ openProperties:function(){
  var type=netlistcreator.readwtx(this.circuit.selected[0],"type");

 var category=netlistcreator.readwtx(this.circuit.selected[0],"category");

 jQuery(".analog").hide();

+jQuery(".digital").hide();

          $("models").style.display='block'

 

 	$("webtronics_risedelay").style.display='none';

@@ -499,7 +500,237 @@ jQuery(".analog").hide();
     $("webtronics_amplitude").style.display='none'

     $("webtronics_phase").style.display='none'

   }

-  

+

+  else if(category=="digitalmodels")

+  {

+    $("models").style.display='none'

+    if(c=="dff"){

+      $("webtronics_clkdelay").style.display='block'

+      $("webtronics_setdelay").style.display='block'

+      $("webtronics_resetdelay").style.display='block'

+      $("webtronics_ic").style.display='block'

+      $("webtronics_dataload").style.display='block'

+      $("webtronics_clkload").style.display='block'

+      $("webtronics_setload").style.display='block'

+      $("webtronics_resetload").style.display='block'

+      $("webtronics_risedelay").style.display='block'

+      $("webtronics_falldelay").style.display='block'

+

+      var clkdelay = netlistcreator.readwtx(this.circuit.selected[0],"clkdelay");

+      if(clkdelay!=""){$(webtronics_clkdelay_value).value=clkdelay;}

+      var setdelay = netlistcreator.readwtx(this.circuit.selected[0],"setdelay");

+      if(setdelay!=""){$(webtronics_setdelay_value).value=setdelay;}

+      var resetdelay = netlistcreator.readwtx(this.circuit.selected[0],"resetdelay");

+      if(resetdelay!=""){$(webtronics_resetdelay_value).value=resetdelay;}

+      var ic = netlistcreator.readwtx(this.circuit.selected[0],"ic");

+      if(ic!=""){$(webtronics_ic_value).value=ic;}

+      var dataload = netlistcreator.readwtx(this.circuit.selected[0],"dataload");

+      if(dataload!=""){$(webtronics_dataload_value).value=dataload;}

+      var clkload = netlistcreator.readwtx(this.circuit.selected[0],"clkload");

+      if(clkload!=""){$(webtronics_clkload_value).value=clkload;}

+      var setload = netlistcreator.readwtx(this.circuit.selected[0],"setload");

+      if(setload!=""){$(webtronics_setload_value).value=setload;}

+      var resetload = netlistcreator.readwtx(this.circuit.selected[0],"resetload");

+      if(resetload!=""){$(webtronics_resetload_value).value=resetload;}

+      var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay");

+      if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;}

+      var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay");

+      if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;}

+    }

+

+    if(c=="jkff"){

+      $("webtronics_clkdelay").style.display='block'

+      $("webtronics_setdelay").style.display='block'

+      $("webtronics_resetdelay").style.display='block'

+      $("webtronics_ic").style.display='block'

+      $("webtronics_jkload").style.display='block'

+      $("webtronics_clkload").style.display='block'

+      $("webtronics_setload").style.display='block'

+      $("webtronics_resetload").style.display='block'

+      $("webtronics_risedelay").style.display='block'

+      $("webtronics_falldelay").style.display='block'

+

+      var clkdelay = netlistcreator.readwtx(this.circuit.selected[0],"clkdelay");

+      if(clkdelay!=""){$(webtronics_clkdelay_value).value=clkdelay;}

+      var setdelay = netlistcreator.readwtx(this.circuit.selected[0],"setdelay");

+      if(setdelay!=""){$(webtronics_setdelay_value).value=setdelay;}

+      var resetdelay = netlistcreator.readwtx(this.circuit.selected[0],"resetdelay");

+      if(resetdelay!=""){$(webtronics_resetdelay_value).value=resetdelay;}

+      var ic = netlistcreator.readwtx(this.circuit.selected[0],"ic");

+      if(ic!=""){$(webtronics_ic_value).value=ic;}

+      var jkload = netlistcreator.readwtx(this.circuit.selected[0],"jkload");

+      if(jkload!=""){$(webtronics_jkload_value).value=jkload;}

+      var clkload = netlistcreator.readwtx(this.circuit.selected[0],"clkload");

+      if(clkload!=""){$(webtronics_clkload_value).value=clkload;}

+      var setload = netlistcreator.readwtx(this.circuit.selected[0],"setload");

+      if(setload!=""){$(webtronics_setload_value).value=setload;}

+      var resetload = netlistcreator.readwtx(this.circuit.selected[0],"resetload");

+      if(resetload!=""){$(webtronics_resetload_value).value=resetload;}

+      var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay");

+      if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;}

+      var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay");

+      if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;}

+    }

+

+    if(c=="tff"){

+      $("webtronics_clkdelay").style.display='block'

+      $("webtronics_setdelay").style.display='block'

+      $("webtronics_resetdelay").style.display='block'

+      $("webtronics_ic").style.display='block'

+      $("webtronics_tload").style.display='block'

+      $("webtronics_clkload").style.display='block'

+      $("webtronics_setload").style.display='block'

+      $("webtronics_resetload").style.display='block'

+      $("webtronics_risedelay").style.display='block'

+      $("webtronics_falldelay").style.display='block'

+

+      var clkdelay = netlistcreator.readwtx(this.circuit.selected[0],"clkdelay");

+      if(clkdelay!=""){$(webtronics_clkdelay_value).value=clkdelay;}

+      var setdelay = netlistcreator.readwtx(this.circuit.selected[0],"setdelay");

+      if(setdelay!=""){$(webtronics_setdelay_value).value=setdelay;}

+      var resetdelay = netlistcreator.readwtx(this.circuit.selected[0],"resetdelay");

+      if(resetdelay!=""){$(webtronics_resetdelay_value).value=resetdelay;}

+      var ic = netlistcreator.readwtx(this.circuit.selected[0],"ic");

+      if(ic!=""){$(webtronics_ic_value).value=ic;}

+      var tload = netlistcreator.readwtx(this.circuit.selected[0],"tload");

+      if(tload!=""){$(webtronics_tload_value).value=tload;}

+      var clkload = netlistcreator.readwtx(this.circuit.selected[0],"clkload");

+      if(clkload!=""){$(webtronics_clkload_value).value=clkload;}

+      var setload = netlistcreator.readwtx(this.circuit.selected[0],"setload");

+      if(setload!=""){$(webtronics_setload_value).value=setload;}

+      var resetload = netlistcreator.readwtx(this.circuit.selected[0],"resetload");

+      if(resetload!=""){$(webtronics_resetload_value).value=resetload;}

+      var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay");

+      if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;}

+      var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay");

+      if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;}

+    }

+

+    if(c=="srff"){

+      $("webtronics_clkdelay").style.display='block'

+      $("webtronics_setdelay").style.display='block'

+      $("webtronics_resetdelay").style.display='block'

+      $("webtronics_ic").style.display='block'

+      $("webtronics_srload").style.display='block'

+      $("webtronics_clkload").style.display='block'

+      $("webtronics_setload").style.display='block'

+      $("webtronics_resetload").style.display='block'

+      $("webtronics_risedelay").style.display='block'

+      $("webtronics_falldelay").style.display='block'

+

+      var clkdelay = netlistcreator.readwtx(this.circuit.selected[0],"clkdelay");

+      if(clkdelay!=""){$(webtronics_clkdelay_value).value=clkdelay;}

+      var setdelay = netlistcreator.readwtx(this.circuit.selected[0],"setdelay");

+      if(setdelay!=""){$(webtronics_setdelay_value).value=setdelay;}

+      var resetdelay = netlistcreator.readwtx(this.circuit.selected[0],"resetdelay");

+      if(resetdelay!=""){$(webtronics_resetdelay_value).value=resetdelay;}

+      var ic = netlistcreator.readwtx(this.circuit.selected[0],"ic");

+      if(ic!=""){$(webtronics_ic_value).value=ic;}

+      var srload = netlistcreator.readwtx(this.circuit.selected[0],"srload");

+      if(srload!=""){$(webtronics_srload_value).value=srload;}

+      var clkload = netlistcreator.readwtx(this.circuit.selected[0],"clkload");

+      if(clkload!=""){$(webtronics_clkload_value).value=clkload;}

+      var setload = netlistcreator.readwtx(this.circuit.selected[0],"setload");

+      if(setload!=""){$(webtronics_setload_value).value=setload;}

+      var resetload = netlistcreator.readwtx(this.circuit.selected[0],"resetload");

+      if(resetload!=""){$(webtronics_resetload_value).value=resetload;}

+      var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay");

+      if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;}

+      var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay");

+      if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;}

+    }

+

+    if(c=="dlatch"){

+      $("webtronics_datadelay").style.display='block'

+      $("webtronics_setdelay").style.display='block'

+      $("webtronics_resetdelay").style.display='block'

+      $("webtronics_ic").style.display='block'

+      $("webtronics_enabledelay").style.display='block'

+      $("webtronics_dataload").style.display='block'

+      $("webtronics_enableload").style.display='block'

+      $("webtronics_setload").style.display='block'

+      $("webtronics_resetload").style.display='block'

+      $("webtronics_risedelay").style.display='block'

+      $("webtronics_falldelay").style.display='block'

+

+      var datadelay = netlistcreator.readwtx(this.circuit.selected[0],"datadelay");

+      if(datadelay!=""){$(webtronics_datadelay_value).value=datadelay;}

+      var setdelay = netlistcreator.readwtx(this.circuit.selected[0],"setdelay");

+      if(setdelay!=""){$(webtronics_setdelay_value).value=setdelay;}

+      var resetdelay = netlistcreator.readwtx(this.circuit.selected[0],"resetdelay");

+      if(resetdelay!=""){$(webtronics_resetdelay_value).value=resetdelay;}

+      var ic = netlistcreator.readwtx(this.circuit.selected[0],"ic");

+      if(ic!=""){$(webtronics_ic_value).value=ic;}

+      var enabledelay = netlistcreator.readwtx(this.circuit.selected[0],"enabledelay");

+      if(enabledelay!=""){$(webtronics_enabledelay_value).value=enabledelay;}

+      var dataload = netlistcreator.readwtx(this.circuit.selected[0],"dataload");

+      if(dataload!=""){$(webtronics_dataload_value).value=dataload;}

+      var enableload = netlistcreator.readwtx(this.circuit.selected[0],"enableload");

+      if(enableload!=""){$(webtronics_enableload_value).value=enableload;}

+      var setload = netlistcreator.readwtx(this.circuit.selected[0],"setload");

+      if(setload!=""){$(webtronics_setload_value).value=setload;}

+      var resetload = netlistcreator.readwtx(this.circuit.selected[0],"resetload");

+      if(resetload!=""){$(webtronics_resetload_value).value=resetload;}

+      var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay");

+      if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;}

+      var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay");

+      if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;}

+    }

+

+    if(c=="srlatch"){

+      $("webtronics_srdelay").style.display='block'

+      $("webtronics_setdelay").style.display='block'

+      $("webtronics_resetdelay").style.display='block'

+      $("webtronics_ic").style.display='block'

+      $("webtronics_enabledelay").style.display='block'

+      $("webtronics_srload").style.display='block'

+      $("webtronics_enableload").style.display='block'

+      $("webtronics_setload").style.display='block'

+      $("webtronics_resetload").style.display='block'

+      $("webtronics_risedelay").style.display='block'

+      $("webtronics_falldelay").style.display='block'

+

+      var srdelay = netlistcreator.readwtx(this.circuit.selected[0],"srdelay");

+      if(srdelay!=""){$(webtronics_srdelay_value).value=srdelay;}

+      var setdelay = netlistcreator.readwtx(this.circuit.selected[0],"setdelay");

+      if(setdelay!=""){$(webtronics_setdelay_value).value=setdelay;}

+      var resetdelay = netlistcreator.readwtx(this.circuit.selected[0],"resetdelay");

+      if(resetdelay!=""){$(webtronics_resetdelay_value).value=resetdelay;}

+      var ic = netlistcreator.readwtx(this.circuit.selected[0],"ic");

+      if(ic!=""){$(webtronics_ic_value).value=ic;}

+      var enabledelay = netlistcreator.readwtx(this.circuit.selected[0],"enabledelay");

+      if(enabledelay!=""){$(webtronics_enabledelay_value).value=enabledelay;}

+      var srload = netlistcreator.readwtx(this.circuit.selected[0],"srload");

+      if(srload!=""){$(webtronics_srload_value).value=srload;}

+      var enableload = netlistcreator.readwtx(this.circuit.selected[0],"enableload");

+      if(enableload!=""){$(webtronics_enableload_value).value=enableload;}

+      var setload = netlistcreator.readwtx(this.circuit.selected[0],"setload");

+      if(setload!=""){$(webtronics_setload_value).value=setload;}

+      var resetload = netlistcreator.readwtx(this.circuit.selected[0],"resetload");

+      if(resetload!=""){$(webtronics_resetload_value).value=resetload;}

+      var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay");

+      if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;}

+      var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay");

+      if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;}

+    }

+

+

+ if(c=='and'|| c=='not'|| c=='nand'|| c=='or'||c=='nor'||c=='xor'||c=='xnor')

+    {

+

+  $("webtronics_risedelay").style.display='block';

+   $("webtronics_falldelay").style.display='block';

+  $("webtronics_inputload").style.display='block';

+      var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay");

+      if(risedelay!=""){$(webtronics_part_risedelay).value=risedelay;}

+      var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay");

+      if(falldelay!=""){$(webtronics_part_falldelay).value=falldelay;}

+       var inputload = netlistcreator.readwtx(this.circuit.selected[0],"inputload");

+      if(inputload!=""){$(webtronics_part_inputload).value=inputload;}

+

+    }

+  }

+

   else if(category=="analogmodels"){

          $("models").style.display='none'

          if(c=="gains"){

@@ -960,25 +1191,81 @@ jQuery(".analog").hide();
     var value=netlistcreator.readwtx(this.circuit.selected[0],"value");

     if(value!=""){$('webtronics_part_value').value=value;}

 

-    if(c=='and'|| c=='not'|| c=='nand'|| c=='or'||c=='nor'||c=='xor'||c=='xnor')

+    if(c=="dac_bridge")

+    {

+         $("webtronics_outlow").style.display='table-row'

+        $("webtronics_outhigh").style.display='table-row'

+        $("webtronics_outundef").style.display='table-row'

+        $("webtronics_inputload").style.display='block';

+         $("webtronics_falltime").style.display='table-row'

+        $("webtronics_risetime").style.display='table-row'

+        $("valuemodel").style.display='none'

+        var outlow = netlistcreator.readwtx(this.circuit.selected[0],"outlow");

+        if(outlow!=""){$(webtronics_outlow_value).value=outlow;}

+        var outhigh = netlistcreator.readwtx(this.circuit.selected[0],"outhigh");

+        if(outhigh!=""){$(webtronics_outhigh_value).value=outhigh;}

+        var outundef = netlistcreator.readwtx(this.circuit.selected[0],"outundef");

+        if(outundef!=""){$(webtronics_outundef_value).value=outundef;}

+        var inputload = netlistcreator.readwtx(this.circuit.selected[0],"inputload");

+        if(inputload!=""){$(webtronics_inputload_value).value=inputload;}

+        var risetime = netlistcreator.readwtx(this.circuit.selected[0],"risetime");

+        if(risetime!=""){$(webtronics_risetime_value).value=risetime;}

+        var falltime = netlistcreator.readwtx(this.circuit.selected[0],"falltime");

+        if(falltime!=""){$(webtronics_falltime_value).value=falltime;}

+        

+    }

+

+    if(c=="adc_bridge")

     {

+        $("webtronics_outundef").style.display='none'

+        $("webtronics_inlow").style.display='table-row'

+        $("webtronics_inhigh").style.display='table-row'

+        $("webtronics_risedelay").style.display='block';

+        $("webtronics_falldelay").style.display='block';

+        $("valuemodel").style.display='none'

+        var inlow = netlistcreator.readwtx(this.circuit.selected[0],"inlow");

+        if(inlow!=""){$(webtronics_inlow_value).value=inlow;}

+        var inhigh = netlistcreator.readwtx(this.circuit.selected[0],"inhigh");

+        if(inhigh!=""){$(webtronics_inhigh_value).value=inhigh;}

+        var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay");

+        if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;}

+        var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay");

+        if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;}

 

-	$("webtronics_risedelay").style.display='block';

-	 $("webtronics_falldelay").style.display='block';

-	$("webtronics_inputload").style.display='block';

-      var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay");

-      if(risedelay!=""){$(webtronics_part_risedelay).value=risedelay;}

-      var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay");

-      if(falldelay!=""){$(webtronics_part_falldelay).value=falldelay;}

-	var inputload = netlistcreator.readwtx(this.circuit.selected[0],"inputload");

-      if(inputload!=""){$(webtronics_part_inputload).value=inputload;}

+

+        

 

     }

 

+    if(c=="cdo")

+    {

+       $("webtronics_cntlarr").style.display='table-row'

+        $("webtronics_freqarr").style.display='table-row'

+        $("webtronics_duty").style.display='table-row'

+        $("webtronics_phase").style.display='table-row'

+        $("webtronics_risedelay").style.display='block';

+       $("webtronics_falldelay").style.display='block';

+       $("valuemodel").style.display='none';

+       $("webtronics_outundef").style.display='none'

+

+      var cntlarr = netlistcreator.readwtx(this.circuit.selected[0],"cntlarr");

+      if(cntlarr!=""){$(webtronics_cntlarr_value).value=cntlarr;}

+      var freqarr = netlistcreator.readwtx(this.circuit.selected[0],"freqarr");

+      if(freqarr!=""){$(webtronics_freqarr_value).value=freqarr;}

+      var duty = netlistcreator.readwtx(this.circuit.selected[0],"duty");

+      if(duty!=""){$(webtronics_duty_value).value=duty;}

+      var phase = netlistcreator.readwtx(this.circuit.selected[0],"phase");

+      if(phase!=""){$(webtronics_phase_value).value=phase;}

+      var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay");

+      if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;}

+      var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay");

+      if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;}

+    }   

+

   }

 

     if(category=="mosfets"||category=="transistors"){

-  $("directive").style.display='block';

+    $("directive").style.display='block';

 

   }

   if(c=="diode")$("directive").style.display='block'

@@ -1137,7 +1424,16 @@ file_new:function(){
      }

    }.bind(this));

     

-    

+    Event.observe(this.circuit.container,'keydown',function(e){

+    if(e.keyCode == 46) {

+       // alert('Delete Key Pressed');

+        webtronics.circuit.clearinfo();

+      webtronics.circuit.addhistory();

+      webtronics.circuit.deleteSelection();

+    }

+

+   }.bind(this));

+

   },

   

   formatnetlist:function(spice1,spice2){

@@ -1499,6 +1795,15 @@ if($("webtronics_select"))Event.observe($('webtronics_select'), 'click', functio
       webtronics.circuit.addhistory();

       webtronics.circuit.deleteSelection();

     });

+

+    Event.observe($(document), 'keydown', function(e) {

+    if(e.keyCode == 46) {  

+      webtronics.circuit.clearinfo();

+      webtronics.circuit.addhistory();

+      webtronics.circuit.deleteSelection();

+        }

+    });

+

 /*

 		  if($('webtronics_save')){

  		    Event.observe($('webtronics_save'), 'click', function() {

@@ -1965,6 +2270,111 @@ else if(modelname=="oneshot"){
     netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value);

     netlistcreator.writewtx(model,"inputload",$('webtronics_inputload_value').value);

   }

+  else if(modelname=="dff"){

+    netlistcreator.writewtx(model,"clkdelay",$('webtronics_clkdelay_value').value);

+    netlistcreator.writewtx(model,"setdelay",$('webtronics_setdelay_value').value);

+    netlistcreator.writewtx(model,"resetdelay",$('webtronics_resetdelay_value').value);

+    netlistcreator.writewtx(model,"ic",$('webtronics_ic_value').value);

+    netlistcreator.writewtx(model,"dataload",$('webtronics_dataload_value').value);

+    netlistcreator.writewtx(model,"clkload",$('webtronics_clkload_value').value);

+    netlistcreator.writewtx(model,"setload",$('webtronics_seload_value').value);

+    netlistcreator.writewtx(model,"resetload",$('webtronics_resetload_value').value);

+    netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value);

+    netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value);

+    

+  }

+  else if(modelname=="jkff"){

+    netlistcreator.writewtx(model,"clkdelay",$('webtronics_clkdelay_value').value);

+    netlistcreator.writewtx(model,"setdelay",$('webtronics_setdelay_value').value);

+    netlistcreator.writewtx(model,"resetdelay",$('webtronics_resetdelay_value').value);

+    netlistcreator.writewtx(model,"ic",$('webtronics_ic_value').value);

+    netlistcreator.writewtx(model,"jkload",$('webtronics_jkload_value').value);

+    netlistcreator.writewtx(model,"clkload",$('webtronics_clkload_value').value);

+    netlistcreator.writewtx(model,"setload",$('webtronics_seload_value').value);

+    netlistcreator.writewtx(model,"resetload",$('webtronics_resetload_value').value);

+    netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value);

+    netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value);

+  }

+  else if(modelname=="tff"){

+    netlistcreator.writewtx(model,"clkdelay",$('webtronics_clkdelay_value').value);

+    netlistcreator.writewtx(model,"setdelay",$('webtronics_setdelay_value').value);

+    netlistcreator.writewtx(model,"resetdelay",$('webtronics_resetdelay_value').value);

+    netlistcreator.writewtx(model,"ic",$('webtronics_ic_value').value);

+    netlistcreator.writewtx(model,"tload",$('webtronics_tload_value').value);

+    netlistcreator.writewtx(model,"clkload",$('webtronics_clkload_value').value);

+    netlistcreator.writewtx(model,"setload",$('webtronics_seload_value').value);

+    netlistcreator.writewtx(model,"resetload",$('webtronics_resetload_value').value);

+    netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value);

+    netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value);

+  }

+  else if(modelname=="srff"){

+    netlistcreator.writewtx(model,"clkdelay",$('webtronics_clkdelay_value').value);

+    netlistcreator.writewtx(model,"setdelay",$('webtronics_setdelay_value').value);

+    netlistcreator.writewtx(model,"resetdelay",$('webtronics_resetdelay_value').value);

+    netlistcreator.writewtx(model,"ic",$('webtronics_ic_value').value);

+    netlistcreator.writewtx(model,"srload",$('webtronics_srload_value').value);

+    netlistcreator.writewtx(model,"clkload",$('webtronics_clkload_value').value);

+    netlistcreator.writewtx(model,"setload",$('webtronics_seload_value').value);

+    netlistcreator.writewtx(model,"resetload",$('webtronics_resetload_value').value);

+    netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value);

+    netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value);

+  }

+  else if(modelname=="dlatch"){

+    netlistcreator.writewtx(model,"datadelay",$('webtronics_datadelay_value').value);

+    netlistcreator.writewtx(model,"enabledelay",$('webtronics_enabledelay_value').value);

+    netlistcreator.writewtx(model,"setdelay",$('webtronics_setdelay_value').value);

+    netlistcreator.writewtx(model,"resetdelay",$('webtronics_resetdelay_value').value);

+    netlistcreator.writewtx(model,"ic",$('webtronics_ic_value').value);

+    netlistcreator.writewtx(model,"dataload",$('webtronics_dataload_value').value);

+    netlistcreator.writewtx(model,"enableload",$('webtronics_enableload_value').value);

+    netlistcreator.writewtx(model,"setload",$('webtronics_seload_value').value);

+    netlistcreator.writewtx(model,"resetload",$('webtronics_resetload_value').value);

+    netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value);

+    netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value);

+  }

+  else if(modelname=="srlatch"){

+    netlistcreator.writewtx(model,"datadelay",$('webtronics_datadelay_value').value);

+    netlistcreator.writewtx(model,"enabledelay",$('webtronics_enabledelay_value').value);

+    netlistcreator.writewtx(model,"setdelay",$('webtronics_setdelay_value').value);

+    netlistcreator.writewtx(model,"resetdelay",$('webtronics_resetdelay_value').value);

+    netlistcreator.writewtx(model,"ic",$('webtronics_ic_value').value);

+    netlistcreator.writewtx(model,"srload",$('webtronics_srload_value').value);

+    netlistcreator.writewtx(model,"enableload",$('webtronics_enableload_value').value);

+    netlistcreator.writewtx(model,"setload",$('webtronics_seload_value').value);

+    netlistcreator.writewtx(model,"resetload",$('webtronics_resetload_value').value);

+    netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value);

+    netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value);

+  }

+

+  else if(modelname=="cdo"){

+    netlistcreator.writewtx(model,"cntlarr",$('webtronics_cntlarr_value').value);

+    netlistcreator.writewtx(model,"freqarr",$('webtronics_freqarr_value').value);

+    netlistcreator.writewtx(model,"duty",$('webtronics_duty_value').value);

+    netlistcreator.writewtx(model,"phase",$('webtronics_phase_value').value);

+    netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value);

+    netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value);

+

+  }

+  

+   else if(modelname=="adc_bridge"){

+    netlistcreator.writewtx(model,"inlow",$('webtronics_inlow_value').value);

+    netlistcreator.writewtx(model,"inhigh",$('webtronics_inhigh_value').value);

+    netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value);

+    netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value);    

+

+   }

+

+   else if(modelname=="dac_bridge")

+    {

+      netlistcreator.writewtx(model,"outlow",$('webtronics_outlow_value').value);

+      netlistcreator.writewtx(model,"outhigh",$('webtronics_outhigh_value').value);

+      netlistcreator.writewtx(model,"outundef",$('webtronics_outundef_value').value);

+      netlistcreator.writewtx(model,"inputload",$('webtronics_inputload_value').value);

+      netlistcreator.writewtx(model,"outlow",$('webtronics_risetime_value').value);

+      netlistcreator.writewtx(model,"falltime",$('webtronics_falltime_value').value);

+    }

+

+

 

   webtronics.circuit.createvalue(webtronics.circuit.selected[0]);

 });

diff --git a/views/script/netlist.js b/views/script/netlist.js
index d8a3655..f5876d7 100644
--- a/views/script/netlist.js
+++ b/views/script/netlist.js
@@ -210,7 +210,7 @@ tovector:function(pin,nodenumber){
   for(var i=0;i<parts.length;i++){
     var part={error:"", elem:{}, analogpins:[],digitalpins:[],amplitude:"",phase:"",offsetvoltage:"",voltageamplitude:"",frequency:"",delaytime:"",dampingfactor:"",type:"", name:"", category:"", value:"", spice:"", model:"",measure:"", risedelay:"", falldelay:"", pulval1:"", pulval2:"", pulval3:"", pulval4:"", pulval5:"", pulval6:"", pulval7:"", eval1:"", eval2:"", eval3:"", eval4:"", eval5:"", eval6:"", pwlval1:"", pwlval2:"", pwlval3:"", pwlval4:"", pwlval5:"", pwlval6:"", pwlval7:"", pwlval8:"",
     inoffset:"",gain:"",outoffset:"",ingain:"",outgain:"",denoffset:"",dengain:"",numoffset:"",numgain:"",fraction:"",dendomain:"",denlowerlimit:"",outlowerlimit:"",outupperlimit:"",limitrange:"",upperdelta:"",lowerdelta:"",indomain:"",xarr:"",yarr:"",amodel:"",coff:"",con:"",irev:"",rbreak:"",limitswitch:"",roff:"",ron:"",log:"",vbreak:"",ibreak:"",isat:"",nfor:"",rsource:"",rsink:"",ilimitsource:"",ilimitsink:"",vpwr:"",isource:"",isink:"",routdomain:"",inlow:"",inhigh:"",hyst:"",outic:"",numcoeff:"",dencoeff:"",intic:"",denormfreq:"",
-    riseslope:"",fallslope:"",outlow:"",outhigh:"",cntlarr:"",freqarr:"",duty:"",risetime:"",falltime:"",clktrig:"",pwarr:"",ptrig:"",rdelay:"",fdelay:"",rmax:"",rmin:"",rinit:"",vt:"",alpha:"",beta:""
+    riseslope:"",fallslope:"",outlow:"",outhigh:"",cntlarr:"",freqarr:"",duty:"",risetime:"",falltime:"",clktrig:"",pwarr:"",ptrig:"",rdelay:"",fdelay:"",rmax:"",rmin:"",rinit:"",vt:"",alpha:"",beta:"", clkdelay:"", setdelay:"", resetdelay:"", ic:"", dataload:"", jkload:"", tload:"", srload:"", clkload:"", setload:"", resetload:"", datadelay:"", enableload:"",srdelay:"", enabledelay:"", outundef:""
 
 
   }
@@ -654,8 +654,60 @@ catch(e){ part.error="wtx:alpha not found"; }
 try{ part.beta=this.readwtx(parts[i],'beta'); }
 catch(e){ part.error="wtx:beta not found"; }
 
+try{ part.clkdelay=this.readwtx(parts[i],'clkdelay'); }
+catch(e){ part.error="wtx:clkdelay not found"; }
 
+try{ part.setdelay=this.readwtx(parts[i],'setdelay'); }
+catch(e){ part.error="wtx:setdelay not found"; }
 
+try{ part.resetdelay=this.readwtx(parts[i],'resetdelay'); }
+catch(e){ part.error="wtx:resetdelay not found"; }
+
+try{ part.ic=this.readwtx(parts[i],'ic'); }
+catch(e){ part.error="wtx:ic not found"; }
+
+try{ part.dataload=this.readwtx(parts[i],'dataload'); }
+catch(e){ part.error="wtx:dataload not found"; }
+
+try{ part.jkload=this.readwtx(parts[i],'jkload'); }
+catch(e){ part.error="wtx:jkload not found"; }
+
+try{ part.tload=this.readwtx(parts[i],'tload'); }
+catch(e){ part.error="wtx:tload not found"; }
+
+try{ part.srload=this.readwtx(parts[i],'srload'); }
+catch(e){ part.error="wtx:srload not found"; }
+
+try{ part.clkload=this.readwtx(parts[i],'clkload'); }
+catch(e){ part.error="wtx:clkload not found"; }
+
+try{ part.setload=this.readwtx(parts[i],'setload'); }
+catch(e){ part.error="wtx:setload not found"; }
+
+try{ part.resetload=this.readwtx(parts[i],'resetload'); }
+catch(e){ part.error="wtx:resetload not found"; }
+
+try{ part.enableload=this.readwtx(parts[i],'enableload'); }
+catch(e){ part.error="wtx:enableload not found"; }
+
+try{ part.datadelay=this.readwtx(parts[i],'datadelay'); }
+catch(e){ part.error="wtx:datadelay not found"; }
+
+try{ part.enabledelay=this.readwtx(parts[i],'enabledelay'); }
+catch(e){ part.error="wtx:enabledelay not found"; }
+
+try{ part.srdelay=this.readwtx(parts[i],'srdelay'); }
+catch(e){ part.error="wtx:srdelay load not found"; }
+
+
+
+
+try{ part.srdelay=this.readwtx(parts[i],'srdelay'); }
+catch(e){ part.error="wtx:srdelay load not found"; }
+
+
+try{ part.outdef=this.readwtx(parts[i],'outdef'); }
+catch(e){ part.error="wtx:outdef load not found"; }
 
 
 
@@ -824,7 +876,7 @@ getnodes:function(parts){
       delaytime:parts[i].delaytime,dampingfactor:parts[i].dampingfactor,eval1:parts[i].eval1,eval2:parts[i].eval2,eval3:parts[i].eval3,eval4:parts[i].eval4,eval5:parts[i].eval5,eval6:parts[i].eval6,
       inoffset:parts[i].inoffset,gain:parts[i].gain,outoffset:parts[i].outoffset,ingain:parts[i].ingain,outgain:parts[i].outgain,denoffset:parts[i].denoffset,dengain:parts[i].dengain,numoffset:parts[i].numoffset,numgain:parts[i].numgain,fraction:parts[i].fraction,dendomain:parts[i].dendomain,denlowerlimit:parts[i].denlowerlimit,outlowerlimit:parts[i].outlowerlimit,outupperlimit:parts[i].outupperlimit,limitrange:parts[i].limitrange,upperdelta:parts[i].upperdelta,lowerdelta:parts[i].lowerdelta,
  indomain:parts[i].indomain,xarr:parts[i].xarr,yarr:parts[i].yarr,amodel:parts[i].amodel,coff:parts[i].coff,con:parts[i].con,irev:parts[i].irev,rbreak:parts[i].rbreak,limitswitch:parts[i].limitswitch,roff:parts[i].roff,ron:parts[i].ron,log:parts[i].log,vbreak:parts[i].vbreak,ibreak:parts[i].ibreak,isat:parts[i].isat,nfor:parts[i].nfor,rsource:parts[i].rsource,rsink:parts[i].rsink,ilimitsource:parts[i].ilimitsource,ilimitsink:parts[i].ilimitsink,vpwr:parts[i].vpwr,isource:parts[i].isource,isink:parts[i].isink,routdomain:parts[i].routdomain,inlow:parts[i].inlow,inhigh:parts[i].inhigh,hyst:parts[i].hyst,outic:parts[i].outic,
- numcoeff:parts[i].numcoeff,dencoeff:parts[i].dencoeff,intic:parts[i].intic,denormfreq:parts[i].denormfreq,riseslope:parts[i].riseslope,fallslope:parts[i].fallslope,outlow:parts[i].outlow,outhigh:parts[i].outhigh,cntlarr:parts[i].cntlarr,freqarr:parts[i].freqarr,duty:parts[i].duty,risetime:parts[i].risetime,falltime:parts[i].falltime,clktrig:parts[i].clktrig,pwarr:parts[i].pwarr,ptrig:parts[i].ptrig,rdelay:parts[i].rdelay,fdelay:parts[i].fdelay,rmax:parts[i].rmax,rmin:parts[i].rmin,rinit:parts[i].rinit,vt:parts[i].vt,alpha:parts[i].alpha,beta:parts[i].beta
+ numcoeff:parts[i].numcoeff,dencoeff:parts[i].dencoeff,intic:parts[i].intic,denormfreq:parts[i].denormfreq,riseslope:parts[i].riseslope,fallslope:parts[i].fallslope,outlow:parts[i].outlow,outhigh:parts[i].outhigh,cntlarr:parts[i].cntlarr,freqarr:parts[i].freqarr,duty:parts[i].duty,risetime:parts[i].risetime,falltime:parts[i].falltime,clktrig:parts[i].clktrig,pwarr:parts[i].pwarr,ptrig:parts[i].ptrig,rdelay:parts[i].rdelay,fdelay:parts[i].fdelay,rmax:parts[i].rmax,rmin:parts[i].rmin,rinit:parts[i].rinit,vt:parts[i].vt,alpha:parts[i].alpha,beta:parts[i].beta, outundef:parts[i].outundef
 
     };
       if(net!=null)sections.netlist.push(net);
@@ -1094,6 +1146,152 @@ else if(sections.netlist[i].name=="memristor"){
   var oh=sections.netlist[i].vt;
   command+=" ref_"+pid+"\n"+".model ref_"+pid+" memristor(rmin="+ct+" rmax="+pw+" rinit="+ctg+" alpha="+pt+" beta="+ol+" vt="+oh+")\n";
 }
+
+else if(sections.netlist[i].name=="dff"){
+  var cd=sections.netlist[i].clkdelay;
+  var sd=sections.netlist[i].setdelay;
+  var rd=sections.netlist[i].resetdelay;
+  var ic=sections.netlist[i].ic;
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  command+="flop_"+pid+"\n.model flop_"+pid+ "d_dff(clk_delay = "+cd+" set_delay = "+sd+"+reset_delay = "+rd+" ic = "+ic+" rise_delay = "+rised+"+ fall_delay = "+falld+")";
+}
+
+else if(sections.netlist[i].name=="jkff"){
+  var cd=sections.netlist[i].clkdelay;
+  var sd=sections.netlist[i].setdelay;
+  var rd=sections.netlist[i].resetdelay;
+  var ic=sections.netlist[i].ic;
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  command+="flop_"+pid+"\n.model flop_"+pid+ "d_jkff(clk_delay = "+cd+" set_delay = "+sd+"+reset_delay = "+rd+" ic = "+ic+" rise_delay = "+rised+"+ fall_delay = "+falld+")";
+}
+
+else if(sections.netlist[i].name=="tff"){
+  var cd=sections.netlist[i].clkdelay;
+  var sd=sections.netlist[i].setdelay;
+  var rd=sections.netlist[i].resetdelay;
+  var ic=sections.netlist[i].ic;
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  command+="flop_"+pid+"\n.model flop_"+pid+ "d_tff(clk_delay = "+cd+" set_delay = "+sd+"+reset_delay = "+rd+" ic = "+ic+" rise_delay = "+rised+"+ fall_delay = "+falld+")";
+}
+
+else if(sections.netlist[i].name=="srff"){
+  var cd=sections.netlist[i].clkdelay;
+  var sd=sections.netlist[i].setdelay;
+  var rd=sections.netlist[i].resetdelay;
+  var ic=sections.netlist[i].ic;
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  command+="flop_"+pid+"\n.model flop_"+pid+ "d_srff(clk_delay = "+cd+" set_delay = "+sd+"+reset_delay = "+rd+" ic = "+ic+" rise_delay = "+rised+"+ fall_delay = "+falld+")";
+}
+
+
+else if(sections.netlist[i].name=="dlatch"){
+  var dd=sections.netlist[i].datadelay;
+  var ed=sections.netlist[i].enabledelay;
+  var sd=sections.netlist[i].setdelay;
+  var rd=sections.netlist[i].resetdelay;
+  var ic=sections.netlist[i].ic;
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  command+="latch_"+pid+"\n.model latch_"+pid+ "d_dlatch(data_delay = "+dd+" enable_delay "+ed+" set_delay = "+sd+"+reset_delay = "+rd+" ic = "+ic+" rise_delay = "+rised+"+ fall_delay = "+falld+")";
+}
+
+else if(sections.netlist[i].name=="srlatch"){
+  var srd=sections.netlist[i].srdelay;
+  var ed=sections.netlist[i].enabledelay;
+  var sd=sections.netlist[i].setdelay;
+  var rd=sections.netlist[i].resetdelay;
+  var ic=sections.netlist[i].ic;
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  command+="latch_"+pid+"\n.model latch_"+pid+ "d_dlatch(sr_delay = "+srd+" enable_delay "+ed+" set_delay = "+sd+"+reset_delay = "+rd+" ic = "+ic+" rise_delay = "+rised+"+ fall_delay = "+falld+")";
+}
+else if(sections.netlist[i].name=="not")
+{
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  var rd=sections.netlist[i].inputload;
+  command+=" ref_"+pid+"\n.model ref_"+pid+" d_inverter(rise_delay ="+rised+" fall_delay = "+falld+" input_load = "+rd+")\n";
+}
+else if(sections.netlist[i].name=="nor")
+{
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  var rd=sections.netlist[i].inputload;
+  command+=" ref_"+pid+"\n.model ref_"+pid+" d_nor(rise_delay ="+rised+" fall_delay = "+falld+" input_load = "+rd+")\n";
+}
+else if(sections.netlist[i].name=="xnor")
+{
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  var rd=sections.netlist[i].inputload;
+  command+=" ref_"+pid+"\n.model ref_"+pid+" d_xnor(rise_delay ="+rised+" fall_delay = "+falld+" input_load = "+rd+")\n";
+}
+else if(sections.netlist[i].name=="or")
+{
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  var rd=sections.netlist[i].inputload;
+  command+=" ref_"+pid+"\n.model ref_"+pid+" d_or(rise_delay ="+rised+" fall_delay = "+falld+" input_load = "+rd+")\n";
+}
+else if(sections.netlist[i].name=="and")
+{
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  var rd=sections.netlist[i].inputload;
+  command+=" ref_"+pid+"\n.model ref_"+pid+" d_and(rise_delay ="+rised+" fall_delay = "+falld+" input_load = "+rd+")\n";
+}
+else if(sections.netlist[i].name=="nand")
+{
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  var rd=sections.netlist[i].inputload;
+  command+=" ref_"+pid+"\n.model ref_"+pid+" d_nand(rise_delay ="+rised+" fall_delay = "+falld+" input_load = "+rd+")\n";
+}
+else if(sections.netlist[i].name=="xor")
+{
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  var rd=sections.netlist[i].inputload;
+  command+=" ref_"+pid+"\n.model ref_"+pid+" d_xor(rise_delay ="+rised+" fall_delay = "+falld+" input_load = "+rd+")\n";
+}
+
+else if(sections.netlist[i].name=="dac_bridge")
+{
+  var ol=sections.netlist[i].outlow;
+  var oh=sections.netlist[i].outhigh;
+  var ou=sections.netlist[i].outundef;
+  var rd=sections.netlist[i].inputload;
+  var rt=sections.netlist[i].risetime;
+  var ft=sections.netlist[i].falltime;
+  command+=" dac_"+pid+"\n.model dac_"+pid+" dac_bridge(out_low ="+ol+" out_high = "+oh+" out_undef = "+ou+" input_load = "+rd+" t_rise = "+rt+"t_fall"+ft+")\n";
+}
+
+else if(sections.netlist[i].name=="adc_bridge")
+{
+  var il=sections.netlist[i].inlow;
+  var ih=sections.netlist[i].inhigh;
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  command+=" adcbridge_"+pid+"\n.model adc_buff_"+pid+" adcbridge(in_low ="+il+" in_high = "+ih+")\n";
+}
+
+
+else if(sections.netlist[i].name=="cdo")
+{
+
+  var ca=sections.netlist[i].cntlarr;
+  var fa=sections.netlist[i].freqarr;
+  var dt=sections.netlist[i].duty;
+  var p=sections.netlist[i].phase;
+  var rised=sections.netlist[i].risedelay;
+  var falld=sections.netlist[i].falldelay;
+  command+=" var_clock"+pid+"\n.model var_clock"+pid+" d_osc(cntl_array = [ "+ca+"] freq_array = [ "+fa+" ] duty_cycle = "+dt+" initphase = "+p+" rise_delay = "+rised+" fall_delay = "+falld+")\n";
+}
+
 else{
   
   command+=" "+sections.netlist[i].model;
diff --git a/views/style/schematic.css b/views/style/schematic.css
index 844e220..f664ad9 100644
--- a/views/style/schematic.css
+++ b/views/style/schematic.css
@@ -149,7 +149,7 @@ div.webtronics_close_tab{
 div#webtronics_side_bar{
     position:relative;
     float:left;
-    width: 132px;
+    width: 150px;
 	overflow: auto;
 	border-style:solid;
 	border-width:2px;
@@ -160,7 +160,7 @@ div#webtronics_parts_list{
     position:relative;
     left:0;
     top:0;
-    width:132px;
+    width:150px;
 	display:block;
 	height:auto;
 	overflow:auto;
diff --git a/views/webtronix_server/digitalmodels/dff.svg b/views/webtronix_server/digitalmodels/dff.svg
new file mode 100644
index 0000000..f169801
--- /dev/null
+++ b/views/webtronix_server/digitalmodels/dff.svg
@@ -0,0 +1,56 @@
+<svg width="87" height="94" xmlns="http://www.w3.org/2000/svg">
+ <!-- Created with Method Draw - http://github.com/duopixel/Method-Draw/ -->
+ <g>
+ <metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:digital>
+            <wtx:node index="5" x="85" y="34" />
+            <wtx:node index="6" x="85" y="64" />
+            <wtx:node index="1" x="2" y="36" />
+            <wtx:node index="2" x="2" y="63" />
+            <wtx:node index="3" x="42" y="1" />
+            <wtx:node index="4" x="42" y="93" />
+          
+        </wtx:digital>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>dff</wtx:name>
+    <wtx:category>digitalmodels</wtx:category>
+
+    <wtx:clkdelay></wtx:clkdelay>
+    <wtx:setdelay></wtx:setdelay>
+    <wtx:resetdelay></wtx:resetdelay>
+    <wtx:ic></wtx:ic>
+    <wtx:dataload></wtx:dataload>
+    <wtx:clkload></wtx:clkload>
+    <wtx:setload></wtx:setload>
+    <wtx:resetload></wtx:resetload>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+    
+    <wtx:flip></wtx:flip>
+    <wtx:value></wtx:value>
+    <wtx:label></wtx:label>
+    <wtx:spice></wtx:spice>
+    <wtx:model></wtx:model>
+    </wtx:part>
+</metadata>
+
+  <rect id="svg_1" height="60" width="40" y="16.472149" x="23.21015" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_10" y="26.472149" x="38.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">S</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_11" y="74.472149" x="38.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">R</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_12" y="38.472149" x="53.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Q</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="38.472149" x="26.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">D</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_15" y="69.472149" x="51.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Q'</text>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_16" y2="62.698318" x2="33.040236" y1="57.243778" x1="24.209076" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_17" y2="62.958058" x2="32.261016" y1="69.451558" x1="24.209076" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_18" y2="33.816342" x2="85.984099" y1="33.816342" x1="63.358689" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_19" y2="35.555473" x2="23.37541" y1="35.555473" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_20" y2="62.511992" x2="23.37541" y1="62.511992" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_21" y2="64.251122" x2="85.984099" y1="64.251122" x1="63.358689" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_24" y2="0.75" x2="42.489126" y1="17.294605" x1="42.489126" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_25" y2="76.402166" x2="42.489126" y1="92.946771" x1="42.489126" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/digitalmodels/dlatch.svg b/views/webtronix_server/digitalmodels/dlatch.svg
new file mode 100644
index 0000000..a7328eb
--- /dev/null
+++ b/views/webtronix_server/digitalmodels/dlatch.svg
@@ -0,0 +1,60 @@
+<svg width="87" height="94" xmlns="http://www.w3.org/2000/svg">
+ <!-- Created with Method Draw - http://github.com/duopixel/Method-Draw/ -->
+ <g>
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:digital>
+            <wtx:node index="5" x="85" y="34" />
+            <wtx:node index="6" x="85" y="64" />
+            <wtx:node index="1" x="2" y="36" />
+            <wtx:node index="2" x="2" y="63" />
+            <wtx:node index="3" x="42" y="1" />
+            <wtx:node index="4" x="42" y="93" />
+          
+        </wtx:digital>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>dlatch</wtx:name>
+    <wtx:category>digitalmodels</wtx:category>
+
+     <wtx:datadelay></wtx:datadelay>
+    <wtx:enabledelay></wtx:enabledelay>
+    <wtx:setdelay></wtx:setdelay>
+     <wtx:resetdelay></wtx:resetdelay>
+    <wtx:ic></wtx:ic>
+    <wtx:dataload></wtx:dataload>
+    <wtx:enableload></wtx:enableload>
+    <wtx:setload></wtx:setload>
+    <wtx:resetload></wtx:resetload>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+    
+
+
+
+
+
+    <wtx:flip></wtx:flip>
+    <wtx:value></wtx:value>
+    <wtx:label></wtx:label>
+    <wtx:spice></wtx:spice>
+    <wtx:model></wtx:model>
+    </wtx:part>
+</metadata>
+  <rect id="svg_1" height="60" width="40" y="16.472149" x="23.21015" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_10" y="26.472149" x="38.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">S</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_11" y="74.472149" x="38.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">R</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_12" y="38.472149" x="53.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Q</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="38.472149" x="26.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">D</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_15" y="69.472149" x="51.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Q'</text>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_18" y2="33.816342" x2="85.984099" y1="33.816342" x1="63.358689" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_19" y2="35.555473" x2="23.37541" y1="35.555473" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_20" y2="62.511992" x2="23.37541" y1="62.511992" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_21" y2="64.251122" x2="85.984099" y1="64.251122" x1="63.358689" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_24" y2="0.75" x2="42.489126" y1="17.294605" x1="42.489126" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_25" y2="76.402166" x2="42.489126" y1="92.946771" x1="42.489126" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_28" y="65.967527" x="26.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">E</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/digitalmodels/jkff.svg b/views/webtronix_server/digitalmodels/jkff.svg
new file mode 100644
index 0000000..03b5206
--- /dev/null
+++ b/views/webtronix_server/digitalmodels/jkff.svg
@@ -0,0 +1,63 @@
+<svg width="87" height="94" xmlns="http://www.w3.org/2000/svg">
+ <!-- Created with Method Draw - http://github.com/duopixel/Method-Draw/ -->
+ <g>
+ <metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:digital>
+            <wtx:node index="6" x="85" y="34" />
+            <wtx:node index="7" x="85" y="64" />
+            <wtx:node index="1" x="2" y="36" />
+            <wtx:node index="2" x="2" y="63" />
+            <wtx:node index="3" x="2" y="49" />
+            <wtx:node index="4" x="42" y="1" />
+            <wtx:node index="5" x="42" y="93" />
+          
+        </wtx:digital>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>jkff</wtx:name>
+    <wtx:category>digitalmodels</wtx:category>
+
+    <wtx:clkdelay></wtx:clkdelay>
+    <wtx:setdelay></wtx:setdelay>
+    <wtx:resetdelay></wtx:resetdelay>
+    <wtx:ic></wtx:ic>
+    <wtx:jkload></wtx:jkload>
+    <wtx:clkload></wtx:clkload>
+    <wtx:setload></wtx:setload>
+    <wtx:resetload></wtx:resetload>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+    
+
+
+
+
+
+    <wtx:flip></wtx:flip>
+    <wtx:value></wtx:value>
+    <wtx:label></wtx:label>
+    <wtx:spice></wtx:spice>
+    <wtx:model></wtx:model>
+    </wtx:part>
+</metadata>
+  <rect id="svg_1" height="60" width="40" y="16.472149" x="23.21015" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_10" y="26.472149" x="38.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">S</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_11" y="74.472149" x="38.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">R</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_12" y="38.472149" x="53.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Q</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="38.472149" x="26.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">J</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_15" y="69.472149" x="51.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Q'</text>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_16" y2="62.698318" x2="33.040236" y1="57.243778" x1="24.209076" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_17" y2="62.958058" x2="32.261016" y1="69.451558" x1="24.209076" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_18" y2="33.816342" x2="85.984099" y1="33.816342" x1="63.358689" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_19" y2="35.555473" x2="23.37541" y1="35.555473" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_20" y2="62.511992" x2="23.37541" y1="62.511992" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_21" y2="64.251122" x2="85.984099" y1="64.251122" x1="63.358689" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_24" y2="0.75" x2="42.489126" y1="17.294605" x1="42.489126" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_25" y2="76.402166" x2="42.489126" y1="92.946771" x1="42.489126" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_26" y2="49.468515" x2="23.37541" y1="49.468515" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_27" y="52.385191" x="26.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">K</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/digitalmodels/srff.svg b/views/webtronix_server/digitalmodels/srff.svg
new file mode 100644
index 0000000..ba03871
--- /dev/null
+++ b/views/webtronix_server/digitalmodels/srff.svg
@@ -0,0 +1,60 @@
+<svg width="87" height="94" xmlns="http://www.w3.org/2000/svg">
+ <!-- Created with Method Draw - http://github.com/duopixel/Method-Draw/ -->
+ <g>
+ <metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:digital>
+            <wtx:node index="6" x="85" y="34" />
+            <wtx:node index="7" x="85" y="64" />
+            <wtx:node index="1" x="2" y="36" />
+            <wtx:node index="2" x="2" y="63" />
+            <wtx:node index="3" x="2" y="49" />
+            <wtx:node index="4" x="42" y="1" />
+            <wtx:node index="5" x="42" y="93" />
+          
+        </wtx:digital>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>srff</wtx:name>
+    <wtx:category>digitalmodels</wtx:category>
+
+      <wtx:clkdelay></wtx:clkdelay>
+    <wtx:setdelay></wtx:setdelay>
+    <wtx:resetdelay></wtx:resetdelay>
+    <wtx:ic></wtx:ic>
+    <wtx:srload></wtx:srload>
+    <wtx:clkload></wtx:clkload>
+    <wtx:setload></wtx:setload>
+    <wtx:resetload></wtx:resetload>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+
+
+
+    <wtx:flip></wtx:flip>
+    <wtx:value></wtx:value>
+    <wtx:label></wtx:label>
+    <wtx:spice></wtx:spice>
+    <wtx:model></wtx:model>
+    </wtx:part>
+</metadata>
+  <rect id="svg_1" height="60" width="40" y="16.472149" x="23.21015" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_10" y="26.472149" x="38.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">S</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_11" y="74.472149" x="38.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">R</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_12" y="38.472149" x="53.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Q</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="38.472149" x="26.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">S</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_15" y="69.472149" x="51.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Q'</text>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_16" y2="62.698318" x2="33.040236" y1="57.243778" x1="24.209076" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_17" y2="62.958058" x2="32.261016" y1="69.451558" x1="24.209076" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_18" y2="33.816342" x2="85.984099" y1="33.816342" x1="63.358689" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_19" y2="35.555473" x2="23.37541" y1="35.555473" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_20" y2="62.511992" x2="23.37541" y1="62.511992" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_21" y2="64.251122" x2="85.984099" y1="64.251122" x1="63.358689" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_24" y2="0.75" x2="42.489126" y1="17.294605" x1="42.489126" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_25" y2="76.402166" x2="42.489126" y1="92.946771" x1="42.489126" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_26" y2="49.468515" x2="23.37541" y1="49.468515" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_27" y="52.385191" x="26.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">R</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/digitalmodels/srlatch.svg b/views/webtronix_server/digitalmodels/srlatch.svg
new file mode 100644
index 0000000..fe0bea0
--- /dev/null
+++ b/views/webtronix_server/digitalmodels/srlatch.svg
@@ -0,0 +1,61 @@
+<svg width="87" height="94" xmlns="http://www.w3.org/2000/svg">
+ <!-- Created with Method Draw - http://github.com/duopixel/Method-Draw/ -->
+ <g>
+
+  <metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:digital>
+            <wtx:node index="6" x="85" y="34" />
+            <wtx:node index="7" x="85" y="64" />
+            <wtx:node index="1" x="2" y="36" />
+            <wtx:node index="2" x="2" y="63" />
+            <wtx:node index="3" x="2" y="49" />
+            <wtx:node index="4" x="42" y="1" />
+            <wtx:node index="5" x="42" y="93" />
+          
+        </wtx:digital>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>srlatch</wtx:name>
+    <wtx:category>digitalmodels</wtx:category>
+     
+    <wtx:srdelay></wtx:srdelay>
+    <wtx:enabledelay></wtx:enabledelay>
+    <wtx:setdelay></wtx:setdelay>
+     <wtx:resetdelay></wtx:resetdelay>
+    <wtx:ic></wtx:ic>
+   
+    <wtx:srload></wtx:srload>
+    <wtx:enableload></wtx:enableload>
+    <wtx:setload></wtx:setload>
+    <wtx:resetload></wtx:resetload>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+
+    <wtx:flip></wtx:flip>
+    <wtx:value></wtx:value>
+    <wtx:label></wtx:label>
+    <wtx:spice></wtx:spice>
+    <wtx:model></wtx:model>
+    </wtx:part>
+</metadata>
+
+  <rect id="svg_1" height="60" width="40" y="16.472149" x="23.21015" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_10" y="26.472149" x="38.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">S</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_11" y="74.472149" x="38.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">R</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_12" y="38.472149" x="53.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Q</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="38.472149" x="26.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">S</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_15" y="69.472149" x="51.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Q'</text>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_18" y2="33.816342" x2="85.984099" y1="33.816342" x1="63.358689" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_19" y2="35.555473" x2="23.37541" y1="35.555473" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_20" y2="62.511992" x2="23.37541" y1="62.511992" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_21" y2="64.251122" x2="85.984099" y1="64.251122" x1="63.358689" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_24" y2="0.75" x2="42.489126" y1="17.294605" x1="42.489126" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_25" y2="76.402166" x2="42.489126" y1="92.946771" x1="42.489126" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_26" y2="49.468515" x2="23.37541" y1="49.468515" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_27" y="52.385191" x="26.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">R</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_28" y="65.967527" x="26.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">E</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/digitalmodels/tff.svg b/views/webtronix_server/digitalmodels/tff.svg
new file mode 100644
index 0000000..af01593
--- /dev/null
+++ b/views/webtronix_server/digitalmodels/tff.svg
@@ -0,0 +1,60 @@
+<svg width="87" height="94" xmlns="http://www.w3.org/2000/svg">
+ <!-- Created with Method Draw - http://github.com/duopixel/Method-Draw/ -->
+ <g>
+ <metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:digital>
+            <wtx:node index="5" x="85" y="34" />
+            <wtx:node index="6" x="85" y="64" />
+            <wtx:node index="1" x="2" y="36" />
+            <wtx:node index="2" x="2" y="63" />
+            <wtx:node index="3" x="42" y="1" />
+            <wtx:node index="4" x="42" y="93" />
+          
+        </wtx:digital>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>tff</wtx:name>
+    <wtx:category>digitalmodels</wtx:category>
+
+   <wtx:clkdelay></wtx:clkdelay>
+    <wtx:setdelay></wtx:setdelay>
+    <wtx:resetdelay></wtx:resetdelay>
+    <wtx:ic></wtx:ic>
+    <wtx:tload></wtx:tload>
+    <wtx:clkload></wtx:clkload>
+    <wtx:setload></wtx:setload>
+    <wtx:resetload></wtx:resetload>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+    
+
+
+
+
+
+    <wtx:flip></wtx:flip>
+    <wtx:value></wtx:value>
+    <wtx:label></wtx:label>
+    <wtx:spice></wtx:spice>
+    <wtx:model></wtx:model>
+    </wtx:part>
+</metadata>
+  <rect id="svg_1" height="60" width="40" y="16.472149" x="23.21015" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_10" y="26.472149" x="38.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">S</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_11" y="74.472149" x="38.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">R</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_12" y="38.472149" x="53.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Q</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="38.472149" x="26.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">T</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_15" y="69.472149" x="51.21015" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Q'</text>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_16" y2="62.698318" x2="33.040236" y1="57.243778" x1="24.209076" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_17" y2="62.958058" x2="32.261016" y1="69.451558" x1="24.209076" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_18" y2="33.816342" x2="85.984099" y1="33.816342" x1="63.358689" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_19" y2="35.555473" x2="23.37541" y1="35.555473" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_20" y2="62.511992" x2="23.37541" y1="62.511992" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_21" y2="64.251122" x2="85.984099" y1="64.251122" x1="63.358689" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_24" y2="0.75" x2="42.489126" y1="17.294605" x1="42.489126" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_25" y2="76.402166" x2="42.489126" y1="92.946771" x1="42.489126" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/digitalmodels/adc_bridge.svg b/views/webtronix_server/hybridmodels/adc_bridge.svg
index f688b9e..4a5f653 100644
--- a/views/webtronix_server/digitalmodels/adc_bridge.svg
+++ b/views/webtronix_server/hybridmodels/adc_bridge.svg
@@ -20,7 +20,12 @@
 <!--name of file-->
     <wtx:name>adc_bridge</wtx:name>
 <!--category of part-->
-    <wtx:category>digitalmodels</wtx:category>
+    <wtx:category>hybridmodels</wtx:category>
+
+    <wtx:inlow></wtx:inlow>
+    <wtx:inhigh></wtx:inhigh>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
 <!--value or model name-->
     <wtx:value/>
 <!--label id for svg diagram-->
diff --git a/views/webtronix_server/hybridmodels/cdo.svg b/views/webtronix_server/hybridmodels/cdo.svg
new file mode 100644
index 0000000..021de64
--- /dev/null
+++ b/views/webtronix_server/hybridmodels/cdo.svg
@@ -0,0 +1,38 @@
+<svg width="96" height="64" xmlns="http://www.w3.org/2000/svg">
+ <!-- Created with Method Draw - http://github.com/duopixel/Method-Draw/ -->
+ <g>
+  <metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:digital>
+          
+            <wtx:node index="1" x="20" y="30" />
+            <wtx:node index="2" x="20" y="30" />
+          
+        </wtx:digital>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>cdo</wtx:name>
+    <wtx:category>hybridmodels</wtx:category>
+
+    <wtx:cntlarr></wtx:cntlarr>
+    <wtx:freqarr></wtx:freqarr>
+    <wtx:duty></wtx:duty>
+    <wtx:initphase></wtx:initphase>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+    
+    <wtx:flip></wtx:flip>
+    <wtx:value></wtx:value>
+    <wtx:label></wtx:label>
+    <wtx:spice></wtx:spice>
+    <wtx:model></wtx:model>
+    </wtx:part>
+</metadata>
+  <rect id="svg_1" height="60" width="40" y="1.75" x="28.75" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_2" y2="30.75" x2="94.823973" y1="30.75" x1="67.75" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_3" y2="30.75" x2="27.823973" y1="30.75" x1="0.75" stroke-width="1.5" stroke="#000" fill="none"/>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_5" y="32.75" x="35.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">CDO</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/digitalmodels/dac_bridge.svg b/views/webtronix_server/hybridmodels/dac_bridge.svg
index b584869..0877acf 100644
--- a/views/webtronix_server/digitalmodels/dac_bridge.svg
+++ b/views/webtronix_server/hybridmodels/dac_bridge.svg
@@ -21,7 +21,13 @@
     <wtx:id>ad</wtx:id>
     <wtx:type>a</wtx:type>
     <wtx:name>dac_bridge</wtx:name>
-    <wtx:category>digitalmodels</wtx:category>
+    <wtx:category>hybridmodels</wtx:category>
+    <wtx:outlow></wtx:outlow>
+    <wtx:outhigh></wtx:outhigh>
+    <wtx:inputload></wtx:inputload>
+    <wtx:outundef></wtx:outundef>
+    <wtx:risetime></wtx:risetime>
+    <wtx:falltime></wtx:falltime>
     <wtx:value></wtx:value>
     <wtx:label></wtx:label>
     <wtx:spice></wtx:spice>
diff --git a/views/webtronix_server/parts.json b/views/webtronix_server/parts.json
index 581f66d..f09e106 100644
--- a/views/webtronix_server/parts.json
+++ b/views/webtronix_server/parts.json
@@ -42,11 +42,15 @@
 				}
 		
 			}
-
-
-
-
-
+		},
+		"hybridmodels":{
+			"cdo":{},
+			"adc_bridge":{
+			"ideal_adc":["digital.lib"]				
+				},
+			"dac_bridge":{
+			"ideal_dac":["digital.lib"]
+			}
 		},
 
 		"analogmodels":{
@@ -82,12 +86,7 @@
 
 		"digitalmodels":{
 
-			"adc_bridge":{
-				"ideal_adc":["digital.lib"]
-			},
-			"dac_bridge":{
-				"ideal_dac":["digital.lib"]
-			},                    
+			     
 			"source":{
 				"clk":["dsource.mod"]
 			},                
@@ -112,7 +111,13 @@
 			},
 			"xor":{
 				"xor":["digital.lib"]                        
-			}
+			},
+			"dff":{},
+			"jkff":{},
+			"srff":{},
+			"tff":{},
+			"dlatch":{},
+			"srlatch":{}
 		},
 
 		"resistors":{