From 988150262d52426070d892ddb7e8af09c1c60c90 Mon Sep 17 00:00:00 2001
From: Abhishek Patel
Date: Wed, 15 Jun 2016 12:00:32 +0530
Subject: analogmodels added

---
 views/schematic.html                               | 601 ++++++++++++++++++++-
 views/script/gui.js                                | 596 +++++++++++++++++++-
 views/script/netlist.js                            | 451 +++++++++++++++-
 views/style/schematic.css                          |   2 +-
 views/webtronix_server/analogmodels/aswitch.svg    |  43 ++
 .../analogmodels/capacitancemeter.svg              |  37 ++
 .../analogmodels/controlledlimiter.svg             |  47 ++
 .../analogmodels/currentlimiter.svg                |  53 ++
 .../analogmodels/differentiator.svg                |  41 ++
 views/webtronix_server/analogmodels/divider.svg    |  46 ++
 views/webtronix_server/analogmodels/gains.svg      |  40 ++
 views/webtronix_server/analogmodels/hysteresis.svg |  43 ++
 .../analogmodels/inductancemeter.svg               |  37 ++
 views/webtronix_server/analogmodels/integrator.svg |  42 ++
 views/webtronix_server/analogmodels/limiter.svg    |  44 ++
 views/webtronix_server/analogmodels/memristor.svg  |  44 ++
 .../analogmodels/multi_input_pwl_block.svg         |  40 ++
 views/webtronix_server/analogmodels/multiplier.svg |  42 ++
 views/webtronix_server/analogmodels/oneshot.svg    |  50 ++
 .../analogmodels/pwlcontrolsource.svg              |  41 ++
 views/webtronix_server/analogmodels/sdomain.svg    |  40 ++
 .../analogmodels/sineoscillator.svg                |  38 ++
 .../analogmodels/slewrateblock.svg                 |  38 ++
 .../analogmodels/squareoscillator.svg              |  43 ++
 views/webtronix_server/analogmodels/summer.svg     |  50 ++
 .../webtronix_server/analogmodels/transformer.svg  |  37 ++
 .../analogmodels/triangleoscillator.svg            |  42 ++
 views/webtronix_server/analogmodels/zenerdiode.svg |  59 ++
 views/webtronix_server/parts.json                  | 485 +++++++++--------
 29 files changed, 2932 insertions(+), 240 deletions(-)
 create mode 100644 views/webtronix_server/analogmodels/aswitch.svg
 create mode 100644 views/webtronix_server/analogmodels/capacitancemeter.svg
 create mode 100644 views/webtronix_server/analogmodels/controlledlimiter.svg
 create mode 100644 views/webtronix_server/analogmodels/currentlimiter.svg
 create mode 100644 views/webtronix_server/analogmodels/differentiator.svg
 create mode 100644 views/webtronix_server/analogmodels/divider.svg
 create mode 100644 views/webtronix_server/analogmodels/gains.svg
 create mode 100644 views/webtronix_server/analogmodels/hysteresis.svg
 create mode 100644 views/webtronix_server/analogmodels/inductancemeter.svg
 create mode 100644 views/webtronix_server/analogmodels/integrator.svg
 create mode 100644 views/webtronix_server/analogmodels/limiter.svg
 create mode 100644 views/webtronix_server/analogmodels/memristor.svg
 create mode 100644 views/webtronix_server/analogmodels/multi_input_pwl_block.svg
 create mode 100644 views/webtronix_server/analogmodels/multiplier.svg
 create mode 100644 views/webtronix_server/analogmodels/oneshot.svg
 create mode 100644 views/webtronix_server/analogmodels/pwlcontrolsource.svg
 create mode 100644 views/webtronix_server/analogmodels/sdomain.svg
 create mode 100644 views/webtronix_server/analogmodels/sineoscillator.svg
 create mode 100644 views/webtronix_server/analogmodels/slewrateblock.svg
 create mode 100644 views/webtronix_server/analogmodels/squareoscillator.svg
 create mode 100644 views/webtronix_server/analogmodels/summer.svg
 create mode 100644 views/webtronix_server/analogmodels/transformer.svg
 create mode 100644 views/webtronix_server/analogmodels/triangleoscillator.svg
 create mode 100644 views/webtronix_server/analogmodels/zenerdiode.svg

diff --git a/views/schematic.html b/views/schematic.html
index 89ba416..dbd30fb 100644
--- a/views/schematic.html
+++ b/views/schematic.html
@@ -154,14 +154,21 @@ properties form
 -->
 <div id="webtronics_properties_div" class='modal'>
 	<form name="webtronics_properties_form">
-		<table><tr><td>
+		<table>
+		<tbody id="modelid">
+					<tr><td>
 		<fieldset>
 		
 			<legend>part id</legend>    
 			<input id="webtronics_part_id"><br>
 		
 		</fieldset>
-		</td></tr><tr id="valuemodel"><td>
+		</td></tr>
+
+		</tbody>	
+
+		<tbody id="models">
+		<tr id="valuemodel"><td>
 		<fieldset > 
 		
 			<legend>value or model</legend>    
@@ -455,8 +462,598 @@ properties form
 		
 		</fieldset>
 		</td></tr>
+		</tbody>
+
+		<tbody id="analogs">
+			
+		<tr id="webtronics_inoffset" class="analog" ><td>
+		<fieldset>
+		
+			<legend>Inoffset:</legend>    
+			<input id="webtronics_inoffset_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_gain" class="analog"><td>
+		<fieldset>
+		
+			<legend>Gain:</legend>    
+			<input id="webtronics_gain_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_outoffset" class="analog"><td>
+		<fieldset>
+		
+			<legend>Outoffset:</legend>    
+			<input id="webtronics_outoffset_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_ingain" class="analog"><td>
+		<fieldset>
+		
+			<legend>Ingain:</legend>    
+			<input id="webtronics_ingain_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_outgain" class="analog"><td>
+		<fieldset>
+		
+			<legend>Outgain:</legend>    
+			<input id="webtronics_outgain_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_denoffset" class="analog"><td>
+		<fieldset>
+		
+			<legend>Denominatoroffset:</legend>    
+			<input id="webtronics_denoffset_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_dengain" class="analog"><td>
+		<fieldset>
+		
+			<legend>DenominatorGain:</legend>    
+			<input id="webtronics_dengain_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_numoffset" class="analog"><td>
+		<fieldset>
+		
+			<legend>Numeratoroffset:</legend>    
+			<input id="webtronics_numoffset_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_numgain" class="analog"><td>
+		<fieldset>
+		
+			<legend>NumeratorGain:</legend>    
+			<input id="webtronics_numgain_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_fraction" class="analog"><td>
+		<fieldset>
+		
+			<legend>Fraction:</legend>    
+			<input id="webtronics_fraction_value" type="text" value="FALSE">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_dendomain" class="analog"><td>
+		<fieldset>
+		
+			<legend>Denominatordomain:</legend>    
+			<input id="webtronics_dendomain_value" type="text" value="1.0e-10">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_denlowerlimit" class="analog"><td>
+		<fieldset>
+		
+			<legend>DenominatorLowerlimit:</legend>    
+			<input id="webtronics_denlowerlimit_value" type="text" value="1.0e-10">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_outlowerlimit" class="analog"><td>
+		<fieldset>
+		
+			<legend>OutputLowerlimit:</legend>    
+			<input id="webtronics_outlowerlimit_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_outupperlimit" class="analog"><td>
+		<fieldset>
+		
+			<legend>OutputUpperlimit:</legend>    
+			<input id="webtronics_outupperlimit_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+		</td></tr>
+		<tr id="webtronics_limitrange" class="analog"><td>
+		<fieldset>
+		
+			<legend>limitrange:</legend>    
+			<input id="webtronics_limitrange_value" type="text" value="1.0e-6">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_upperdelta" class="analog"><td>
+		<fieldset>
+		
+			<legend>Upperdelta:</legend>    
+			<input id="webtronics_upperdelta_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_lowerdelta" class="analog"><td>
+		<fieldset>
+		
+			<legend>Lowerdelta:</legend>    
+			<input id="webtronics_lowerdelta_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_indomain" class="analog"><td>
+		<fieldset>
+		
+			<legend>Inputdomain:</legend>    
+			<input id="webtronics_indomain_value" type="text" value="0.01">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_xarr" class="analog"><td>
+		<fieldset>
+		
+			<legend>x elementarray:</legend>    
+			<input id="webtronics_xarr_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_yarr" class="analog"><td>
+		<fieldset>
+		
+			<legend>y elementarray:</legend>    
+			<input id="webtronics_yarr_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_amodel" class="analog"><td>
+		<fieldset>
+		
+			<legend>model:</legend>    
+			<input id="webtronics_amodel_value" type="text" value="and">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_coff" class="analog"><td>
+		<fieldset>
+		
+			<legend>Controloff:</legend>    
+			<input id="webtronics_coff_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_con" class="analog"><td>
+		<fieldset>
+		
+			<legend>Controlon:</legend>    
+			<input id="webtronics_con_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_roff" class="analog"><td>
+		<fieldset>
+		
+			<legend>Offresistance:</legend>    
+			<input id="webtronics_roff_value" type="text" value="1.0e12">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_ron" class="analog"><td>
+		<fieldset>
+		
+			<legend>Onresistance:</legend>    
+			<input id="webtronics_ron_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_log" class="analog"><td>
+		<fieldset>
+		
+			<legend>Log:</legend>    
+			<input id="webtronics_log_value" type="text" value="TRUE">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_vbreak" class="analog"><td>
+		<fieldset>
+		
+			<legend>Breakdownvoltage:</legend>    
+			<input id="webtronics_vbreak_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_ibreak" class="analog"><td>
+		<fieldset>
+		
+			<legend>Breakdowncurrent:</legend>    
+			<input id="webtronics_ibreak_value" type="text" value="2.0e-2">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_irev" class="analog"><td>
+		<fieldset>
+		
+			<legend>Reversecurrent:</legend>    
+			<input id="webtronics_irev_value" type="text" value="1.0e-6">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_rbreak" class="analog"><td>
+		<fieldset>
+		
+			<legend>Breakdownresistance:</legend>    
+			<input id="webtronics_rbreak_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_limitswitch" class="analog"><td>
+		<fieldset>
+		
+			<legend>limitswitch:</legend>    
+			<input id="webtronics_limitswitch_value" type="text" value="FALSE">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_isat" class="analog"><td>
+		<fieldset>
+		
+			<legend>Saturationcurrent:</legend>    
+			<input id="webtronics_isat_value" type="text" value="1.0e-12">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_nfor" class="analog"><td>
+		<fieldset>
+		
+			<legend>Forwardemission coefficient:</legend>    
+			<input id="webtronics_nfor_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
 
 
+		<tr id="webtronics_rsource" class="analog"><td>
+		<fieldset>
+		
+			<legend>Sourcingresistance:</legend>    
+			<input id="webtronics_rsource_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_rsink" class="analog"><td>
+		<fieldset>
+		
+			<legend>Sinkingresistance:</legend>    
+			<input id="webtronics_rsink_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_ilimitsource" class="analog"><td>
+		<fieldset>
+		
+			<legend>CurrentSourcingLimit:</legend>    
+			<input id="webtronics_ilimitsource_value" type="text" value="1.0e-3">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_ilimitsink" class="analog"><td>
+		<fieldset>
+		
+			<legend>CurrentSinkingLimit:</legend>    
+			<input id="webtronics_ilimitsink_value" type="text" value="1.0e-3">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_vpwr" class="analog"><td>
+		<fieldset>
+		
+			<legend>UpperlowerPower Range:</legend>    
+			<input id="webtronics_vpwr_value" type="text" value="1.0e-6">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_isource" class="analog"><td>
+		<fieldset>
+		
+			<legend>SourceCurrent Smoothingrange:</legend>    
+			<input id="webtronics_isource_value" type="text" value="1.0e-9">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_isink" class="analog"><td>
+		<fieldset>
+		
+			<legend>SinkCurrent Smoothingrange:</legend>    
+			<input id="webtronics_isink_value" type="text" value="1.0e-9">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_routdomain" class="analog"><td>
+		<fieldset>
+		
+			<legend>VoltageDelta Smoothingrange:</legend>    
+			<input id="webtronics_routdomain_value" type="text" value="1.0e-9">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_inlow" class="analog"><td>
+		<fieldset>
+		
+			<legend>Inputlowvalue:</legend>    
+			<input id="webtronics_inlow_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_inhigh" class="analog"><td>
+		<fieldset>
+		
+			<legend>InputHighvalue:</legend>    
+			<input id="webtronics_inhigh_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_hyst" class="analog"><td>
+		<fieldset>
+		
+			<legend>Hysteresis:</legend>    
+			<input id="webtronics_hyst_value" type="text" value="0.1">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_outic" class="analog"><td>
+		<fieldset>
+		
+			<legend>OutputInitialCondition:</legend>    
+			<input id="webtronics_outic_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_numcoeff" class="analog"><td>
+		<fieldset>
+		
+			<legend>NumeratorCoefficient:</legend>    
+			<input id="webtronics_numcoeff_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_dencoeff" class="analog"><td>
+		<fieldset>
+		
+			<legend>DenominatorCoefficient:</legend>    
+			<input id="webtronics_dencoeff_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_intic" class="analog"><td>
+		<fieldset>
+		
+			<legend>IntegratorStageInitialCondition:</legend>    
+			<input id="webtronics_intic_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_denormfreq" class="analog"><td>
+		<fieldset>
+		
+			<legend>Denormalizedfrequency:</legend>    
+			<input id="webtronics_denormfreq_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+		</td></tr>
+		<tr id="webtronics_riseslope" class="analog"><td>
+		<fieldset>
+		
+			<legend>MaxRiseSlope:</legend>    
+			<input id="webtronics_riseslope_value" type="text" value="1.0e9">
+		
+		</fieldset>
+		</td></tr>
+		</td></tr>
+		<tr id="webtronics_fallslope" class="analog"><td>
+		<fieldset>
+		
+			<legend>MaxFallSlope:</legend>    
+			<input id="webtronics_fallslope_value" type="text" value="1.0e9">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_outlow" class="analog"><td>
+		<fieldset>
+		
+			<legend>Outputlowvalue:</legend>    
+			<input id="webtronics_outlow_value" type="text" value="-1.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_outhigh" class="analog"><td>
+		<fieldset>
+		
+			<legend>OutputHighvalue:</legend>    
+			<input id="webtronics_outhigh_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_cntlarr" class="analog"><td>
+		<fieldset>
+		
+			<legend>ControlArray:</legend>    
+			<input id="webtronics_cntlarr_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_freqarr" class="analog"><td>
+		<fieldset>
+		
+			<legend>FrequencyArray:</legend>    
+			<input id="webtronics_freqarr_value" type="text" value="1.0e3">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_duty" class="analog"><td>
+		<fieldset>
+		
+			<legend>DutyCycle:</legend>    
+			<input id="webtronics_duty_value" type="text" value="0.5">
+		
+		</fieldset>
+		</td></tr>
+
+
+		<tr id="webtronics_risetime" class="analog"><td>
+		<fieldset>
+		
+			<legend>OutputRiseTime:</legend>    
+			<input id="webtronics_risetime_value" type="text" value="1.0e-9">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_falltime" class="analog"><td>
+		<fieldset>
+		
+			<legend>OutputFallTime:</legend>    
+			<input id="webtronics_falltime_value" type="text" value="1.0e-9">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_clktrig" class="analog"><td>
+		<fieldset>
+		
+			<legend>ClockTriggerValue:</legend>    
+			<input id="webtronics_clktrig_value" type="text" value="0.5">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_pwarr" class="analog"><td>
+		<fieldset>
+		
+			<legend>PulseWidthArray:</legend>    
+			<input id="webtronics_pwarr_value" type="text" value="1.0e-6">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_ptrig" class="analog"><td>
+		<fieldset>
+		
+			<legend>PositiveEdgeTrigger:</legend>    
+			<input id="webtronics_ptrig_value" type="text" value="TRUE">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_rdelay" class="analog"><td>
+		<fieldset>
+		
+			<legend>OutputTriggerDelay:</legend>    
+			<input id="webtronics_rdelay_value" type="text" value="1.0e-9">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_fdelay" class="analog"><td>
+		<fieldset>
+		
+			<legend>Outputpwdelay:</legend>    
+			<input id="webtronics_fdelay_value" type="text" value="1.0e-9">
+		
+		</fieldset>
+		</td></tr>
+
+		<tr id="webtronics_rmax" class="analog"><td>
+		<fieldset>
+		
+			<legend>MaximumResistance:</legend>    
+			<input id="webtronics_rmax_value" type="text" value="10000.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_rmin" class="analog"><td>
+		<fieldset>
+		
+			<legend>MinimumResistance:</legend>    
+			<input id="webtronics_rmin_value" type="text" value="10.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_rinit" class="analog"><td>
+		<fieldset>
+		
+			<legend>InitialResistance:</legend>    
+			<input id="webtronics_rinit_value" type="text" value="7000.0">
+		
+		</fieldset>
+		</td></tr>
+				<tr id="webtronics_vt" class="analog"><td>
+		<fieldset>
+		
+			<legend>Threshold:</legend>    
+			<input id="webtronics_vt_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_alpha" class="analog"><td>
+		<fieldset>
+		
+			<legend>ModelParameter1:</legend>    
+			<input id="webtronics_alpha_value" type="text" value="0.0">
+		
+		</fieldset>
+		</td></tr>
+		<tr id="webtronics_beta" class="analog"><td>
+		<fieldset>
+		
+			<legend>ModelParameter2:</legend>    
+			<input id="webtronics_beta_value" type="text" value="1.0">
+		
+		</fieldset>
+		</td></tr>
+		</tbody>
 
 
 		</table>
diff --git a/views/script/gui.js b/views/script/gui.js
index 27e1087..605d7a4 100644
--- a/views/script/gui.js
+++ b/views/script/gui.js
@@ -19,8 +19,8 @@ var webtronics={
   mode:'',
   
   Vlist:/\s*expression|\s*url|.*script/,
-  Alist:/^(x|y|x1|y1|x2|y2|dx|dy|cx|cy|r|width|height|transform|d|id|class|fill|stroke|visibility|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: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|)$/,
+  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|)$/,
   /* .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"],
@@ -131,6 +131,10 @@ openProperties:function(){
   document.forms['webtronics_properties_form'].reset();
   var c=netlistcreator.readwtx(this.circuit.selected[0],"name");
  var type=netlistcreator.readwtx(this.circuit.selected[0],"type");
+var category=netlistcreator.readwtx(this.circuit.selected[0],"category");
+jQuery(".analog").hide();
+         $("models").style.display='block'
+
 	$("webtronics_risedelay").style.display='none';
 	 $("webtronics_falldelay").style.display='none';
 	$("webtronics_inputload").style.display='none';
@@ -472,6 +476,422 @@ openProperties:function(){
     $("webtronics_amplitude").style.display='none'
     $("webtronics_phase").style.display='none'
   }
+  else if(category=="analogmodels"){
+         $("models").style.display='none'
+         if(c=="gains"){
+        $("webtronics_inoffset").style.display='table-row'
+        $("webtronics_gain").style.display='table-row'
+        $("webtronics_outoffset").style.display='table-row'  
+
+        var inoffset=netlistcreator.readwtx(this.circuit.selected[0],"inoffset");  
+        var gain = netlistcreator.readwtx(this.circuit.selected[0],"gain");
+        var outoffset= netlistcreator.readwtx(this.circuit.selected[0],"outoffset");
+        if(gain!=""){$(webtronics_gain_value).value=gain;}
+        if(inoffset!=""){$(webtronics_inoffset_value).value=inoffset;}
+        if(outoffset!=""){$(webtronics_outoffset_value).value=outoffset;}
+         }
+         if(c=="summer"){
+        $("webtronics_inoffset").style.display='table-row'
+        $("webtronics_ingain").style.display='table-row'
+        $("webtronics_outgain").style.display='table-row'
+        $("webtronics_outoffset").style.display='table-row'  
+
+        var inoffset=netlistcreator.readwtx(this.circuit.selected[0],"inoffset");  
+        var ingain = netlistcreator.readwtx(this.circuit.selected[0],"ingain");
+        var outgain = netlistcreator.readwtx(this.circuit.selected[0],"outgain");
+        var outoffset= netlistcreator.readwtx(this.circuit.selected[0],"outoffset");
+        if(ingain!=""){$(webtronics_gain_value).value=ingain;}
+        if(outgain!=""){$(webtronics_gain_value).value=outgain;}
+        if(inoffset!=""){$(webtronics_inoffset_value).value=inoffset;}
+        if(outoffset!=""){$(webtronics_outoffset_value).value=outoffset;}
+         }
+         if(c=="multiplier"){
+        $("webtronics_inoffset").style.display='table-row'
+        $("webtronics_ingain").style.display='table-row'
+        $("webtronics_outgain").style.display='table-row'
+        $("webtronics_outoffset").style.display='table-row'  
+
+        var inoffset=netlistcreator.readwtx(this.circuit.selected[0],"inoffset");  
+        var ingain = netlistcreator.readwtx(this.circuit.selected[0],"ingain");
+        var outgain = netlistcreator.readwtx(this.circuit.selected[0],"outgain");
+        var outoffset= netlistcreator.readwtx(this.circuit.selected[0],"outoffset");
+        if(ingain!=""){$(webtronics_ingain_value).value=ingain;}
+        if(outgain!=""){$(webtronics_outgain_value).value=outgain;}
+        if(inoffset!=""){$(webtronics_inoffset_value).value=inoffset;}
+        if(outoffset!=""){$(webtronics_outoffset_value).value=outoffset;}
+         }
+          if(c=="divider"){
+        $("webtronics_numoffset").style.display='table-row'
+        $("webtronics_numgain").style.display='table-row'
+        $("webtronics_outgain").style.display='table-row'
+        $("webtronics_outoffset").style.display='table-row'  
+        $("webtronics_denoffset").style.display='table-row'
+        $("webtronics_dengain").style.display='table-row'
+        $("webtronics_fraction").style.display='table-row'
+        $("webtronics_dendomain").style.display='table-row'  
+        $("webtronics_denlowerlimit").style.display='table-row'  
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"numoffset");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"numgain");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"outgain");
+        var prop4= netlistcreator.readwtx(this.circuit.selected[0],"outoffset");
+        var prop5= netlistcreator.readwtx(this.circuit.selected[0],"denoffset");
+        var prop6= netlistcreator.readwtx(this.circuit.selected[0],"dengain");
+        var prop7= netlistcreator.readwtx(this.circuit.selected[0],"fraction");
+        var prop8= netlistcreator.readwtx(this.circuit.selected[0],"dendomain");
+        var prop9= netlistcreator.readwtx(this.circuit.selected[0],"denlowerlimit");
+        if(prop1!=""){$(webtronics_numoffset_value).value=prop1;}
+        if(prop2!=""){$(webtronics_numgain_value).value=prop2;}
+        if(prop5!=""){$(webtronics_denoffset_value).value=prop5;}
+        if(prop6!=""){$(webtronics_dengain_value).value=prop6;}
+        if(prop4!=""){$(webtronics_outoffset_value).value=prop4;}
+        if(prop3!=""){$(webtronics_outgain_value).value=prop3;}
+        if(prop7!=""){$(webtronics_fraction_value).value=prop7;}
+        if(prop8!=""){$(webtronics_dendomain_value).value=prop8;}
+        if(prop9!=""){$(webtronics_denlowerlimit_value).value=prop9;}
+        }
+          if(c=="limiter"){
+        $("webtronics_limitrange").style.display='table-row'
+        $("webtronics_fraction").style.display='table-row'
+        $("webtronics_outupperlimit").style.display='table-row'
+        $("webtronics_outlowerlimit").style.display='table-row'  
+        $("webtronics_gain").style.display='table-row'
+        $("webtronics_inoffset").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"limitrange");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"fraction");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"outupperlimit");
+        var prop4= netlistcreator.readwtx(this.circuit.selected[0],"outlowerlimit");
+        var prop5= netlistcreator.readwtx(this.circuit.selected[0],"gain");
+        var prop6= netlistcreator.readwtx(this.circuit.selected[0],"inoffset");
+        if(prop1!=""){$(webtronics_limitrange_value).value=prop1;}
+        if(prop2!=""){$(webtronics_fraction_value).value=prop2;}
+        if(prop3!=""){$(webtronics_outupperlimit_value).value=prop3;}
+        if(prop4!=""){$(webtronics_outlowerlimit_value).value=prop4;}
+        if(prop5!=""){$(webtronics_gain_value).value=prop5;}
+        if(prop6!=""){$(webtronics_inoffset_value).value=prop6;}
+          }         
+          if(c=="controllimiter"){
+        $("webtronics_limitrange").style.display='table-row'
+        $("webtronics_fraction").style.display='table-row'
+        $("webtronics_upperdelta").style.display='table-row'
+        $("webtronics_lowerdelta").style.display='table-row'  
+        $("webtronics_gain").style.display='table-row'
+        $("webtronics_inoffset").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"limitrange");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"fraction");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"upperdelta");
+        var prop4= netlistcreator.readwtx(this.circuit.selected[0],"lowerdelta");
+        var prop5= netlistcreator.readwtx(this.circuit.selected[0],"gain");
+        var prop6= netlistcreator.readwtx(this.circuit.selected[0],"inoffset");
+        if(prop1!=""){$(webtronics_limitrange_value).value=prop1;}
+        if(prop2!=""){$(webtronics_fraction_value).value=prop2;}
+        if(prop3!=""){$(webtronics_upperdelta_value).value=prop3;}
+        if(prop4!=""){$(webtronics_lowerdelta_value).value=prop4;}
+        if(prop5!=""){$(webtronics_gain_value).value=prop5;}
+        if(prop6!=""){$(webtronics_inoffset_value).value=prop6;}
+          }         
+          if(c=="pwlcontrolsource"){
+        $("webtronics_xarr").style.display='table-row'
+        $("webtronics_fraction").style.display='table-row'
+        $("webtronics_yarr").style.display='table-row'
+        $("webtronics_indomain").style.display='table-row'  
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"xarr");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"fraction");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"yarr");
+        var prop4= netlistcreator.readwtx(this.circuit.selected[0],"indomain");
+        if(prop1!=""){$(webtronics_xarr_value).value=prop1;}
+        if(prop2!=""){$(webtronics_fraction_value).value=prop2;}
+        if(prop3!=""){$(webtronics_yarr_value).value=prop3;}
+        if(prop4!=""){$(webtronics_indomain_value).value=prop4;}
+          }         
+       if(c=="multiinputpwlblock"){
+        $("webtronics_xarr").style.display='table-row'
+        $("webtronics_amodel").style.display='table-row'
+        $("webtronics_yarr").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"xarr");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"amodel");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"yarr");
+        if(prop1!=""){$(webtronics_xarr_value).value=prop1;}
+        if(prop2!=""){$(webtronics_amodel_value).value=prop2;}
+        if(prop3!=""){$(webtronics_yarr_value).value=prop3;}
+          }      
+       if(c=="aswitch"){
+        $("webtronics_con").style.display='table-row'
+        $("webtronics_coff").style.display='table-row'
+        $("webtronics_roff").style.display='table-row'
+        $("webtronics_ron").style.display='table-row'
+        $("webtronics_log").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"con");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"coff");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"ron");
+        var prop4 = netlistcreator.readwtx(this.circuit.selected[0],"roff");
+        var prop5 = netlistcreator.readwtx(this.circuit.selected[0],"log");
+        if(prop1!=""){$(webtronics_con_value).value=prop1;}
+        if(prop2!=""){$(webtronics_coff_value).value=prop2;}
+        if(prop3!=""){$(webtronics_ron_value).value=prop3;}
+        if(prop4!=""){$(webtronics_roff_value).value=prop4;}
+        if(prop5!=""){$(webtronics_log_value).value=prop5;}
+          }      
+       if(c=="zener"){
+        $("webtronics_irev").style.display='table-row'
+        $("webtronics_isat").style.display='table-row'
+        $("webtronics_vbreak").style.display='table-row'
+        $("webtronics_ibreak").style.display='table-row'
+        $("webtronics_rbreak").style.display='table-row'
+        $("webtronics_limitswitch").style.display='table-row'
+        $("webtronics_nfor").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"irev");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"isat");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"vbreak");
+        var prop4 = netlistcreator.readwtx(this.circuit.selected[0],"ibreak");
+        var prop5 = netlistcreator.readwtx(this.circuit.selected[0],"rbreak");
+        var prop6 = netlistcreator.readwtx(this.circuit.selected[0],"limitswitch");
+        var prop7 = netlistcreator.readwtx(this.circuit.selected[0],"nfor");
+        if(prop1!=""){$(webtronics_irev_value).value=prop1;}
+        if(prop2!=""){$(webtronics_isat_value).value=prop2;}
+        if(prop3!=""){$(webtronics_vbreak_value).value=prop3;}
+        if(prop4!=""){$(webtronics_ibreak_value).value=prop4;}
+        if(prop5!=""){$(webtronics_rbreak_value).value=prop5;}
+        if(prop6!=""){$(webtronics_limitswitch_value).value=prop6;}
+        if(prop7!=""){$(webtronics_nfor_value).value=prop7;}
+          }      
+       if(c=="currentlimiter"){
+        $("webtronics_rsource").style.display='table-row'
+        $("webtronics_rsink").style.display='table-row'
+        $("webtronics_inoffset").style.display='table-row'
+        $("webtronics_gain").style.display='table-row'
+        $("webtronics_ilimitsource").style.display='table-row'
+        $("webtronics_ilimitsink").style.display='table-row'
+        $("webtronics_vpwr").style.display='table-row'
+        $("webtronics_isource").style.display='table-row'
+        $("webtronics_isink").style.display='table-row'
+        $("webtronics_routdomain").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"rsource");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"rsink");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"inoffset");
+        var prop4 = netlistcreator.readwtx(this.circuit.selected[0],"gain");
+        var prop5 = netlistcreator.readwtx(this.circuit.selected[0],"ilimitsource");
+        var prop6 = netlistcreator.readwtx(this.circuit.selected[0],"ilimitsink");
+        var prop7 = netlistcreator.readwtx(this.circuit.selected[0],"vpwr");
+        var prop8 = netlistcreator.readwtx(this.circuit.selected[0],"isource");
+        var prop9 = netlistcreator.readwtx(this.circuit.selected[0],"isink");
+        var prop10 = netlistcreator.readwtx(this.circuit.selected[0],"routdomain");
+        if(prop1!=""){$(webtronics_rsource_value).value=prop1;}
+        if(prop2!=""){$(webtronics_rsink_value).value=prop2;}
+        if(prop3!=""){$(webtronics_inoffset_value).value=prop3;}
+        if(prop4!=""){$(webtronics_gain_value).value=prop4;}
+        if(prop5!=""){$(webtronics_ilimitsource_value).value=prop5;}
+        if(prop6!=""){$(webtronics_ilimitsink_value).value=prop6;}
+        if(prop7!=""){$(webtronics_vpwr_value).value=prop7;}
+        if(prop8!=""){$(webtronics_isource_value).value=prop8;}
+        if(prop9!=""){$(webtronics_isink_value).value=prop9;}
+        if(prop10!=""){$(webtronics_routdomain_value).value=prop10;}
+          }      
+       if(c=="hysteresis"){
+        $("webtronics_inlow").style.display='table-row'
+        $("webtronics_inhigh").style.display='table-row'
+        $("webtronics_outlowerlimit").style.display='table-row'
+        $("webtronics_outupperlimit").style.display='table-row'
+        $("webtronics_fraction").style.display='table-row'
+        $("webtronics_indomain").style.display='table-row'
+        $("webtronics_hyst").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"inlow");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"inhigh");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"outlowerlimit");
+        var prop4 = netlistcreator.readwtx(this.circuit.selected[0],"outupperlimit");
+        var prop5 = netlistcreator.readwtx(this.circuit.selected[0],"fraction");
+        var prop6 = netlistcreator.readwtx(this.circuit.selected[0],"indomain");
+        var prop7 = netlistcreator.readwtx(this.circuit.selected[0],"hyst");
+        if(prop1!=""){$(webtronics_inlow_value).value=prop1;}
+        if(prop2!=""){$(webtronics_inhigh_value).value=prop2;}
+        if(prop3!=""){$(webtronics_outlowerlimit_value).value=prop3;}
+        if(prop4!=""){$(webtronics_outupperlimit_value).value=prop4;}
+        if(prop5!=""){$(webtronics_fraction_value).value=prop5;}
+        if(prop6!=""){$(webtronics_indomain_value).value=prop6;}
+        if(prop7!=""){$(webtronics_hyst_value).value=prop7;}
+          }      
+        if(c=="differentiator"){
+        $("webtronics_outoffset").style.display='table-row'
+        $("webtronics_gain").style.display='table-row'
+        $("webtronics_outlowerlimit").style.display='table-row'
+        $("webtronics_outupperlimit").style.display='table-row'
+        $("webtronics_limitrange").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"outoffset");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"outlowerlimit");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"outupperlimit");
+        var prop4 = netlistcreator.readwtx(this.circuit.selected[0],"limitrange");
+        var prop5 = netlistcreator.readwtx(this.circuit.selected[0],"gain");
+        if(prop1!=""){$(webtronics_outoffset_value).value=prop1;}
+        if(prop2!=""){$(webtronics_outlowerlimit_value).value=prop2;}
+        if(prop3!=""){$(webtronics_outupperlimit_value).value=prop3;}
+        if(prop4!=""){$(webtronics_limitrange_value).value=prop4;}
+        if(prop5!=""){$(webtronics_gain_value).value=prop5;}
+          }      
+        if(c=="integrator"){
+        $("webtronics_outoffset").style.display='table-row'
+        $("webtronics_gain").style.display='table-row'
+        $("webtronics_outlowerlimit").style.display='table-row'
+        $("webtronics_outupperlimit").style.display='table-row'
+        $("webtronics_limitrange").style.display='table-row'
+        $("webtronics_outic").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"outoffset");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"outlowerlimit");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"outupperlimit");
+        var prop4 = netlistcreator.readwtx(this.circuit.selected[0],"limitrange");
+        var prop5 = netlistcreator.readwtx(this.circuit.selected[0],"gain");
+        var prop6 = netlistcreator.readwtx(this.circuit.selected[0],"outic");
+        if(prop1!=""){$(webtronics_outoffset_value).value=prop1;}
+        if(prop2!=""){$(webtronics_outlowerlimit_value).value=prop2;}
+        if(prop3!=""){$(webtronics_outupperlimit_value).value=prop3;}
+        if(prop4!=""){$(webtronics_limitrange_value).value=prop4;}
+        if(prop5!=""){$(webtronics_gain_value).value=prop5;}
+        if(prop6!=""){$(webtronics_outic_value).value=prop6;}
+          }        
+        if(c=="sdomain"){
+        $("webtronics_gain").style.display='table-row'
+        $("webtronics_intic").style.display='table-row'
+        $("webtronics_dencoeff").style.display='table-row'
+        $("webtronics_numcoeff").style.display='table-row'
+        $("webtronics_inoffset").style.display='table-row'
+        $("webtronics_denormfreq").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"gain");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"intic");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"dencoeff");
+        var prop4 = netlistcreator.readwtx(this.circuit.selected[0],"numcoeff");
+        var prop5 = netlistcreator.readwtx(this.circuit.selected[0],"inoffset");
+        var prop6 = netlistcreator.readwtx(this.circuit.selected[0],"denormfreq");
+        if(prop1!=""){$(webtronics_gain_value).value=prop1;}
+        if(prop2!=""){$(webtronics_intic_value).value=prop2;}
+        if(prop3!=""){$(webtronics_dencoeff_value).value=prop3;}
+        if(prop4!=""){$(webtronics_numcoeff_value).value=prop4;}
+        if(prop5!=""){$(webtronics_inoffset_value).value=prop5;}
+        if(prop6!=""){$(webtronics_denormfreq_value).value=prop6;}
+        }    
+        if(c=="slewrateblock"){
+        $("webtronics_riseslope").style.display='table-row'
+        $("webtronics_fallslope").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"riseslope");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"fallslope");
+        if(prop1!=""){$(webtronics_riseslope_value).value=prop1;}
+        if(prop2!=""){$(webtronics_fallslope_value).value=prop2;}
+        }    
+        if(c=="sineoscillator"){
+        $("webtronics_outlow").style.display='table-row'
+        $("webtronics_outhigh").style.display='table-row'
+        $("webtronics_cntlarr").style.display='table-row'
+        $("webtronics_freqarr").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"outlow");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"outhigh");
+        var prop3=netlistcreator.readwtx(this.circuit.selected[0],"cntlarr");  
+        var prop4 = netlistcreator.readwtx(this.circuit.selected[0],"freqarr");
+        if(prop1!=""){$(webtronics_outlow_value).value=prop1;}
+        if(prop2!=""){$(webtronics_outhigh_value).value=prop2;}
+        if(prop3!=""){$(webtronics_cntlarr_value).value=prop3;}
+        if(prop4!=""){$(webtronics_freqarr_value).value=prop4;}
+        }    
+        if(c=="triangleoscillator"){
+        $("webtronics_outlow").style.display='table-row'
+        $("webtronics_outhigh").style.display='table-row'
+        $("webtronics_cntlarr").style.display='table-row'
+        $("webtronics_freqarr").style.display='table-row'
+        $("webtronics_duty").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"outlow");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"outhigh");
+        var prop3=netlistcreator.readwtx(this.circuit.selected[0],"cntlarr");  
+        var prop4 = netlistcreator.readwtx(this.circuit.selected[0],"freqarr");
+        var prop5 = netlistcreator.readwtx(this.circuit.selected[0],"duty");
+        if(prop1!=""){$(webtronics_outlow_value).value=prop1;}
+        if(prop2!=""){$(webtronics_outhigh_value).value=prop2;}
+        if(prop3!=""){$(webtronics_cntlarr_value).value=prop3;}
+        if(prop4!=""){$(webtronics_freqarr_value).value=prop4;}
+        if(prop5!=""){$(webtronics_duty_value).value=prop5;}
+        }    
+        if(c=="squareoscillator"){
+        $("webtronics_outlow").style.display='table-row'
+        $("webtronics_outhigh").style.display='table-row'
+        $("webtronics_cntlarr").style.display='table-row'
+        $("webtronics_freqarr").style.display='table-row'
+        $("webtronics_duty").style.display='table-row'
+        $("webtronics_falltime").style.display='table-row'
+        $("webtronics_risetime").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"outlow");  
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"outhigh");
+        var prop3=netlistcreator.readwtx(this.circuit.selected[0],"cntlarr");  
+        var prop4 = netlistcreator.readwtx(this.circuit.selected[0],"freqarr");
+        var prop5 = netlistcreator.readwtx(this.circuit.selected[0],"duty");
+        var prop6 = netlistcreator.readwtx(this.circuit.selected[0],"risetime");
+        var prop7 = netlistcreator.readwtx(this.circuit.selected[0],"falltime");
+        if(prop1!=""){$(webtronics_outlow_value).value=prop1;}
+        if(prop2!=""){$(webtronics_outhigh_value).value=prop2;}
+        if(prop3!=""){$(webtronics_cntlarr_value).value=prop3;}
+        if(prop4!=""){$(webtronics_freqarr_value).value=prop4;}
+        if(prop5!=""){$(webtronics_duty_value).value=prop5;}
+        if(prop6!=""){$(webtronics_risetime_value).value=prop6;}
+        if(prop7!=""){$(webtronics_falltime_value).value=prop7;}
+        }    
+        if(c=="capacitancemeter"){
+          $("webtronics_gain").style.display='table-row'
+          var prop1 = netlistcreator.readwtx(this.circuit.selected[0],"gain");
+        if(prop1!=""){$(webtronics_gain_value).value=prop1;}
+        }
+        if(c=="inductancemeter"){
+          $("webtronics_gain").style.display='table-row'
+          var prop1 = netlistcreator.readwtx(this.circuit.selected[0],"gain");
+        if(prop1!=""){$(webtronics_gain_value).value=prop1;}
+        }
+        if(c=="oneshot"){
+        $("webtronics_cntlarr").style.display='table-row'
+        $("webtronics_pwarr").style.display='table-row'
+        $("webtronics_clktrig").style.display='table-row'
+        $("webtronics_ptrig").style.display='table-row'
+        $("webtronics_outlow").style.display='table-row'
+        $("webtronics_outhigh").style.display='table-row'
+         $("webtronics_rdelay").style.display='table-row'
+          $("webtronics_fdelay").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"cntlarr"); 
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"pwarr");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"clktrig");
+        var prop4 = netlistcreator.readwtx(this.circuit.selected[0],"ptrig");
+        var prop5 = netlistcreator.readwtx(this.circuit.selected[0],"outlow");
+        var prop6 = netlistcreator.readwtx(this.circuit.selected[0],"outhigh");
+        var prop7 = netlistcreator.readwtx(this.circuit.selected[0],"rdelay");
+        var prop8 = netlistcreator.readwtx(this.circuit.selected[0],"fdelay");
+        if(prop1!=""){$(webtronics_cntlarr_value).value=prop1;}
+        if(prop2!=""){$(webtronics_pwarr_value).value=prop2;}
+        if(prop3!=""){$(webtronics_clktrig_value).value=prop3;}
+        if(prop4!=""){$(webtronics_ptrig_value).value=prop4;}
+        if(prop5!=""){$(webtronics_outlow_value).value=prop5;}
+        if(prop6!=""){$(webtronics_outhigh_value).value=prop6;}
+         if(prop7!=""){$(webtronics_rdelay_value).value=prop7;}
+        if(prop8!=""){$(webtronics_fdelay_value).value=prop8;}
+       
+        }
+
+ if(c=="memristor"){
+        $("webtronics_rmin").style.display='table-row'
+        $("webtronics_rmax").style.display='table-row'
+        $("webtronics_rinit").style.display='table-row'
+        $("webtronics_vt").style.display='table-row'
+        $("webtronics_alpha").style.display='table-row'
+        $("webtronics_beta").style.display='table-row'
+        var prop1=netlistcreator.readwtx(this.circuit.selected[0],"rmin"); 
+        var prop2 = netlistcreator.readwtx(this.circuit.selected[0],"rmax");
+        var prop3 = netlistcreator.readwtx(this.circuit.selected[0],"rinit");
+        var prop4 = netlistcreator.readwtx(this.circuit.selected[0],"vt");
+        var prop5 = netlistcreator.readwtx(this.circuit.selected[0],"alpha");
+        var prop6 = netlistcreator.readwtx(this.circuit.selected[0],"beta");
+        if(prop1!=""){$(webtronics_rmin_value).value=prop1;}
+        if(prop2!=""){$(webtronics_rmax_value).value=prop2;}
+        if(prop3!=""){$(webtronics_rinit_value).value=prop3;}
+        if(prop4!=""){$(webtronics_vt_value).value=prop4;}
+        if(prop5!=""){$(webtronics_alpha_value).value=prop5;}
+        if(prop6!=""){$(webtronics_beta_value).value=prop6;}
+          }   
+
+
+  }
+
+
+
   else {
     this.getvalues(this.circuit.selected[0]);
     $("directive").style.display='none'
@@ -1071,6 +1491,8 @@ if($("webtronics_select"))Event.observe($('webtronics_select'), 'click', functio
 
 
             jQuery('#webtronics_netlist_buttons').show();
+            jQuery('#webtronics_netlist_text').show();
+            jQuery('#webtronics_netlist_text_div').show();
 
 
 
@@ -1266,12 +1688,178 @@ if($('webtronics_properties_ok'))Event.observe($('webtronics_properties_ok'), 'c
   netlistcreator.writewtx(model,"measure",$('webtronics_print_dir_value').value);
   
   var modelname=netlistcreator.readwtx(model,"name");
+  if(modelname=="gains"){
+    netlistcreator.writewtx(model,"gain",$('webtronics_gain_value').value);
+    netlistcreator.writewtx(model,"inoffset",$('webtronics_inoffset_value').value);
+    netlistcreator.writewtx(model,"outoffset",$('webtronics_outoffset_value').value);
+  }
+  else if(modelname=="summer"){
+    netlistcreator.writewtx(model,"ingain",$('webtronics_ingain_value').value);
+    netlistcreator.writewtx(model,"outgain",$('webtronics_outgain_value').value);
+    netlistcreator.writewtx(model,"inoffset",$('webtronics_inoffset_value').value);
+    netlistcreator.writewtx(model,"outoffset",$('webtronics_outoffset_value').value);
+  }
+  else if(modelname=="multiplier"){
+    netlistcreator.writewtx(model,"ingain",$('webtronics_ingain_value').value);
+    netlistcreator.writewtx(model,"outgain",$('webtronics_outgain_value').value);
+    netlistcreator.writewtx(model,"inoffset",$('webtronics_inoffset_value').value);
+    netlistcreator.writewtx(model,"outoffset",$('webtronics_outoffset_value').value);
+  }
+    else if(modelname=="divider"){
+    netlistcreator.writewtx(model,"numgain",$('webtronics_numgain_value').value);
+    netlistcreator.writewtx(model,"outgain",$('webtronics_outgain_value').value);
+    netlistcreator.writewtx(model,"numoffset",$('webtronics_numoffset_value').value);
+    netlistcreator.writewtx(model,"dengain",$('webtronics_dengain_value').value);
+    netlistcreator.writewtx(model,"denoffset",$('webtronics_denoffset_value').value);
+    netlistcreator.writewtx(model,"fraction",$('webtronics_fraction_value').value);
+    netlistcreator.writewtx(model,"dendomain",$('webtronics_dendomain_value').value);
+    netlistcreator.writewtx(model,"denlowerlimit",$('webtronics_denlowerlimit_value').value);
+    netlistcreator.writewtx(model,"outoffset",$('webtronics_outoffset_value').value);
+  }
+  else if(modelname=="limiter"){
+    netlistcreator.writewtx(model,"limitrange",$('webtronics_limitrange_value').value);
+    netlistcreator.writewtx(model,"fraction",$('webtronics_fraction_value').value);
+    netlistcreator.writewtx(model,"outupperlimit",$('webtronics_outupperlimit_value').value);
+    netlistcreator.writewtx(model,"outlowerlimit",$('webtronics_outlowerlimit_value').value);
+    netlistcreator.writewtx(model,"inoffset",$('webtronics_inoffset_value').value);
+    netlistcreator.writewtx(model,"gain",$('webtronics_gain_value').value);
+  }
+  else if(modelname=="controllimiter"){
+    netlistcreator.writewtx(model,"limitrange",$('webtronics_limitrange_value').value);
+    netlistcreator.writewtx(model,"fraction",$('webtronics_fraction_value').value);
+    netlistcreator.writewtx(model,"upperdelta",$('webtronics_upperdelta_value').value);
+    netlistcreator.writewtx(model,"lowerdelta",$('webtronics_lowerdelta_value').value);
+    netlistcreator.writewtx(model,"inoffset",$('webtronics_inoffset_value').value);
+    netlistcreator.writewtx(model,"gain",$('webtronics_gain_value').value);
+  }
+  else if(modelname=="pwlcontrolsource"){
+    netlistcreator.writewtx(model,"xarr",$('webtronics_xarr_value').value);
+    netlistcreator.writewtx(model,"fraction",$('webtronics_fraction_value').value);
+    netlistcreator.writewtx(model,"yarr",$('webtronics_yarr_value').value);
+    netlistcreator.writewtx(model,"indomain",$('webtronics_indomain_value').value);
+    }
+  else if(modelname=="multiinputpwlblock"){
+    netlistcreator.writewtx(model,"xarr",$('webtronics_xarr_value').value);
+    netlistcreator.writewtx(model,"amodel",$('webtronics_amodel_value').value);
+    netlistcreator.writewtx(model,"yarr",$('webtronics_yarr_value').value);
+    }
+  else if(modelname=="aswitch"){
+    netlistcreator.writewtx(model,"coff",$('webtronics_coff_value').value);
+    netlistcreator.writewtx(model,"con",$('webtronics_con_value').value);
+    netlistcreator.writewtx(model,"roff",$('webtronics_roff_value').value);
+    netlistcreator.writewtx(model,"ron",$('webtronics_ron_value').value);
+    netlistcreator.writewtx(model,"log",$('webtronics_log_value').value);
+   }
+  else if(modelname=="zener"){
+    netlistcreator.writewtx(model,"irev",$('webtronics_irev_value').value);
+    netlistcreator.writewtx(model,"isat",$('webtronics_isat_value').value);
+    netlistcreator.writewtx(model,"limitswitch",$('webtronics_limitswitch_value').value);
+    netlistcreator.writewtx(model,"nfor",$('webtronics_nfor_value').value);
+    netlistcreator.writewtx(model,"vbreak",$('webtronics_vbreak_value').value);
+    netlistcreator.writewtx(model,"ibreak",$('webtronics_ibreak_value').value);
+    netlistcreator.writewtx(model,"rbreak",$('webtronics_rbreak_value').value);
+   }
+  else if(modelname=="currentlimiter"){
+    netlistcreator.writewtx(model,"rsource",$('webtronics_rsource_value').value);
+    netlistcreator.writewtx(model,"rsink",$('webtronics_rsink_value').value);
+    netlistcreator.writewtx(model,"inoffset",$('webtronics_inoffset_value').value);
+    netlistcreator.writewtx(model,"gain",$('webtronics_gain_value').value);
+    netlistcreator.writewtx(model,"ilimitsource",$('webtronics_ilimitsource_value').value);
+    netlistcreator.writewtx(model,"ilimitsink",$('webtronics_ilimitsink_value').value);
+    netlistcreator.writewtx(model,"vpwr",$('webtronics_ibreak_value').value);
+    netlistcreator.writewtx(model,"isource",$('webtronics_isource_value').value);
+    netlistcreator.writewtx(model,"isink",$('webtronics_isink_value').value);
+    netlistcreator.writewtx(model,"routdomain",$('webtronics_routdomain_value').value);
+   }
+  else if(modelname=="hysteresis"){
+    netlistcreator.writewtx(model,"inlow",$('webtronics_inlow_value').value);
+    netlistcreator.writewtx(model,"inhigh",$('webtronics_inhigh_value').value);
+    netlistcreator.writewtx(model,"outlowerlimit",$('webtronics_outlowerlimit_value').value);
+    netlistcreator.writewtx(model,"outupperlimit",$('webtronics_outupperlimit_value').value);
+    netlistcreator.writewtx(model,"hyst",$('webtronics_hyst_value').value);
+    netlistcreator.writewtx(model,"indomain",$('webtronics_indomain_value').value);
+    netlistcreator.writewtx(model,"fraction",$('webtronics_fraction_value').value);
+   }   
+  else if(modelname=="differentiator"){
+    netlistcreator.writewtx(model,"outoffset",$('webtronics_outoffset_value').value);
+    netlistcreator.writewtx(model,"gain",$('webtronics_gain_value').value);
+    netlistcreator.writewtx(model,"outlowerlimit",$('webtronics_outlowerlimit_value').value);
+    netlistcreator.writewtx(model,"outupperlimit",$('webtronics_outupperlimit_value').value);
+    netlistcreator.writewtx(model,"limitrange",$('webtronics_limitrange_value').value);
+   }
 
-  if(modelname=="ac"){
+  else if(modelname=="integrator"){
+    netlistcreator.writewtx(model,"outoffset",$('webtronics_outoffset_value').value);
+    netlistcreator.writewtx(model,"gain",$('webtronics_gain_value').value);
+    netlistcreator.writewtx(model,"outlowerlimit",$('webtronics_outlowerlimit_value').value);
+    netlistcreator.writewtx(model,"outupperlimit",$('webtronics_outupperlimit_value').value);
+    netlistcreator.writewtx(model,"limitrange",$('webtronics_limitrange_value').value);
+     netlistcreator.writewtx(model,"outic",$('webtronics_outic_value').value);
+   }
+  else if(modelname=="sdomain"){
+    netlistcreator.writewtx(model,"gain",$('webtronics_gain_value').value);
+    netlistcreator.writewtx(model,"intic",$('webtronics_intic_value').value);
+    netlistcreator.writewtx(model,"numcoeff",$('webtronics_numcoeff_value').value);
+    netlistcreator.writewtx(model,"dencoeff",$('webtronics_dencoeff_value').value);
+    netlistcreator.writewtx(model,"inoffset",$('webtronics_inoffset_value').value);
+    netlistcreator.writewtx(model,"denormfreq",$('webtronics_denormfreq_value').value);
+  }
+  else if(modelname=="slewrateblock"){
+    netlistcreator.writewtx(model,"riseslope",$('webtronics_riseslope_value').value);
+    netlistcreator.writewtx(model,"fallslope",$('webtronics_fallslope_value').value);
+    }
+  else if(modelname=="sineoscillator"){
+    netlistcreator.writewtx(model,"outlow",$('webtronics_outlow_value').value);
+    netlistcreator.writewtx(model,"outhigh",$('webtronics_outhigh_value').value);
+    netlistcreator.writewtx(model,"freqarr",$('webtronics_freqarr_value').value);
+    netlistcreator.writewtx(model,"cntlarr",$('webtronics_cntlarr_value').value);
+    }
+  else if(modelname=="triangleoscillator"){
+    netlistcreator.writewtx(model,"outlow",$('webtronics_outlow_value').value);
+    netlistcreator.writewtx(model,"outhigh",$('webtronics_outhigh_value').value);
+    netlistcreator.writewtx(model,"freqarr",$('webtronics_freqarr_value').value);
+    netlistcreator.writewtx(model,"cntlarr",$('webtronics_cntlarr_value').value);
+    netlistcreator.writewtx(model,"duty",$('webtronics_duty_value').value);
+    }
+  else if(modelname=="squareoscillator"){
+    netlistcreator.writewtx(model,"outlow",$('webtronics_outlow_value').value);
+    netlistcreator.writewtx(model,"outhigh",$('webtronics_outhigh_value').value);
+    netlistcreator.writewtx(model,"freqarr",$('webtronics_freqarr_value').value);
+    netlistcreator.writewtx(model,"cntlarr",$('webtronics_cntlarr_value').value);
+    netlistcreator.writewtx(model,"duty",$('webtronics_duty_value').value);
+    netlistcreator.writewtx(model,"risetime",$('webtronics_risetime_value').value);
+    netlistcreator.writewtx(model,"falltime",$('webtronics_falltime_value').value);
+    }
+else if(modelname=="oneshot"){
+    netlistcreator.writewtx(model,"cntlarr",$('webtronics_cntlarr_value').value);
+    netlistcreator.writewtx(model,"pwarr",$('webtronics_pwarr_value').value);
+    netlistcreator.writewtx(model,"clktrig",$('webtronics_clktrig_value').value);
+    netlistcreator.writewtx(model,"ptrig",$('webtronics_ptrig_value').value);
+    netlistcreator.writewtx(model,"outlow",$('webtronics_outlow_value').value);
+     netlistcreator.writewtx(model,"outhigh",$('webtronics_outhigh_value').value);
+      netlistcreator.writewtx(model,"rdelay",$('webtronics_rdelay_value').value);
+     netlistcreator.writewtx(model,"fdelay",$('webtronics_fdelay_value').value);
+   }
+   
+
+ else if(modelname=="memristor"){
+    netlistcreator.writewtx(model,"rmin",$('webtronics_rmin_value').value);
+    netlistcreator.writewtx(model,"rmax",$('webtronics_rmax_value').value);
+    netlistcreator.writewtx(model,"rinit",$('webtronics_rinit_value').value);
+    netlistcreator.writewtx(model,"vt",$('webtronics_vt_value').value);
+    netlistcreator.writewtx(model,"alpha",$('webtronics_alpha_value').value);
+     netlistcreator.writewtx(model,"beta",$('webtronics_beta_value').value);
+   }
+
+  else if(modelname=="ac"){
     netlistcreator.writewtx(model,"phase",$('webtronics_phase_value').value);
     netlistcreator.writewtx(model,"amplitude",$('webtronics_amplitude_value').value);
 
   }
+  else if(modelname=="capacitancemeter"||modelname=="inductancemeter"){
+    netlistcreator.writewtx(model,"gain",$('webtronics_gain_value').value);
+     }
+
   else if(modelname=="sinvoltagesource"){
     netlistcreator.writewtx(model,"offsetvoltage",$('webtronics_offsetvoltage_value').value);
     netlistcreator.writewtx(model,"voltageamplitude",$('webtronics_voltageamplitude_value').value);
@@ -1308,7 +1896,7 @@ if($('webtronics_properties_ok'))Event.observe($('webtronics_properties_ok'), 'c
     netlistcreator.writewtx(model,"eval6",$('webtronics_eval6_value').value);
   }
 
-  else if(modelname=="and"|| c=='not'|| c=='nand'|| c=='or'||c=='nor'||c=='xor'||c=='xnor'){
+  else if(modelname=="and"|| modelname=='not'|| modelname=='nand'|| modelname=='or'||modelname=='nor'||modelname=='xor'||modelname=='xnor'){
     netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value);
     netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value);
     netlistcreator.writewtx(model,"inputload",$('webtronics_inputload_value').value);
diff --git a/views/script/netlist.js b/views/script/netlist.js
index 03d65c1..5ab7947 100644
--- a/views/script/netlist.js
+++ b/views/script/netlist.js
@@ -14,6 +14,7 @@ var netlistcreator={
 
   sortnetlist:function(list){
     var G=[];
+    var X=[];
     var S=[];
     var A=[];
     var B=[];
@@ -81,6 +82,13 @@ var netlistcreator={
       else if(list[i].type=='x'){	
         U.push(list[i]);
       }
+      // for analogmodels s
+      else if(list[i].category=="analogmodels"){
+        X.push(list[i]);
+      }
+
+
+
       /* this is the best way I could think to tell if a part i digital */
       else if(list[i].category=="digitalmodels"){	
         A.push(list[i]);
@@ -113,6 +121,7 @@ var netlistcreator={
     Q.sort(sortfunction);
     R.sort(sortfunction);
     U.sort(sortfunction);
+    X.sort(sortfunction);
     A.sort(sortfunction);
 
     var newlist=[];
@@ -132,6 +141,7 @@ var netlistcreator={
     Q.each(function(item){newlist.push(item)});		
     R.each(function(item){newlist.push(item)});
     U.each(function(item){newlist.push(item)});		
+    X.each(function(item){newlist.push(item)});
     A.each(function(item){newlist.push(item)});		
     other.each(function(item){newlist.push(item)});		
 
@@ -198,7 +208,11 @@ tovector:function(pin,nodenumber){
  getwtxdata:function(parts){
   list=[];
   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:""
+    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:""
+
+
   }
     /*
      *        try{
@@ -421,6 +435,234 @@ catch(e){
     }
     catch(e){}    
 
+try{ part.inoffset=this.readwtx(parts[i],'inoffset'); }
+catch(e){ part.error="wtx:inoffset not found"; }
+
+
+try{ part.gain=this.readwtx(parts[i],'gain'); }
+catch(e){ part.error="wtx:gain not found"; }
+
+
+try{ part.outoffset=this.readwtx(parts[i],'outoffset'); }
+catch(e){ part.error="wtx:outoffset not found"; }
+
+try{ part.ingain=this.readwtx(parts[i],'ingain'); }
+catch(e){ part.error="wtx:ingain not found"; }
+
+try{ part.outgain=this.readwtx(parts[i],'outgain'); }
+catch(e){ part.error="wtx:outgain not found"; }
+
+try{ part.denoffset=this.readwtx(parts[i],'denoffset'); }
+catch(e){ part.error="wtx:denoffset not found"; }
+
+try{ part.dengain=this.readwtx(parts[i],'dengain'); }
+catch(e){ part.error="wtx:dengain not found"; }
+
+try{ part.numoffset=this.readwtx(parts[i],'numoffset'); }
+catch(e){ part.error="wtx:numoffset not found"; }
+
+try{ part.numgain=this.readwtx(parts[i],'numgain'); }
+catch(e){ part.error="wtx:numgain not found"; }
+
+try{ part.fraction=this.readwtx(parts[i],'fraction'); }
+catch(e){ part.error="wtx:fraction not found"; }
+
+try{ part.dendomain=this.readwtx(parts[i],'dendomain'); }
+catch(e){ part.error="wtx:dendomain not found"; }
+
+try{ part.denlowerlimit=this.readwtx(parts[i],'denlowerlimit'); }
+catch(e){ part.error="wtx:denlowerlimit not found"; }
+
+try{ part.outlowerlimit=this.readwtx(parts[i],'outlowerlimit'); }
+catch(e){ part.error="wtx:outlowerlimit not found"; }
+
+try{ part.outupperlimit=this.readwtx(parts[i],'outupperlimit'); }
+catch(e){ part.error="wtx:outupperlimit not found"; }
+
+
+try{ part.limitrange=this.readwtx(parts[i],'limitrange'); }
+catch(e){ part.error="wtx:limitrange not found"; }
+
+
+try{ part.upperdelta=this.readwtx(parts[i],'upperdelta'); }
+catch(e){ part.error="wtx:upperdelta not found"; }
+
+try{ part.lowerdelta=this.readwtx(parts[i],'lowerdelta'); }
+catch(e){ part.error="wtx:lowerdelta not found"; }
+
+try{ part.indomain=this.readwtx(parts[i],'indomain'); }
+catch(e){ part.error="wtx:indomain not found"; }
+
+try{ part.xarr=this.readwtx(parts[i],'xarr'); }
+catch(e){ part.error="wtx:xarr not found"; }
+
+try{ part.yarr=this.readwtx(parts[i],'yarr'); }
+catch(e){ part.error="wtx:yarr not found"; }
+
+try{ part.amodel=this.readwtx(parts[i],'amodel'); }
+catch(e){ part.error="wtx:amodel not found"; }
+
+try{ part.coff=this.readwtx(parts[i],'coff'); }
+catch(e){ part.error="wtx:coff not found"; }
+
+try{ part.con=this.readwtx(parts[i],'con'); }
+catch(e){ part.error="wtx:con not found"; }
+
+try{ part.roff=this.readwtx(parts[i],'roff'); }
+catch(e){ part.error="wtx:roff not found"; }
+
+
+try{ part.irev=this.readwtx(parts[i],'irev'); }
+catch(e){ part.error="wtx:irev not found"; }
+
+try{ part.rbreak=this.readwtx(parts[i],'rbreak'); }
+catch(e){ part.error="wtx:rbreak not found"; }
+
+try{ part.limitswitch=this.readwtx(parts[i],'limitswitch'); }
+catch(e){ part.error="wtx:limitswitch not found"; }
+
+try{ part.ron=this.readwtx(parts[i],'ron'); }
+catch(e){ part.error="wtx:ron not found"; }
+
+try{ part.log=this.readwtx(parts[i],'log'); }
+catch(e){ part.error="wtx:log not found"; }
+
+try{ part.vbreak=this.readwtx(parts[i],'vbreak'); }
+catch(e){ part.error="wtx:vbreak not found"; }
+
+
+try{ part.ibreak=this.readwtx(parts[i],'ibreak'); }
+catch(e){ part.error="wtx:ibreak not found"; }
+
+try{ part.isat=this.readwtx(parts[i],'isat'); }
+catch(e){ part.error="wtx:isat not found"; }
+
+try{ part.nfor=this.readwtx(parts[i],'nfor'); }
+catch(e){ part.error="wtx:nfor not found"; }
+
+try{ part.rsource=this.readwtx(parts[i],'rsource'); }
+catch(e){ part.error="wtx:rsource not found"; }
+
+try{ part.rsink=this.readwtx(parts[i],'rsink'); }
+catch(e){ part.error="wtx:rsink not found"; }
+
+try{ part.ilimitsink=this.readwtx(parts[i],'ilimitsink'); }
+catch(e){ part.error="wtx:ilimitsink not found"; }
+
+try{ part.ilimitsource=this.readwtx(parts[i],'ilimitsource'); }
+catch(e){ part.error="wtx:ilimitsource not found"; }
+
+try{ part.vpwr=this.readwtx(parts[i],'vpwr'); }
+catch(e){ part.error="wtx:vpwr not found"; }
+
+try{ part.isource=this.readwtx(parts[i],'isource'); }
+catch(e){ part.error="wtx:isource not found"; }
+
+try{ part.isink=this.readwtx(parts[i],'isink'); }
+catch(e){ part.error="wtx:isink not found"; }
+
+try{ part.routdomain=this.readwtx(parts[i],'routdomain'); }
+catch(e){ part.error="wtx:routdomain not found"; }
+
+try{ part.inlow=this.readwtx(parts[i],'inlow'); }
+catch(e){ part.error="wtx:inlow not found"; }
+
+try{ part.inhigh=this.readwtx(parts[i],'inhigh'); }
+catch(e){ part.error="wtx:inhigh not found"; }
+
+try{ part.hyst=this.readwtx(parts[i],'hyst'); }
+catch(e){ part.error="wtx:hyst not found"; }
+
+try{ part.outic=this.readwtx(parts[i],'outic'); }
+catch(e){ part.error="wtx:outic not found"; }
+
+
+try{ part.numcoeff=this.readwtx(parts[i],'numcoeff'); }
+catch(e){ part.error="wtx:numcoeff not found"; }
+
+
+try{ part.dencoeff=this.readwtx(parts[i],'dencoeff'); }
+catch(e){ part.error="wtx:dencoeff not found"; }
+
+try{ part.lowerdelta=this.readwtx(parts[i],'lowerdelta'); }
+catch(e){ part.error="wtx:lowerdelta not found"; }
+
+try{ part.intic=this.readwtx(parts[i],'intic'); }
+catch(e){ part.error="wtx:intic not found"; }
+
+try{ part.denormfreq=this.readwtx(parts[i],'denormfreq'); }
+catch(e){ part.error="wtx:denormfreq not found"; }
+
+try{ part.riseslope=this.readwtx(parts[i],'riseslope'); }
+catch(e){ part.error="wtx:riseslope not found"; }
+
+try{ part.fallslope=this.readwtx(parts[i],'fallslope'); }
+catch(e){ part.error="wtx:fallslope not found"; }
+
+try{ part.outlow=this.readwtx(parts[i],'outlow'); }
+catch(e){ part.error="wtx:outlow not found"; }
+
+try{ part.outhigh=this.readwtx(parts[i],'outhigh'); }
+catch(e){ part.error="wtx:outhigh not found"; }
+
+try{ part.cntlarr=this.readwtx(parts[i],'cntlarr'); }
+catch(e){ part.error="wtx:cntlarr not found"; }
+
+try{ part.freqarr=this.readwtx(parts[i],'freqarr'); }
+catch(e){ part.error="wtx:freqarr not found"; }
+
+try{ part.duty=this.readwtx(parts[i],'duty'); }
+catch(e){ part.error="wtx:duty not found"; }
+
+try{ part.risetime=this.readwtx(parts[i],'risetime'); }
+catch(e){ part.error="wtx:risetime not found"; }
+
+
+try{ part.falltime=this.readwtx(parts[i],'falltime'); }
+catch(e){ part.error="wtx:falltime not found"; }
+
+try{ part.clktrig=this.readwtx(parts[i],'clktrig'); }
+catch(e){ part.error="wtx:clktrig not found"; }
+
+try{ part.pwarr=this.readwtx(parts[i],'pwarr'); }
+catch(e){ part.error="wtx:pwarr not found"; }
+
+try{ part.ptrig=this.readwtx(parts[i],'ptrig'); }
+catch(e){ part.error="wtx:ptrig not found"; }
+
+try{ part.rdelay=this.readwtx(parts[i],'rdelay'); }
+catch(e){ part.error="wtx:rdelay not found"; }
+
+try{ part.fdelay=this.readwtx(parts[i],'fdelay'); }
+catch(e){ part.error="wtx:fdelay not found"; }
+
+try{ part.rmax=this.readwtx(parts[i],'rmax'); }
+catch(e){ part.error="wtx:rmax not found"; }
+
+try{ part.rmin=this.readwtx(parts[i],'rmin'); }
+catch(e){ part.error="wtx:rmin not found"; }
+
+try{ part.rinit=this.readwtx(parts[i],'isource'); }
+catch(e){ part.error="wtx:isource not found"; }
+
+try{ part.vt=this.readwtx(parts[i],'vt'); }
+catch(e){ part.error="wtx:vt not found"; }
+
+try{ part.alpha=this.readwtx(parts[i],'alpha'); }
+catch(e){ part.error="wtx:alpha not found"; }
+
+try{ part.beta=this.readwtx(parts[i],'beta'); }
+catch(e){ part.error="wtx:beta not found"; }
+
+
+
+
+
+
+
+
+
+
     list.push(part);
   }
   return list;
@@ -579,7 +821,12 @@ getnodes:function(parts){
       var net={error:parts[i].error,pwlval1:parts[i].pwlval1,pwlval2:parts[i].pwlval2,pwlval3:parts[i].pwlval3,pwlval4:parts[i].pwlval4,pwlval5:parts[i].pwlval5,pwlval6:parts[i].pwlval6,pwlval7:parts[i].pwlval7,pwlval8:parts[i].pwlval8,pulval1:parts[i].pulval1,pulval2:parts[i].pulval2,pulval3:parts[i].pulval3,pulval4:parts[i].pulval4,pulval5:parts[i].pulval5,pulval6:parts[i].pulval6,pulval7:parts[i].pulval7,name:parts[i].name,
         partid:parts[i].id,pins:{analog:parts[i].analogpins,digital:parts[i].digitalpins},model:parts[i].value,amplitude:parts[i].amplitude,
       phase:parts[i].phase, risedelay:parts[i].risedelay, inputload:parts[i].inputload, falldelay:parts[i].falldelay, offsetvoltage:parts[i].offsetvoltage,voltageamplitude:parts[i].voltageamplitude,frequency:parts[i].frequency,
-      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};
+      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
+
+    };
       if(net!=null)sections.netlist.push(net);
     }
     
@@ -628,7 +875,7 @@ createnetlist:function(responsefunc){
         pins.sort(function(a,b){return a.index > b.index? 1:a.index < b.index?-1:0;})
 //      console.log(pins);
 for(var j=0;j<pins.length;j++){command += " "+pins[j].node;}
-
+var pid=sections.netlist[i].partid;
   if(sections.netlist[i].name=="ac"){
    command+=" "+"AC "+sections.netlist[i].amplitude+" "+sections.netlist[i].phase;
  }else if(sections.netlist[i].name=="sinvoltagesource"){
@@ -649,6 +896,204 @@ else if(sections.netlist[i].name=="exponential"){
 else if(sections.netlist[i].name=="and"){
   command+=" "+sections.netlist[i].risedelay+" "+sections.netlist[i].falldelay+" "+sections.netlist[i].inputload;
 }
+else if(sections.netlist[i].name=="gains"){
+  var inoff=sections.netlist[i].inoffset;var gn=sections.netlist[i].gain;var outoff=sections.netlist[i].outoffset;
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" gain(in_offset="+inoff+" gain="+gn+" out_offset="+outoff+")\n";
+}
+else if(sections.netlist[i].name=="summer"){
+  var inoff=sections.netlist[i].inoffset;
+  var outoff=sections.netlist[i].outoffset;
+  var ingn=sections.netlist[i].ingain;
+  var outgn=sections.netlist[i].outgain;
+command+=" ref_"+pid+"\n"+".model ref_"+pid+" summer(in_offset=["+inoff+"] in_gain=["+ingn+"] out_gain=["+outgn+"] out_offset=["+outoff+"])\n";
+}
+else if(sections.netlist[i].name=="multiplier"){
+  var inoff=sections.netlist[i].inoffset;
+  var outoff=sections.netlist[i].outoffset;
+  var ingn=sections.netlist[i].ingain;
+  var outgn=sections.netlist[i].outgain;
+command+=" ref_"+pid+"\n"+".model ref_"+pid+" mult(in_offset=["+inoff+"] in_gain=["+ingn+"] out_gain="+outgn+" out_offset="+outoff+")\n";
+
+}
+else if(sections.netlist[i].name=="divider"){
+  var numoff=sections.netlist[i].numoffset;
+  var denoff=sections.netlist[i].denoffset;
+  var numgn=sections.netlist[i].numgain;
+  var dengn=sections.netlist[i].dengain;
+  var frac=sections.netlist[i].fraction;
+  var dendomn=sections.netlist[i].dendomain;
+  var dll=sections.netlist[i].denlowerlimit;
+  var outgn=sections.netlist[i].outgain;
+  var outoff=sections.netlist[i].outoffset;
+command+=" ref_"+pid+"\n"+".model ref_"+pid+" divide(num_offset="+numoff+" num_gain="+numgn+" den_offset="+denoff+" den_gain="+dengn+" den_lower.limit="+dll+" den_domain="+dendomn+" fraction="+frac+" out_gain="+outgn+" out_offset="+outoff+")\n";
+}
+else if(sections.netlist[i].name=="limiter"){
+  var lr=sections.netlist[i].limitrange;
+  var frac=sections.netlist[i].fraction;
+  var oul=sections.netlist[i].outupperlimit;
+  var oll=sections.netlist[i].outlowerlimit;
+  var gn=sections.netlist[i].gain;
+  var inoff=sections.netlist[i].inoffset;
+command+=" ref_"+pid+"\n"+".model ref_"+pid+" limit(in_offset="+inoff+" gain="+gn+" out_lower_limit="+oll+" out_upper_limit="+oul+" limit_range="+lr+" fraction="+frac+")\n";
+}
+else if(sections.netlist[i].name=="controllimiter"){
+  var lr=sections.netlist[i].limitrange;
+  var frac=sections.netlist[i].fraction;
+  var ud=sections.netlist[i].upperdelta;
+  var ld=sections.netlist[i].lowerdelta;
+  var gn=sections.netlist[i].gain;
+  var inoff=sections.netlist[i].inoffset;
+command+=" ref_"+pid+"\n"+".model ref_"+pid+" climit(in_offset="+inoff+" gain="+gn+" upper_delta="+ud+" lower_delta="+ld+" limit_range="+lr+" fraction="+frac+")\n";
+}
+else if(sections.netlist[i].name=="pwlcontrolsource"){
+  var xar=sections.netlist[i].xarr;
+  var frac=sections.netlist[i].fraction;
+  var yar=sections.netlist[i].yarr;
+  var indn=sections.netlist[i].indomain;
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" pwl(x_array=["+xar+"] y_array=["+yar+"] input_domain="+indn+" fraction="+frac+")\n";
+}
+else if(sections.netlist[i].name=="multiinputpwlblock"){
+  var xar=sections.netlist[i].xarr;
+  var modl=sections.netlist[i].amodel;
+  var yar=sections.netlist[i].yarr;
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" multi_input_pwl(x_array=["+xar+"] y_array=["+yar+"] model="+modl+")\n";
+}
+else if(sections.netlist[i].name=="aswitch"){
+  var rf=sections.netlist[i].roff;
+  var rn=sections.netlist[i].ron;
+  var cf=sections.netlist[i].coff;
+  var cn=sections.netlist[i].con;
+  var lg=sections.netlist[i].log;
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" aswitch(cntl_off="+cf+" cntl_on="+cn+" r_off="+rf+" r_on="+rn+" log="+lg+")\n";
+}
+else if(sections.netlist[i].name=="aswitch"){
+  var rf=sections.netlist[i].roff;
+  var rn=sections.netlist[i].ron;
+  var cf=sections.netlist[i].coff;
+  var cn=sections.netlist[i].con;
+  var lg=sections.netlist[i].log;
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" aswitch(cntl_off="+cf+" cntl_on="+cn+" r_off="+rf+" r_on="+rn+" log="+lg+")\n";
+}
+else if(sections.netlist[i].name=="zener"){
+  var ir=sections.netlist[i].irev;
+  var vb=sections.netlist[i].vbreak;
+  var rb=sections.netlist[i].rbreak;
+  var ib=sections.netlist[i].ibreak;
+  var nf=sections.netlist[i].nfor;
+  var is=sections.netlist[i].isat;
+  var ls=sections.netlist[i].limitswitch;
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" zener(v_breakdown="+vb+" i_breakdown="+ib+" r_breakdown="+rb+" i_rev="+ir+" i_sat="+is+" n_forward="+nf+" limit_switch="+ls+")\n";
+}
+else if(sections.netlist[i].name=="currentlimiter"){
+  var rso=sections.netlist[i].rsource;
+  var rsi=sections.netlist[i].rsink;
+  var inoff=sections.netlist[i].inoffset;
+  var gn=sections.netlist[i].gain;
+  var ilso=sections.netlist[i].ilimitsource;
+  var ilsi=sections.netlist[i].ilimitsink;
+  var vp=sections.netlist[i].vpwr;
+  var isi=sections.netlist[i].isink;
+  var iso=sections.netlist[i].isource;
+  var rd=sections.netlist[i].routdomain;
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" ilimit(in_offset="+inoff+" gain="+gn+" r_out_source="+rso+" r_out_sink="+rsi+" i_limit_source="+ilso+" i_limit_sink="+ilsi+" v_pwr_range="+vp+" i_source_range="+iso+" i_sink_range="+isi+" r_out_domain="+rd+")\n";
+}
+else if(sections.netlist[i].name=="hysteresis"){
+  var il=sections.netlist[i].inlow;
+  var ih=sections.netlist[i].inhigh;
+  var ol=sections.netlist[i].outlowerlimit;
+  var ou=sections.netlist[i].outupperlimit;
+  var h=sections.netlist[i].hyst;
+  var idmn=sections.netlist[i].indomain;
+  var frac=sections.netlist[i].fraction;
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" hyst(in_low="+il+" in_high="+ih+" hyst="+h+" out_lower_limit="+ol+" out_upper_limit="+ou+" input_domain="+idmn+" fraction="+frac+")\n";
+}
+else if(sections.netlist[i].name=="differentiator"){
+  var oo=sections.netlist[i].outoffset;
+  var gn=sections.netlist[i].gain;
+  var ol=sections.netlist[i].outlowerlimit;
+  var ou=sections.netlist[i].outupperlimit;
+  var lr=sections.netlist[i].limitrange;
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" d_dt(out_offset="+oo+" gain="+gn+" out_lower_limit="+ol+" out_upper_limit="+ou+" limit_range="+lr+")\n";
+}
+else if(sections.netlist[i].name=="integrator"){
+  var oo=sections.netlist[i].outoffset;
+  var gn=sections.netlist[i].gain;
+  var ol=sections.netlist[i].outlowerlimit;
+  var ou=sections.netlist[i].outupperlimit;
+  var lr=sections.netlist[i].limitrange;
+  var oi=sections.netlist[i].outic;
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" int(out_offset="+oo+" gain="+gn+" out_lower_limit="+ol+" out_upper_limit="+ou+" limit_range="+lr+" out_ic="+oi+")\n";
+}
+else if(sections.netlist[i].name=="sdomain"){
+  var gn=sections.netlist[i].gain;
+  var ic=sections.netlist[i].intic;
+  var nc=sections.netlist[i].numcoeff;
+  var dc=sections.netlist[i].dencoeff;
+  var io=sections.netlist[i].inoffset;
+  var df=sections.netlist[i].denormfreq;
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" s_xfer(gain="+gn+" in_offset="+io+" denormalized_freq="+df+" int_ic=["+ic+"] num_coeff=["+nc+"] den_coeff=["+dc+"])\n";
+}
+else if(sections.netlist[i].name=="slewrateblock"){
+  var gn=sections.netlist[i].riseslope;
+  var ic=sections.netlist[i].fallslope;
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" slew(rise_slope="+gn+" fall_slope="+ic+")\n";
+}
+
+else if(sections.netlist[i].name=="sineoscillator"){
+  var ol=sections.netlist[i].outlow;
+  var oh=sections.netlist[i].outhigh;
+ var ca=sections.netlist[i].cntlarr;
+  var fa=sections.netlist[i].freqarr;
+   command+=" ref_"+pid+"\n"+".model ref_"+pid+" sine(cntl_array=["+ca+"] freq_array=["+fa+"] out_low="+ol+" out_high="+oh+")\n";
+}
+else if(sections.netlist[i].name=="triangleoscillator"){
+  var ol=sections.netlist[i].outlow;
+  var oh=sections.netlist[i].outhigh;
+ var ca=sections.netlist[i].cntlarr;
+  var fa=sections.netlist[i].freqarr;
+  var dt=sections.netlist[i].duty;
+   command+=" ref_"+pid+"\n"+".model ref_"+pid+" triangle(cntl_array=["+ca+"] freq_array=["+fa+"] out_low="+ol+" out_high="+oh+" duty_cycle="+dt+")\n";
+}
+else if(sections.netlist[i].name=="squareoscillator"){
+  var ol=sections.netlist[i].outlow;
+  var oh=sections.netlist[i].outhigh;
+ var ca=sections.netlist[i].cntlarr;
+  var fa=sections.netlist[i].freqarr;
+  var dt=sections.netlist[i].duty;
+   var rt=sections.netlist[i].risetime;
+  var ft=sections.netlist[i].falltime;
+   command+=" ref_"+pid+"\n"+".model ref_"+pid+" square(cntl_array=["+ca+"] freq_array=["+fa+"] out_low="+ol+" out_high="+oh+" duty_cycle="+dt+" rise_time="+rt+" fall_time="+ft+")\n";
+}
+else if(sections.netlist[i].name=="capacitancemeter"){
+  var gn=sections.netlist[i].gain;
+   command+=" ref_"+pid+"\n"+".model ref_"+pid+" cmeter(gain="+gn+")\n";
+}
+
+else if(sections.netlist[i].name=="inductancemeter"){
+ var gn=sections.netlist[i].gain;
+   command+=" ref_"+pid+"\n"+".model ref_"+pid+" lmeter(gain="+gn+")\n";
+}
+else if(sections.netlist[i].name=="oneshot"){
+  var ct=sections.netlist[i].cntlarr;
+  var pw=sections.netlist[i].pwarr;
+  var ctg=sections.netlist[i].clktrig;
+  var pt=sections.netlist[i].ptrig;
+  var ol=sections.netlist[i].outlow;
+  var oh=sections.netlist[i].outhigh;
+  var rd=sections.netlist[i].rdelay;
+  var fd=sections.netlist[i].fdelay;
+
+  command+=" ref_"+pid+"\n"+".model ref_"+pid+" oneshot(cntl_array=["+ct+"] pw_array=["+pw+"] clk_trig="+ctg+" pos_edge_trig="+pt+" out_low="+ol+" out_high="+oh+" rise_delay="+rd+" fall_delay="+fd+")\n";
+}
+else if(sections.netlist[i].name=="memristor"){
+  var ct=sections.netlist[i].rmin;
+  var pw=sections.netlist[i].rmax;
+  var ctg=sections.netlist[i].rinit;
+  var pt=sections.netlist[i].alpha;
+  var ol=sections.netlist[i].beta;
+  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{
   command+=" "+sections.netlist[i].model;
 }
diff --git a/views/style/schematic.css b/views/style/schematic.css
index 78d35a1..7b98d6b 100644
--- a/views/style/schematic.css
+++ b/views/style/schematic.css
@@ -150,7 +150,7 @@ div#webtronics_side_bar{
     position:relative;
     float:left;
     width: 132px;
-	overflow: hidden;
+	overflow: auto;
 	border-style:solid;
 	border-width:2px;
 	border-color:black;
diff --git a/views/webtronix_server/analogmodels/aswitch.svg b/views/webtronix_server/analogmodels/aswitch.svg
new file mode 100644
index 0000000..93db76f
--- /dev/null
+++ b/views/webtronix_server/analogmodels/aswitch.svg
@@ -0,0 +1,43 @@
+<svg width="104" height="64" xmlns="http://www.w3.org/2000/svg">
+ 
+  <g
+	stroke='black'
+	stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="103" y="20" />
+            <wtx:node index="3" x="103" y="46" />
+            <wtx:node index="1" x="3" y="31" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>aswitch</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+    
+    <wtx:coff></wtx:coff>
+    <wtx:con></wtx:con>
+    <wtx:roff></wtx:roff>
+    <wtx:ron></wtx:ron>
+    <wtx:log></wtx:log>
+
+
+
+    <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="42" y="2.75" x="31.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_2" y2="19.75" x2="104.75" y1="19.75" x1="73.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="31.75" x2="31.75" y1="31.75" 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_9" y="34.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">aswitch</text>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_11" y2="45.75" x2="104.75" y1="45.75" x1="73.75" 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/analogmodels/capacitancemeter.svg b/views/webtronix_server/analogmodels/capacitancemeter.svg
new file mode 100644
index 0000000..4e6ec03
--- /dev/null
+++ b/views/webtronix_server/analogmodels/capacitancemeter.svg
@@ -0,0 +1,37 @@
+<svg width="104" height="64" xmlns="http://www.w3.org/2000/svg">
+ 
+ <g
+	stroke='black'
+	stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="101" y="31" />
+            <wtx:node index="1" x="3" y="32" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>capacitancemeter</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:gain></wtx:gain>
+
+    <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="42" y="2.75" x="31.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_2" y2="31.75" x2="102.75" y1="31.75" x1="71.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="32.75" x2="31.75" y1="32.75" 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_9" y="21.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Capaci-</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="35.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">tance</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_14" y="48.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">meter</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/controlledlimiter.svg b/views/webtronix_server/analogmodels/controlledlimiter.svg
new file mode 100644
index 0000000..bbe7d34
--- /dev/null
+++ b/views/webtronix_server/analogmodels/controlledlimiter.svg
@@ -0,0 +1,47 @@
+<svg width="100" height="62" xmlns="http://www.w3.org/2000/svg">
+ 
+ <g
+	stroke='black'
+	stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="100" y="29" />
+            <wtx:node index="1" x="5" y="29" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>controllimiter</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:inoffset></wtx:inoffset>
+    <wtx:gain></wtx:gain>
+    <wtx:upperdelta></wtx:upperdelta>
+    <wtx:lowerdelta></wtx:lowerdelta>
+    <wtx:limitrange></wtx:limitrange>
+    <wtx:fraction></wtx:fraction>
+
+
+    <wtx:flip></wtx:flip>
+    <wtx:value></wtx:value>
+    <wtx:label></wtx:label>
+    <wtx:spice></wtx:spice>
+    <wtx:model></wtx:model>
+    </wtx:part>
+</metadata>
+
+
+  <rect transform="rotate(90, 52.25, 31.25)" id="svg_6" height="40" width="60" y="11.25" x="22.25" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <rect id="svg_8" height="1" width="0" y="111.25" x="376.25" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <rect id="svg_9" height="0" width="1" y="89.25" x="321.25" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <text transform="matrix(-11.2186, 0, 0, -1.4465, 2022.18, 130.044)" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="2" id="svg_11" y="46.93647" x="164.786697" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_22" y2="29" x2="99" y1="29" x1="71" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_23" y2="29" x2="31" y1="29" x1="3" 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_41" y="21.25" x="35.25" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Control</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_43" y="42.25" x="35.25" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Limiter</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/currentlimiter.svg b/views/webtronix_server/analogmodels/currentlimiter.svg
new file mode 100644
index 0000000..ff45833
--- /dev/null
+++ b/views/webtronix_server/analogmodels/currentlimiter.svg
@@ -0,0 +1,53 @@
+<svg width="104" height="64" xmlns="http://www.w3.org/2000/svg">
+ <g
+  stroke='black'
+  stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="3" x="103" y="20" />
+            <wtx:node index="4" x="103" y="46" />
+            <wtx:node index="1" x="3" y="20" />
+            <wtx:node index="2" x="3" y="46" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>currentlimiter</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:rsource></wtx:rsource>
+    <wtx:rsink></wtx:rsink>
+    <wtx:inoffset></wtx:inoffset>
+    <wtx:gain></wtx:gain>
+    <wtx:ilimitsource></wtx:ilimitsource>
+    <wtx:ilimitsink></wtx:ilimitsink>
+    <wtx:vpwr></wtx:vpwr>
+    <wtx:isource></wtx:isource>
+    <wtx:isink></wtx:isink>
+    <wtx:routdomain></wtx:routdomain>
+    
+
+
+
+
+
+    <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="2.75" x="31.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_2" y2="19.75" x2="102.75" y1="19.75" x1="71.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="19.75" x2="31.75" y1="19.75" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_6" y2="45.75" x2="31.75" y1="45.75" 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_9" y="24.5" x="36.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">current</text>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_11" y2="45.75" x2="102.75" y1="45.75" x1="71.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_12" y="43.5" x="39.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">limiter</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/differentiator.svg b/views/webtronix_server/analogmodels/differentiator.svg
new file mode 100644
index 0000000..aa27fa0
--- /dev/null
+++ b/views/webtronix_server/analogmodels/differentiator.svg
@@ -0,0 +1,41 @@
+<svg width="104" height="64" xmlns="http://www.w3.org/2000/svg">
+  
+ <g
+	stroke='black'
+	stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="101" y="31" />
+            <wtx:node index="1" x="3" y="32" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>differentiator</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:outoffset></wtx:outoffset>
+    <wtx:gain></wtx:gain>
+    <wtx:outlowerlimit></wtx:outlowerlimit>
+    <wtx:outupperlimit></wtx:outupperlimit>
+    <wtx:limitrange></wtx:limitrange>
+
+
+    <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="2.75" x="31.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_2" y2="31.75" x2="102.75" y1="31.75" x1="71.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="32.75" x2="31.75" y1="32.75" 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_9" y="30.5" x="36.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Differ-</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="44.5" x="33.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">entiator</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/divider.svg b/views/webtronix_server/analogmodels/divider.svg
new file mode 100644
index 0000000..5564741
--- /dev/null
+++ b/views/webtronix_server/analogmodels/divider.svg
@@ -0,0 +1,46 @@
+<svg width="104" height="64" xmlns="http://www.w3.org/2000/svg">
+  <g
+  stroke='black'
+  stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="3" x="100" y="31" />
+            <wtx:node index="1" x="2" y="19" />
+            <wtx:node index="2" x="2" y="45" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>divider</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:numoffset></wtx:numoffset>
+    <wtx:numgain></wtx:numgain>
+    <wtx:denoffset></wtx:denoffset>
+    <wtx:dengain></wtx:dengain>
+    <wtx:fraction></wtx:fraction>
+    <wtx:dendomain></wtx:dendomain>
+    <wtx:denlowerlimit></wtx:denlowerlimit>
+    <wtx:outgain></wtx:outgain>
+    <wtx:outoffset></wtx:outoffset>
+
+
+
+    <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="2.75" x="31.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_2" y2="31.75" x2="102.75" y1="31.75" x1="71.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="19.75" x2="31.75" y1="19.75" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_6" y2="45.75" x2="31.75" y1="45.75" 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_8" y="35.75" x="35.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Divider</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/gains.svg b/views/webtronix_server/analogmodels/gains.svg
new file mode 100644
index 0000000..4f1d084
--- /dev/null
+++ b/views/webtronix_server/analogmodels/gains.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="102" height="63" xmlns="http://www.w3.org/2000/svg">
+ 
+<g
+	stroke='black'
+	stroke-width='2px' >
+  
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="102" y="31" />
+            <wtx:node index="1" x="3" y="31" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>gains</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+    
+    <wtx:inoffset></wtx:inoffset>
+    <wtx:gain></wtx:gain>
+    <wtx:outoffset></wtx:outoffset>
+    
+
+    <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="58" width="40" y="3" x="31" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <rect id="svg_2" height="1" width="0" y="78" x="134" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_6" y2="31" x2="101" y1="31" x1="72" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_7" y2="31" x2="30" y1="31" x1="1" 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_9" y="33" x="38" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">GAIN</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/hysteresis.svg b/views/webtronix_server/analogmodels/hysteresis.svg
new file mode 100644
index 0000000..ddeb796
--- /dev/null
+++ b/views/webtronix_server/analogmodels/hysteresis.svg
@@ -0,0 +1,43 @@
+<svg width="104" height="64" xmlns="http://www.w3.org/2000/svg">
+  
+ <g
+	stroke='black'
+	stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="101" y="31" />
+            <wtx:node index="1" x="3" y="32" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>hysteresis</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:inlow></wtx:inlow>
+    <wtx:inhigh></wtx:inhigh>
+    <wtx:outlowerlimit></wtx:outlowerlimit>
+    <wtx:outupperlimit></wtx:outupperlimit>
+    <wtx:hyst></wtx:hyst>
+    <wtx:indomain></wtx:indomain>
+    <wtx:fraction></wtx:fraction>
+    
+
+
+    <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="2.75" x="31.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_2" y2="31.75" x2="102.75" y1="31.75" x1="71.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="32.75" x2="31.75" y1="32.75" 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_9" y="28.5" x="40.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Hyst</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/inductancemeter.svg b/views/webtronix_server/analogmodels/inductancemeter.svg
new file mode 100644
index 0000000..0b2f2b7
--- /dev/null
+++ b/views/webtronix_server/analogmodels/inductancemeter.svg
@@ -0,0 +1,37 @@
+<svg width="104" height="64" xmlns="http://www.w3.org/2000/svg">
+  
+ <g
+	stroke='black'
+	stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="101" y="31" />
+            <wtx:node index="1" x="3" y="32" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>inductancemeter</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:gain></wtx:gain>  
+
+    <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="42" y="2.75" x="31.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_2" y2="31.75" x2="102.75" y1="31.75" x1="71.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="32.75" x2="31.75" y1="32.75" 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_9" y="21.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Induc-</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="35.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">tance</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_14" y="48.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">meter</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/integrator.svg b/views/webtronix_server/analogmodels/integrator.svg
new file mode 100644
index 0000000..1536d88
--- /dev/null
+++ b/views/webtronix_server/analogmodels/integrator.svg
@@ -0,0 +1,42 @@
+<svg width="104" height="64" xmlns="http://www.w3.org/2000/svg">
+  
+ <g
+	stroke='black'
+	stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="101" y="31" />
+            <wtx:node index="1" x="3" y="32" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>integrator</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:outoffset></wtx:outoffset>
+    <wtx:gain></wtx:gain>
+    <wtx:outlowerlimit></wtx:outlowerlimit>
+    <wtx:outupperlimit></wtx:outupperlimit>
+    <wtx:limitrange></wtx:limitrange>
+    <wtx:outic></wtx:outic>
+
+    <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="2.75" x="31.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_2" y2="31.75" x2="102.75" y1="31.75" x1="71.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="32.75" x2="31.75" y1="32.75" 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_9" y="32.5" x="36.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Integr-</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="44.5" x="36.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">ator</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/limiter.svg b/views/webtronix_server/analogmodels/limiter.svg
new file mode 100644
index 0000000..e8e7a2a
--- /dev/null
+++ b/views/webtronix_server/analogmodels/limiter.svg
@@ -0,0 +1,44 @@
+<svg width="88" height="64" xmlns="http://www.w3.org/2000/svg">
+<g
+  stroke='black'
+  stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="100" y="29" />
+            <wtx:node index="1" x="5" y="29" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>limiter</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:limitrange></wtx:limitrange>
+    <wtx:fraction></wtx:fraction>
+    <wtx:outupperlimit></wtx:outupperlimit>
+    <wtx:outlowerlimit></wtx:outlowerlimit>
+    <wtx:gain></wtx:gain>
+    <wtx:inoffset></wtx:inoffset>
+
+    <wtx:flip></wtx:flip>
+    <wtx:value></wtx:value>
+    <wtx:label></wtx:label>
+    <wtx:spice></wtx:spice>
+    <wtx:model></wtx:model>
+    </wtx:part>
+</metadata>
+
+
+  <rect transform="rotate(90, 52.25, 31.25)" id="svg_6" height="40" width="60" y="11.25" x="22.25" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <rect id="svg_8" height="1" width="0" y="111.25" x="376.25" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <rect id="svg_9" height="0" width="1" y="89.25" x="321.25" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <text transform="matrix(-11.2186, 0, 0, -1.4465, 2022.18, 130.044)" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="2" id="svg_11" y="46.93647" x="164.786697" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_22" y2="29" x2="99" y1="29" x1="71" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_23" y2="29" x2="31" y1="29" x1="3" 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_43" y="22.25" x="35.25" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Limiter</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/memristor.svg b/views/webtronix_server/analogmodels/memristor.svg
new file mode 100644
index 0000000..2b52b9e
--- /dev/null
+++ b/views/webtronix_server/analogmodels/memristor.svg
@@ -0,0 +1,44 @@
+<svg width="89" height="32" xmlns="http://www.w3.org/2000/svg">
+  
+  <g
+  stroke='black'
+  stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="88" y="15" />           
+            <wtx:node index="1" x="3" y="15" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>memristor</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+
+
+     <wtx:rmin></wtx:rmin>
+    <wtx:rmax></wtx:rmax>
+    <wtx:rinit></wtx:rinit>
+    <wtx:vt></wtx:vt>
+    <wtx:alpha></wtx:alpha>
+    <wtx:beta></wtx:beta>
+
+
+    <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="30" width="40" y="0.75" x="23.75" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="15.75" x2="0.75" y1="15.75" x1="23.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <text transform="matrix(1, 0, 0, 1, 0, 0)" style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_6" y="12.75" x="30.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Mem-</text>
+  <text transform="matrix(1, 0, 0, 1, 0, 0)" style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_7" y="22.75" x="30.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">ristor</text>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_8" y2="15.75" x2="64.75" y1="15.75" x1="87.75" 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/analogmodels/multi_input_pwl_block.svg b/views/webtronix_server/analogmodels/multi_input_pwl_block.svg
new file mode 100644
index 0000000..5bdf044
--- /dev/null
+++ b/views/webtronix_server/analogmodels/multi_input_pwl_block.svg
@@ -0,0 +1,40 @@
+<svg width="104" height="64" xmlns="http://www.w3.org/2000/svg">
+<g
+  stroke='black'
+  stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="3" x="100" y="31" />
+            <wtx:node index="1" x="2" y="19" />
+            <wtx:node index="2" x="2" y="45" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>multiinputpwlblock</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:xarr></wtx:xarr>
+    <wtx:yarr></wtx:yarr>
+    <wtx:amodel></wtx:amodel>
+
+    <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="2.75" x="31.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_2" y2="31.75" x2="102.75" y1="31.75" x1="71.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="19.75" x2="31.75" y1="19.75" x1="0.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_6" y2="45.75" x2="31.75" y1="45.75" 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_8" y="16.75" x="40.75" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Multi</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_9" y="33.5" x="39.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Input</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_10" y="49.5" x="41.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">PWL</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/multiplier.svg b/views/webtronix_server/analogmodels/multiplier.svg
new file mode 100644
index 0000000..e1294ee
--- /dev/null
+++ b/views/webtronix_server/analogmodels/multiplier.svg
@@ -0,0 +1,42 @@
+<svg width="100" height="62" xmlns="http://www.w3.org/2000/svg">
+  <g
+  stroke='black'
+  stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="3" x="99" y="30" />
+            <wtx:node index="1" x="3" y="18" />
+            <wtx:node index="2" x="3" y="44" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>multiplier</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+        <wtx:inoffset></wtx:inoffset>
+    <wtx:ingain></wtx:ingain>
+    <wtx:outgain></wtx:outgain>
+    <wtx:outoffset></wtx:outoffset>
+
+    <wtx:flip></wtx:flip>
+    <wtx:value></wtx:value>
+    <wtx:label></wtx:label>
+    <wtx:spice></wtx:spice>
+    <wtx:model></wtx:model>
+    </wtx:part>
+</metadata>
+  <rect transform="rotate(90, 52.25, 31.25)" id="svg_6" height="40" width="60" y="11.25" x="22.25" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <rect id="svg_8" height="1" width="0" y="111.25" x="376.25" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <rect id="svg_9" height="0" width="1" y="89.25" x="321.25" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <text transform="matrix(-11.2186, 0, 0, -1.4465, 2022.18, 130.044)" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="2" id="svg_11" y="46.93647" x="164.786697" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_22" y2="29" x2="99" y1="29" x1="71" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_23" y2="17" x2="31" y1="17" x1="3" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_26" y2="44" x2="31" y1="44" x1="3" 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_41" y="21.25" x="35.25" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">MULTI-</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_43" y="42.25" x="35.25" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">PLIER</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/oneshot.svg b/views/webtronix_server/analogmodels/oneshot.svg
new file mode 100644
index 0000000..81db181
--- /dev/null
+++ b/views/webtronix_server/analogmodels/oneshot.svg
@@ -0,0 +1,50 @@
+<svg width="100" height="64" xmlns="http://www.w3.org/2000/svg">
+  <g
+  stroke='black'
+  stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="3" x="101" y="18" />
+            <wtx:node index="4" x="101" y="44" />
+            <wtx:node index="1" x="3" y="19" />
+            <wtx:node index="2" x="3" y="45" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>oneshot</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+        <wtx:cntlarr></wtx:cntlarr>
+    <wtx:pwarr></wtx:pwarr>
+    <wtx:clktrig></wtx:clktrig>
+    <wtx:ptrig></wtx:ptrig>
+    <wtx:outlow></wtx:outlow>
+    <wtx:outhigh></wtx:outhigh>
+    <wtx:rdelay></wtx:rdelay>
+    <wtx:fdelay></wtx:fdelay>
+
+
+    <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_35" height="60" width="40" y="1.5" x="30.5" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_37" y2="18.5" x2="100.5" y1="18.5" x1="70.5" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_38" y2="44.5" x2="100.5" y1="44.5" x1="70.5" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_39" y2="18.5" x2="29.5" y1="18.5" x1="-0.5" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_40" y2="44.5" x2="30.5" y1="44.5" x1="0.5" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_41" y2="39.5" x2="56.5" y1="39.5" x1="55.5" 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_42" y="21.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">One</text>
+  <text style="cursor: move;" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_43" y="36.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">shot</text>
+  <path d="m31.018559,39.3148c0.185184,0.185184 0.555553,0.185184 0.740738,0.370369c0.370369,0.370369 0.522915,0.645599 0.925926,0.740738c0.180229,0.042545 0.239426,0.054241 0.370369,0.185184c0.130943,0.130943 0.19928,0.114315 0.370369,0.185184c0.241959,0.100224 0.239426,0.239429 0.370369,0.370373c0.130943,0.130943 0.239426,0.054241 0.370369,0.185184c0.130943,0.130943 0.42461,-0.130947 0.555557,0c0.130943,0.130943 0.128414,0.270149 0.370369,0.370369c0.171089,0.070866 0.239426,0.054241 0.370369,0.185184c0.130943,0.130943 0.42461,0.054241 0.555553,0.185184c0.130943,0.130943 0.128414,0.270149 0.370369,0.370369c0.171089,0.070866 0.213379,0.043449 0.555557,0.185184c0.241955,0.10022 0.152546,0.460419 0.555553,0.555557c0.360462,0.085094 0.370369,0.185184 0.555553,0.370369c0.185184,0.185184 0.370369,0.370369 0.370369,0.555553c0,0.185184 0.185184,0.185184 0.370369,0.185184l0,0.185184l0.185184,0" id="svg_48" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <path d="m30.833372,49.499962c0,-0.185184 0.185186,-0.185184 0.370371,-0.185184c0.185184,0 0.199282,-0.114319 0.370369,-0.185184c0.241955,-0.10022 0.424608,-0.42461 0.555553,-0.555553c0.130943,-0.130943 0.498787,-0.270149 0.740742,-0.370369c0.171089,-0.070866 0.370369,0 0.555553,-0.185184c0.185184,-0.185184 0.370369,-0.185184 0.555553,-0.370369c0.185184,-0.185184 0.313595,-0.270149 0.555553,-0.370373c0.171093,-0.070869 0.199284,-0.114319 0.370373,-0.185184c0.241955,-0.10022 0.27301,-0.212841 0.370369,-0.370369c0.217697,-0.352242 0.555553,-0.185184 0.740738,-0.370369c0.185184,-0.185184 0.343098,-0.402424 0.555553,-0.555553c0.335926,-0.242123 0.555557,-0.185184 0.740742,-0.370369c0.185184,-0.185184 0.523041,-0.018127 0.740738,-0.370373c0.097355,-0.157528 0.185184,-0.185184 0.185184,-0.370369l0.185184,0l0.185184,-0.185184l0,-0.185184" id="svg_49" 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/analogmodels/pwlcontrolsource.svg b/views/webtronix_server/analogmodels/pwlcontrolsource.svg
new file mode 100644
index 0000000..8c4e5c3
--- /dev/null
+++ b/views/webtronix_server/analogmodels/pwlcontrolsource.svg
@@ -0,0 +1,41 @@
+<svg width="102" height="63" xmlns="http://www.w3.org/2000/svg">
+  <g
+  stroke='black'
+  stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="100" y="30" />
+            <wtx:node index="1" x="3" y="30" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>pwlcontrolsource</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:xarr></wtx:xarr>
+    <wtx:yarr></wtx:yarr>
+    <wtx:indomain></wtx:indomain>
+    <wtx:fraction></wtx:fraction>  
+
+
+    <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="58" width="40" y="3" x="31" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <rect id="svg_2" height="1" width="0" y="78" x="134" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_6" y2="31" x2="101" y1="31" x1="72" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_7" y2="31" x2="30" y1="31" x1="1" 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_9" y="15" x="39" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">PWL</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_10" y="30" x="34.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Control</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_11" y="45" x="34.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Source</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/sdomain.svg b/views/webtronix_server/analogmodels/sdomain.svg
new file mode 100644
index 0000000..eecf36d
--- /dev/null
+++ b/views/webtronix_server/analogmodels/sdomain.svg
@@ -0,0 +1,40 @@
+<svg width="102" height="63" xmlns="http://www.w3.org/2000/svg">
+  <g
+  stroke='black'
+  stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="100" y="30" />
+            <wtx:node index="1" x="3" y="30" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>sdomain</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:gain></wtx:gain>
+    <wtx:intic></wtx:intic>
+    <wtx:numcoeff></wtx:numcoeff>
+    <wtx:dencoeff></wtx:dencoeff>
+
+
+    <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="58" width="40" y="3" x="31" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <rect id="svg_2" height="1" width="0" y="78" x="134" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_6" y2="31" x2="101" y1="31" x1="72" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_7" y2="31" x2="30" y1="31" x1="1" 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_10" y="30" x="44.5" 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_11" y="45" x="33.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Domain</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/sineoscillator.svg b/views/webtronix_server/analogmodels/sineoscillator.svg
new file mode 100644
index 0000000..4a02748
--- /dev/null
+++ b/views/webtronix_server/analogmodels/sineoscillator.svg
@@ -0,0 +1,38 @@
+<svg width="104" height="64" xmlns="http://www.w3.org/2000/svg">
+   <g
+	stroke='black'
+	stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="100" y="31" />
+            <wtx:node index="1" x="3" y="32" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>sineoscillator</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:outlow></wtx:outlow>
+    <wtx:outhigh></wtx:outhigh>
+    <wtx:cntlarr></wtx:cntlarr>
+    <wtx:freqarr></wtx:freqarr>
+    
+    <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="42" y="2.75" x="31.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_2" y2="31.75" x2="102.75" y1="31.75" x1="71.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="32.75" x2="31.75" y1="32.75" 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_9" y="24.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">sine</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="44.5" x="32.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">oscillator</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/slewrateblock.svg b/views/webtronix_server/analogmodels/slewrateblock.svg
new file mode 100644
index 0000000..2a4ed95
--- /dev/null
+++ b/views/webtronix_server/analogmodels/slewrateblock.svg
@@ -0,0 +1,38 @@
+<svg width="102" height="63" xmlns="http://www.w3.org/2000/svg">
+  <g
+  stroke='black'
+  stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="100" y="30" />
+            <wtx:node index="1" x="3" y="30" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>slewrateblock</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:riseslope></wtx:riseslope>
+    <wtx:fallslope></wtx:fallslope>
+
+
+    <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="58" width="40" y="3" x="31" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <rect id="svg_2" height="1" width="0" y="78" x="134" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_6" y2="31" x2="101" y1="31" x1="72" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="undefined" stroke-linejoin="undefined" id="svg_7" y2="31" x2="30" y1="31" x1="1" 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_10" y="30" x="40.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">SRB</text>
+  
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/squareoscillator.svg b/views/webtronix_server/analogmodels/squareoscillator.svg
new file mode 100644
index 0000000..8edd02d
--- /dev/null
+++ b/views/webtronix_server/analogmodels/squareoscillator.svg
@@ -0,0 +1,43 @@
+<svg width="104" height="64" xmlns="http://www.w3.org/2000/svg">
+   <g
+	stroke='black'
+	stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="100" y="31" />
+            <wtx:node index="1" x="3" y="32" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>squareoscillator</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+
+    <wtx:outlow></wtx:outlow>
+    <wtx:outhigh></wtx:outhigh>
+    <wtx:cntlarr></wtx:cntlarr>
+    <wtx:freqarr></wtx:freqarr>
+    <wtx:duty></wtx:duty>
+    <wtx:risetime></wtx:risetime>
+    <wtx:falltime></wtx:falltime>  
+
+
+    <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="42" y="2.75" x="31.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_2" y2="31.75" x2="102.75" y1="31.75" x1="71.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="32.75" x2="31.75" y1="32.75" 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_9" y="25.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Square</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="44.5" x="32.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">oscillator</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/summer.svg b/views/webtronix_server/analogmodels/summer.svg
new file mode 100644
index 0000000..360b039
--- /dev/null
+++ b/views/webtronix_server/analogmodels/summer.svg
@@ -0,0 +1,50 @@
+<svg width="99" height="62" xmlns="http://www.w3.org/2000/svg">
+ 
+   <g
+  stroke='black'
+  stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="3" x="99" y="30" />
+            <wtx:node index="1" x="3" y="18" />
+            <wtx:node index="2" x="3" y="44" />
+          
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>summer</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+   
+    <wtx:inoffset></wtx:inoffset>
+    <wtx:ingain></wtx:ingain>
+    <wtx:outgain></wtx:outgain>
+    <wtx:outoffset></wtx:outoffset>
+
+
+
+    <wtx:flip></wtx:flip>
+    <wtx:value></wtx:value>
+    <wtx:label></wtx:label>
+    <wtx:spice></wtx:spice>
+    <wtx:model></wtx:model>
+    </wtx:part>
+</metadata>
+  <rect transform="rotate(90, 51.5, 31.5)" id="svg_6" height="40" width="60" y="11.5" x="21.5" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <rect id="svg_8" height="1" width="0" y="110.5" x="375.5" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <rect id="svg_9" height="0" width="1" y="88.5" x="320.5" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <text transform="matrix(-11.2186, 0, 0, -1.4465, 2022.18, 130.044)" xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="2" id="svg_11" y="47.454962" x="164.85355" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_22" y2="29.25" x2="98.25" y1="29.25" x1="70.25" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_23" y2="17.25" x2="30.25" y1="17.25" x1="2.25" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_26" y2="44.25" x2="30.25" y1="44.25" x1="2.25" 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_33" y="10.25" x="43.25" 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_34" y="20.25" x="43.25" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">U</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_35" y="29.25" x="43.25" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">M</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_36" y="37.25" x="43.25" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">M</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_38" y="47.25" x="44.25" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">E</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_39" y="56.25" x="44.25" 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/analogmodels/transformer.svg b/views/webtronix_server/analogmodels/transformer.svg
new file mode 100644
index 0000000..cce2548
--- /dev/null
+++ b/views/webtronix_server/analogmodels/transformer.svg
@@ -0,0 +1,37 @@
+<svg width="100" height="64" xmlns="http://www.w3.org/2000/svg">
+<g
+  stroke='black'
+  stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:digital>
+            <wtx:node index="1" x="103" y="20" />
+            <wtx:node index="2" x="103" y="46" />
+            <wtx:node index="4" x="3" y="20" />
+            <wtx:node index="5" x="3" y="46" />
+          
+        </wtx:digital>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>transformer</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+    <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_35" height="60" width="40" y="2.5" x="30.5" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_37" y2="19.5" x2="100.5" y1="19.5" x1="70.5" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_38" y2="45.5" x2="100.5" y1="45.5" x1="70.5" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_39" y2="19.5" x2="29.5" y1="19.5" x1="-0.5" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_40" y2="45.5" x2="30.5" y1="45.5" x1="0.5" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_41" y2="40.5" x2="56.5" y1="40.5" x1="55.5" 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_42" y="22.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Trans-</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_43" y="37.5" x="35.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">former</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/triangleoscillator.svg b/views/webtronix_server/analogmodels/triangleoscillator.svg
new file mode 100644
index 0000000..19698cd
--- /dev/null
+++ b/views/webtronix_server/analogmodels/triangleoscillator.svg
@@ -0,0 +1,42 @@
+<svg width="104" height="64" xmlns="http://www.w3.org/2000/svg">
+  <g
+	stroke='black'
+	stroke-width='2px' >
+
+<metadata class="part" >
+    <wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
+    <wtx:pins>
+        <wtx:analog>
+            <wtx:node index="2" x="100" y="31" />
+            <wtx:node index="1" x="3" y="32" />
+
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+    <wtx:type>a</wtx:type>
+    <wtx:name>triangleoscillator</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+
+    <wtx:outlow></wtx:outlow>
+    <wtx:outhigh></wtx:outhigh>
+    <wtx:cntlarr></wtx:cntlarr>
+    <wtx:freqarr></wtx:freqarr>
+    <wtx:duty></wtx:duty>
+
+
+    <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="42" y="2.75" x="31.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="#fff"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_2" y2="31.75" x2="102.75" y1="31.75" x1="71.75" fill-opacity="null" stroke-opacity="null" stroke-width="1.5" stroke="#000" fill="none"/>
+  <line stroke-linecap="null" stroke-linejoin="null" id="svg_3" y2="32.75" x2="31.75" y1="32.75" 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_9" y="24.5" x="34.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">Triangle</text>
+  <text xml:space="preserve" text-anchor="start" font-family="Helvetica, Arial, sans-serif" font-size="10" id="svg_13" y="44.5" x="32.5" fill-opacity="null" stroke-opacity="null" stroke-width="0" stroke="#000" fill="#000000">oscillator</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/views/webtronix_server/analogmodels/zenerdiode.svg b/views/webtronix_server/analogmodels/zenerdiode.svg
new file mode 100644
index 0000000..30ceed2
--- /dev/null
+++ b/views/webtronix_server/analogmodels/zenerdiode.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="40"
+height="20"	
+>
+  <g connects="0,10;40,10"
+	stroke='black'
+	stroke-width='2px' 
+     id="g2232"
+    class="zener">
+<metadata class="part" >
+    <wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
+        <wtx:pins>
+        <wtx:analog>
+                <wtx:node index="1" x="0" y="10"/>
+                <wtx:node index="2" x="40" y="10"/>
+        </wtx:analog>
+    </wtx:pins>
+    <wtx:id>a</wtx:id>
+
+    <wtx:type>a</wtx:type>
+    <wtx:name>zener</wtx:name>
+    <wtx:category>analogmodels</wtx:category>
+
+    <wtx:vbreak></wtx:vbreak>
+    <wtx:ibreak></wtx:ibreak>
+    <wtx:rbreak></wtx:rbreak>
+    <wtx:isat></wtx:isat>
+    <wtx:limitswitch></wtx:limitswitch>
+    <wtx:nfor></wtx:nfor>
+    <wtx:irev></wtx:irev>
+    
+
+    <wtx:flip></wtx:flip>
+    <wtx:value></wtx:value>
+    <wtx:label></wtx:label>
+    <wtx:spice></wtx:spice>
+    <wtx:model></wtx:model>
+    </wtx:part>
+</metadata>
+
+    <path
+       d="M 14.639172,0.38974096 L 10.056699,0.45435962 L 10.056699,19.706003 L 5,19.660362"
+       id="path2210"
+       fill='none' />
+    <path
+       d="M 0,10 L 40,10"
+       id="path3202"
+	 />
+    <path
+       d="M 11.056699,9.3421656 L 30.030771,0.61472262 L 30.030771,19.706003 L 11.056699,9.3421656 z"
+       id="path2220"
+       fill='black' 
+	/>
+  </g>
+</svg>
diff --git a/views/webtronix_server/parts.json b/views/webtronix_server/parts.json
index 8109fc4..f1eb7e8 100644
--- a/views/webtronix_server/parts.json
+++ b/views/webtronix_server/parts.json
@@ -1,236 +1,261 @@
 {
-  "parts":{
-    "ic":{
-      "3_pins":{},
-      "4_pins":{},
-      "5_pins":{}
-    },
-    
-    "subcircuits":{
-      "op-amp":{
-	"help":"ux + - v- out v+ model\n\ndirective = include model file",
-	"values":{
-	  "lm324":["lm324.mod"],
-	  "lm358":["lm358.mod"],
-	  "741":["ua741.mod","lm741.mod"],
-	  "tl084":["tl084.mod"]
-	}
-      }
-    },
-
-    "analogmodels":{
-
-    },
-
-
-    "digitalmodels":{
-      
-      "adc_bridge":{
-	"ideal_adc":["digital.lib"]
-      },
-      "dac_bridge":{
-	"ideal_dac":["digital.lib"]
-      },                    
-      "source":{
-	"clk":["dsource.mod"]
-      },                
-      "and":{
-	"and(rise = 0.5e-9 fall = 0.3e-9)":[],
-	"and1":["digital.lib"]
-      },
-      "nand":{
-	"nand1":["digital.lib"]                        
-      },
-      "nor":{
-	"nor1":["digital.lib"]                        
-      },
-      "not":{
-	"inv1":["digital.lib"]
-      },
-      "or":{
-	"or1":["digital.lib"]
-      },
-      "xnor":{
-	"xnor":["digital.lib"]                        
-      },
-      "xor":{
-	"xor":["digital.lib"]                        
-      }
-    },
-    
-    "resistors":{
-      
-      "resistor":{
-	"help":"rx 1 2 value\nrx = part id\nvalue = 0-xMeg",         
-	"values":{
-	  "10":[""],
-	  "100":[""],
-	  "1K":[""],
-	  "10K":[""],
-	  "100K":[""],
-	  "1.0Meg":[""],
-	  "10Meg":[""]
-	}
-      },
-      
-      "variresistor":{}      
-    },
-
-    "mosfets":{
-    	"njfet":{
-	"values":{
-	  "mpf102":["models.lib"],
-	  "2n3819":["models.lib"]
-	  
-	}
-      },
-
-    	"pjfet":{},
-    	"nmosfet":{
-	"values":{
-	  "2n7000":["2n7000.mod"],
-	  "irf150":["irf150.mod"],
-	  "irf530":["irf530.mod"],
-	  "irfz44n":["irfz44n.mod"]
-	}
-      },
-		"pmosfet":{}
-   		   
-    },
-
-
-    "transistors":{
-      
-      "npn":{
-	"values":{
-	  
-	  "2n3904":["models.lib"],
-	  "2n2222":["models.lib"],                    
-	  "2n3055":["models.lib"]                    
-	}
-      },
-      
-      "pnp":{
-	"values":{
-	  "2n3906":["models.lib"],
-	  "2n2907":["models.lib"]
-	}
-      }
-      
-     
-    },
-
-      
-     "diodes":{
-      "diode":{
-	"values":{
-	  
-	  "1n4148":["1n4148.lib"],
-	  "1n4007":["1n4007.lib"],
-	  "1n34a":["1n34a.lib"],
-	  "1n5711":["1n5711.lib"]
-	  
-	},
-	"help":"dx a k model\na=anode\nk=kathode"         
-	
-      },
-      "scr":{},
-      "triac":{},
-      "zener":{}
-    },
-    "switches":{
-      
-      "ncpb":{},
-      "nopb":{},
-      "spst-relay":{},
-      "spst-switch":{}
-    },
-    "capacitors":{
-      "capacitor":{
-	"help":"cx 1 2 value",         
-	
-	"values":{
-	  
-	  "1pf":[""],
-	  "10pf":[""],
-	  "100pf":[""],
-	  "1nf":[""],
-	  "10nf":[""],
-	  "100nf":[""],
-	  "1uf":[""],
-	  "10uf":[""],
-	  "100uf":[""]
-	  
-	}
-      },
-      "polar-cap":{},
-      "varicap":{}
-    },
-    "frequency":{
-      "crystal":{}
-    },
-    "inductors":{
-      "coil":{
-	"help":"lx 1 2  value\n\ncoupling  directive \ncouples 2 inductors\n\nkx lx lx value\nlx = inductor id's\nvalue = coupling",         
-	"values":{
-	  "1h":[""],
-	  "100mh":[""],
-	  "10mh":[""],
-	  "1mh":[""],
-	  "100uh":[""],
-	  "10uh":[""],
-	  "1uh":[""],
-	  "100nh":[""],
-	  "10nh":[""],
-	  "1h":[""]
-	}
-      },
-      "tapcoil":{},
-      "transformer":{}
-    },
-    "sources":{
-     
-    	"pulse":{},
-    	"pwl":{},
-    	"exponential":{},
-
-    	"sinvoltagesource":{
-    		"help":"SIN = sine wave source\nAC = AC frequency sweep",
-	"values":{		
-	}
+	"parts":{
+		"ic":{
+			"3_pins":{},
+			"4_pins":{},
+			"5_pins":{}
+		},
+
+		"subcircuits":{
+			"op-amp":{
+				"help":"ux + - v- out v+ model\n\ndirective = include model file",
+				"values":{
+					"lm324":["lm324.mod"],
+					"lm358":["lm358.mod"],
+					"741":["ua741.mod","lm741.mod"],
+					"tl084":["tl084.mod"]
+				}
+			}
+		},
+
+		"analogmodels":{
+			"gains":{},
+			"summer":{},
+			"multiplier":{},
+			"divider":{},
+			"limiter":{},
+			"controlledlimiter":{},
+			"pwlcontrolsource":{},
+			"multi_input_pwl_block":{},
+			"aswitch":{},
+			"zenerdiode":{},
+			"currentlimiter":{},
+			"hysteresis":{},
+			"differentiator":{},
+			"integrator":{},
+			"sdomain":{},
+			"slewrateblock":{},
+			"transformer":{},
+			"sineoscillator":{},
+			"triangleoscillator":{},
+			"squareoscillator":{},
+			"oneshot":{},
+			"capacitancemeter":{},
+			"inductancemeter":{},
+			"memristor":{}			
+
+
+
+		},
+
+
+		"digitalmodels":{
+
+			"adc_bridge":{
+				"ideal_adc":["digital.lib"]
+			},
+			"dac_bridge":{
+				"ideal_dac":["digital.lib"]
+			},                    
+			"source":{
+				"clk":["dsource.mod"]
+			},                
+			"and":{
+				"and(rise = 0.5e-9 fall = 0.3e-9)":[],
+				"and1":["digital.lib"]
+			},
+			"nand":{
+				"nand1":["digital.lib"]                        
+			},
+			"nor":{
+				"nor1":["digital.lib"]                        
+			},
+			"not":{
+				"inv1":["digital.lib"]
+			},
+			"or":{
+				"or1":["digital.lib"]
+			},
+			"xnor":{
+				"xnor":["digital.lib"]                        
+			},
+			"xor":{
+				"xor":["digital.lib"]                        
+			}
+		},
+
+		"resistors":{
+
+			"resistor":{
+				"help":"rx 1 2 value\nrx = part id\nvalue = 0-xMeg",         
+				"values":{
+					"10":[""],
+					"100":[""],
+					"1K":[""],
+					"10K":[""],
+					"100K":[""],
+					"1.0Meg":[""],
+					"10Meg":[""]
+				}
+			},
+
+			"variresistor":{}      
+		},
+
+		"mosfets":{
+			"njfet":{
+				"values":{
+					"mpf102":["models.lib"],
+					"2n3819":["models.lib"]
+
+				}
+			},
+
+			"pjfet":{},
+			"nmosfet":{
+				"values":{
+					"2n7000":["2n7000.mod"],
+					"irf150":["irf150.mod"],
+					"irf530":["irf530.mod"],
+					"irfz44n":["irfz44n.mod"]
+				}
+			},
+			"pmosfet":{}
+
+		},
+
+
+		"transistors":{
+
+			"npn":{
+				"values":{
+
+					"2n3904":["models.lib"],
+					"2n2222":["models.lib"],                    
+					"2n3055":["models.lib"]                    
+				}
+			},
+
+			"pnp":{
+				"values":{
+					"2n3906":["models.lib"],
+					"2n2907":["models.lib"]
+				}
+			}
+
+
+		},
+
+
+		"diodes":{
+			"diode":{
+				"values":{
+
+					"1n4148":["1n4148.lib"],
+					"1n4007":["1n4007.lib"],
+					"1n34a":["1n34a.lib"],
+					"1n5711":["1n5711.lib"]
+
+				},
+				"help":"dx a k model\na=anode\nk=kathode"         
+
+			},
+			"scr":{},
+			"triac":{},
+			"zener":{}
+		},
+		"switches":{
+
+			"ncpb":{},
+			"nopb":{},
+			"spst-relay":{},
+			"spst-switch":{}
+		},
+		"capacitors":{
+			"capacitor":{
+				"help":"cx 1 2 value",         
+
+				"values":{
+
+					"1pf":[""],
+					"10pf":[""],
+					"100pf":[""],
+					"1nf":[""],
+					"10nf":[""],
+					"100nf":[""],
+					"1uf":[""],
+					"10uf":[""],
+					"100uf":[""]
+
+				}
+			},
+			"polar-cap":{},
+			"varicap":{}
+		},
+		"frequency":{
+			"crystal":{}
+		},
+		"inductors":{
+			"coil":{
+				"help":"lx 1 2  value\n\ncoupling  directive \ncouples 2 inductors\n\nkx lx lx value\nlx = inductor id's\nvalue = coupling",         
+				"values":{
+					"1h":[""],
+					"100mh":[""],
+					"10mh":[""],
+					"1mh":[""],
+					"100uh":[""],
+					"10uh":[""],
+					"1uh":[""],
+					"100nh":[""],
+					"10nh":[""],
+					"1h":[""]
+				}
+			},
+			"tapcoil":{},
+			"transformer":{}
+		},
+		"sources":{
+
+			"pulse":{},
+			"pwl":{},
+			"exponential":{},
+
+			"sinvoltagesource":{
+				"help":"SIN = sine wave source\nAC = AC frequency sweep",
+				"values":{		
+				}
+
+			},
+
+
+			"current":{
+
+				"values":{		
+					"1m":[""],
+					"10m":[""],
+					"100m":[""],
+					"1":[""]
+				}
+			},
+			"ac":{
+				"help":"Amplitude= amplitude of wave \n phase = phase of wave",
+				"values":{	
+				}  
+				                  },
+
+
+				"battery":{
+					"values":{		
+						"5":[""],
+						"9":[""],
+						"12":[""]
+					}
+				},
+				"ground":{},
+				"namewire":{}
 
-    	},
 
 
-      "current":{
-	
-	"values":{		
-	  "1m":[""],
-	  "10m":[""],
-	  "100m":[""],
-	  "1":[""]
+		}
 	}
-      },
-      "ac":{
-	"help":"Amplitude= amplitude of wave \n phase = phase of wave",
-	"values":{	
-	}                    },
-
-
-	"battery":{
-	  "values":{		
-	    "5":[""],
-	    "9":[""],
-	    "12":[""]
-	  }
-	},
-	"ground":{},
-	"namewire":{}
-    }
-    
-                
-  },
-  "model":{
-    "555":["555.mod"]
-  }
 }
-- 
cgit