From 9458e539885450950052ca7a7d3fc740e2ae99eb Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 17 Jul 2012 10:42:47 -0400
Subject: [PATCH] Adding stripped down 6002x course for testing, along with CMS
 test for edit pages for same

---
 cms/djangoapps/contentstore/tests/tests.py    |    3 +
 common/lib/xmodule/xmodule/vertical_module.py |    2 +-
 common/test/data/full/about/description.html  |    3 +
 common/test/data/full/about/faq.html          |   14 +
 common/test/data/full/about/more_info.html    |    9 +
 common/test/data/full/about/requirements.html |    2 +
 common/test/data/full/about/syllabus.html     |   17 +
 common/test/data/full/about/textbook.html     |    1 +
 common/test/data/full/about/video.html        |    1 +
 common/test/data/full/chapter/Overview.xml    |    9 +
 common/test/data/full/chapter/Week_1.xml      |   10 +
 common/test/data/full/circuits/120V60Hz.gif   |  Bin 0 -> 11037 bytes
 common/test/data/full/circuits/Lab1_1.png     |  Bin 0 -> 6553 bytes
 common/test/data/full/circuits/duality.gif    |  Bin 0 -> 2569 bytes
 .../test/data/full/circuits/heaters-bad.gif   |  Bin 0 -> 2187 bytes
 .../data/full/circuits/heaters-parallel.gif   |  Bin 0 -> 2230 bytes
 common/test/data/full/course.xml              |    1 +
 .../data/full/course/6.002_Spring_2012.xml    |   12 +
 common/test/data/full/course_settings.json    |   35 +
 common/test/data/full/custom_tags/book        |    1 +
 common/test/data/full/custom_tags/discuss     |    1 +
 common/test/data/full/custom_tags/image       |    1 +
 common/test/data/full/custom_tags/slides      |    1 +
 common/test/data/full/custom_tags/videodev    |    3 +
 .../test/data/full/html/Final_Exam_2010.html  |   17 +
 .../data/full/html/FirstOrderSystemHint.xml   |    8 +
 common/test/data/full/html/Lab2A.html         |  105 +
 common/test/data/full/html/Midterm.html       |   35 +
 .../data/full/html/Midterm_Exam_1080.html     |   34 +
 .../data/full/html/Midterm_Exam_1123.html     |   34 +
 .../data/full/html/Week_13_Tutorials.html     |   19 +
 .../test/data/full/html/Week_1_Tutorials.html |   47 +
 .../data/full/html/linearity_clarify.html     |   39 +
 .../test/data/full/html/linearity_clarify.xml |   39 +
 .../data/full/html/schematic_tutorial.html    |   75 +
 .../html/sound_labs/mosfet_amplifier.html     |  124 +
 .../data/full/html/sound_labs/rc_filters.html |  111 +
 .../data/full/html/sound_labs/series_rlc.html |  111 +
 common/test/data/full/html/test.html          |    1 +
 common/test/data/full/html/units_hint.html    |    4 +
 .../test/data/full/info/guest_handouts.html   |  119 +
 common/test/data/full/info/guest_updates.html |    8 +
 common/test/data/full/info/handouts.html      |  169 +
 common/test/data/full/info/updates.html       |  194 +
 common/test/data/full/js/cktsim.js            | 1959 ++++++++
 common/test/data/full/js/schematic.js         | 4184 +++++++++++++++++
 .../data/full/problem/Circuit_Sandbox.xml     |    6 +
 common/test/data/full/problem/H1P1_Energy.xml |   32 +
 .../test/data/full/problem/H1P2_Duality.xml   |  127 +
 .../full/problem/H1P3_Poor_Workmanship.xml    |   84 +
 .../full/problem/Lab_0_Using_the_Tools.xml    |  115 +
 .../data/full/problem/Resistor_Divider.xml    |   59 +
 .../test/data/full/problem/S1E3_AC_power.xml  |   40 +
 .../full/problem/Sample_Algebraic_Problem.xml |   13 +
 .../full/problem/Sample_Numeric_Problem.xml   |    8 +
 .../Administrivia_and_Circuit_Elements.xml    |   18 +
 .../full/sequential/System_Usage_Sequence.xml |    7 +
 .../data/full/static/js/sound_labs/circuit.js | 1247 +++++
 .../static/js/sound_labs/mosfet_amplifier.js  |  658 +++
 .../data/full/static/js/sound_labs/plotter.js | 1038 ++++
 .../full/static/js/sound_labs/rc_filters.js   |  938 ++++
 .../full/static/js/sound_labs/series_rlc.js   | 1150 +++++
 .../data/full/static/js/sound_labs/sound.js   |  407 ++
 .../test/data/full/subs/3NIegrCmA5k.srt.sjson |    5 +
 .../test/data/full/subs/4cLA-IME32w.srt.sjson |    5 +
 .../test/data/full/subs/8kARlsUt9lM.srt.sjson |    5 +
 .../test/data/full/subs/8rK9vnpystQ.srt.sjson |    5 +
 .../test/data/full/subs/BGU1poJDgOY.srt.sjson |  275 ++
 .../test/data/full/subs/CcgAYu0n0bg.srt.sjson |    5 +
 .../test/data/full/subs/EG-fRTJln_E.srt.sjson |    5 +
 .../test/data/full/subs/G_2F9wivspM.srt.sjson |  212 +
 .../test/data/full/subs/XbDRmF6J0K0.srt.sjson |  266 ++
 .../test/data/full/subs/eLAyO33baQ8.srt.sjson |  335 ++
 .../test/data/full/subs/p2Q6BrNhdh8.srt.sjson |  155 +
 .../test/data/full/subs/pFOrD8k9_p4.srt.sjson |  101 +
 common/test/data/full/to_delete               |  339 ++
 .../test/data/full/vertical/vertical_58.xml   |   12 +
 .../test/data/full/vertical/vertical_89.xml   |   15 +
 .../test/data/full/vertical/vertical_94.xml   |   12 +
 .../test/data/full/vertical/vertical_98.xml   |   12 +
 80 files changed, 15272 insertions(+), 1 deletion(-)
 create mode 100644 common/test/data/full/about/description.html
 create mode 100644 common/test/data/full/about/faq.html
 create mode 100644 common/test/data/full/about/more_info.html
 create mode 100644 common/test/data/full/about/requirements.html
 create mode 100644 common/test/data/full/about/syllabus.html
 create mode 100644 common/test/data/full/about/textbook.html
 create mode 100644 common/test/data/full/about/video.html
 create mode 100644 common/test/data/full/chapter/Overview.xml
 create mode 100644 common/test/data/full/chapter/Week_1.xml
 create mode 100644 common/test/data/full/circuits/120V60Hz.gif
 create mode 100644 common/test/data/full/circuits/Lab1_1.png
 create mode 100644 common/test/data/full/circuits/duality.gif
 create mode 100644 common/test/data/full/circuits/heaters-bad.gif
 create mode 100644 common/test/data/full/circuits/heaters-parallel.gif
 create mode 100644 common/test/data/full/course.xml
 create mode 100644 common/test/data/full/course/6.002_Spring_2012.xml
 create mode 100644 common/test/data/full/course_settings.json
 create mode 100644 common/test/data/full/custom_tags/book
 create mode 100644 common/test/data/full/custom_tags/discuss
 create mode 100644 common/test/data/full/custom_tags/image
 create mode 100644 common/test/data/full/custom_tags/slides
 create mode 100644 common/test/data/full/custom_tags/videodev
 create mode 100644 common/test/data/full/html/Final_Exam_2010.html
 create mode 100644 common/test/data/full/html/FirstOrderSystemHint.xml
 create mode 100644 common/test/data/full/html/Lab2A.html
 create mode 100644 common/test/data/full/html/Midterm.html
 create mode 100644 common/test/data/full/html/Midterm_Exam_1080.html
 create mode 100644 common/test/data/full/html/Midterm_Exam_1123.html
 create mode 100644 common/test/data/full/html/Week_13_Tutorials.html
 create mode 100644 common/test/data/full/html/Week_1_Tutorials.html
 create mode 100644 common/test/data/full/html/linearity_clarify.html
 create mode 100644 common/test/data/full/html/linearity_clarify.xml
 create mode 100644 common/test/data/full/html/schematic_tutorial.html
 create mode 100644 common/test/data/full/html/sound_labs/mosfet_amplifier.html
 create mode 100644 common/test/data/full/html/sound_labs/rc_filters.html
 create mode 100644 common/test/data/full/html/sound_labs/series_rlc.html
 create mode 100644 common/test/data/full/html/test.html
 create mode 100644 common/test/data/full/html/units_hint.html
 create mode 100644 common/test/data/full/info/guest_handouts.html
 create mode 100644 common/test/data/full/info/guest_updates.html
 create mode 100644 common/test/data/full/info/handouts.html
 create mode 100644 common/test/data/full/info/updates.html
 create mode 100755 common/test/data/full/js/cktsim.js
 create mode 100644 common/test/data/full/js/schematic.js
 create mode 100644 common/test/data/full/problem/Circuit_Sandbox.xml
 create mode 100644 common/test/data/full/problem/H1P1_Energy.xml
 create mode 100644 common/test/data/full/problem/H1P2_Duality.xml
 create mode 100644 common/test/data/full/problem/H1P3_Poor_Workmanship.xml
 create mode 100644 common/test/data/full/problem/Lab_0_Using_the_Tools.xml
 create mode 100644 common/test/data/full/problem/Resistor_Divider.xml
 create mode 100644 common/test/data/full/problem/S1E3_AC_power.xml
 create mode 100644 common/test/data/full/problem/Sample_Algebraic_Problem.xml
 create mode 100644 common/test/data/full/problem/Sample_Numeric_Problem.xml
 create mode 100644 common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml
 create mode 100644 common/test/data/full/sequential/System_Usage_Sequence.xml
 create mode 100644 common/test/data/full/static/js/sound_labs/circuit.js
 create mode 100644 common/test/data/full/static/js/sound_labs/mosfet_amplifier.js
 create mode 100644 common/test/data/full/static/js/sound_labs/plotter.js
 create mode 100644 common/test/data/full/static/js/sound_labs/rc_filters.js
 create mode 100644 common/test/data/full/static/js/sound_labs/series_rlc.js
 create mode 100644 common/test/data/full/static/js/sound_labs/sound.js
 create mode 100644 common/test/data/full/subs/3NIegrCmA5k.srt.sjson
 create mode 100644 common/test/data/full/subs/4cLA-IME32w.srt.sjson
 create mode 100644 common/test/data/full/subs/8kARlsUt9lM.srt.sjson
 create mode 100644 common/test/data/full/subs/8rK9vnpystQ.srt.sjson
 create mode 100644 common/test/data/full/subs/BGU1poJDgOY.srt.sjson
 create mode 100644 common/test/data/full/subs/CcgAYu0n0bg.srt.sjson
 create mode 100644 common/test/data/full/subs/EG-fRTJln_E.srt.sjson
 create mode 100644 common/test/data/full/subs/G_2F9wivspM.srt.sjson
 create mode 100644 common/test/data/full/subs/XbDRmF6J0K0.srt.sjson
 create mode 100644 common/test/data/full/subs/eLAyO33baQ8.srt.sjson
 create mode 100644 common/test/data/full/subs/p2Q6BrNhdh8.srt.sjson
 create mode 100644 common/test/data/full/subs/pFOrD8k9_p4.srt.sjson
 create mode 100644 common/test/data/full/to_delete
 create mode 100644 common/test/data/full/vertical/vertical_58.xml
 create mode 100644 common/test/data/full/vertical/vertical_89.xml
 create mode 100644 common/test/data/full/vertical/vertical_94.xml
 create mode 100644 common/test/data/full/vertical/vertical_98.xml

diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py
index 6b346046fc..ce956fa5ad 100644
--- a/cms/djangoapps/contentstore/tests/tests.py
+++ b/cms/djangoapps/contentstore/tests/tests.py
@@ -205,3 +205,6 @@ class EditTestCase(ContentStoreTestCase):
 
     def test_edit_item_toy(self):
         self.check_edit_item('toy')
+
+    def test_edit_item_full(self):
+        self.check_edit_item('full')
diff --git a/common/lib/xmodule/xmodule/vertical_module.py b/common/lib/xmodule/xmodule/vertical_module.py
index c9ecc5ea18..884fd0a056 100644
--- a/common/lib/xmodule/xmodule/vertical_module.py
+++ b/common/lib/xmodule/xmodule/vertical_module.py
@@ -26,7 +26,7 @@ class VerticalModule(XModule):
         # TODO: Cache progress or children array?
         children = self.get_children()
         progresses = [child.get_progress() for child in children]
-        progress = reduce(Progress.add_counts, progresses)
+        progress = reduce(Progress.add_counts, progresses, None)
         return progress
 
     def get_icon_class(self):
diff --git a/common/test/data/full/about/description.html b/common/test/data/full/about/description.html
new file mode 100644
index 0000000000..305dc51750
--- /dev/null
+++ b/common/test/data/full/about/description.html
@@ -0,0 +1,3 @@
+6.002x (Circuits and Electronics) is designed to serve as a first course in an undergraduate electrical engineering (EE), or electrical engineering and computer science (EECS) curriculum. At MIT, 6.002 is in the core of department subjects required for all undergraduates in EECS.
+
+The course introduces engineering in the context of the lumped circuit abstraction. Topics covered include: resistive elements and networks; independent and dependent sources; switches and MOS transistors; digital abstraction; amplifiers; energy storage elements; dynamics of first- and second-order networks; design in the time and frequency domains; and analog and digital circuits and applications. Design and lab exercises are also significant components of the course. You should expect to spend approximately 10 hours per week on the course.
\ No newline at end of file
diff --git a/common/test/data/full/about/faq.html b/common/test/data/full/about/faq.html
new file mode 100644
index 0000000000..a5e54c9f15
--- /dev/null
+++ b/common/test/data/full/about/faq.html
@@ -0,0 +1,14 @@
+<ul>
+  <li>What is the format of the class?
+    <p>The course will consist of 24 lectures, each lasting 50 minutes. There will be regular assignments consisting of map tests and short essays.</p>
+  </li>
+  <li>Are there any prerequisites?
+    <p>No - anyone and everyone is welcome to take this course.</p>
+  </li>
+  <li>What textbook should I buy?
+    <p>Although the lectures are designed to be self-contained, we recommend (but do not require) that students refer to the book Worlds Together, Worlds Apart: A History of the World: From 1000 CE to the Present (W W Norton, 3rd edition) -- Volume II, which was written specifically for this course.</p>
+  </li>
+  <li>Does Harvard award credentials or reports regarding my work in this course?
+    <p>Princeton does not award credentials or issue reports for student work in this course. However, Coursera could maintain a record of your score on the assessments and, with your permission, verify that score for authorized parties.</p>
+  </li>
+</ul>
diff --git a/common/test/data/full/about/more_info.html b/common/test/data/full/about/more_info.html
new file mode 100644
index 0000000000..0f5836381e
--- /dev/null
+++ b/common/test/data/full/about/more_info.html
@@ -0,0 +1,9 @@
+<section class="who-should-take">
+  <h3>Who should take this?</h3>
+  <p>If you're one of the many who have a unquenched interest in the worlds history, you'll love this course.</p>
+</section>
+
+<section class="who-shouldnt-take">
+  <h3>Who shouldn't take this?</h3>
+  <p>No one. Anyone and everyone is welcome to take this course.</p>
+</section>
\ No newline at end of file
diff --git a/common/test/data/full/about/requirements.html b/common/test/data/full/about/requirements.html
new file mode 100644
index 0000000000..5890d9c036
--- /dev/null
+++ b/common/test/data/full/about/requirements.html
@@ -0,0 +1,2 @@
+<p>In order to succeed in this course, you must have taken an AP level physics course in electricity and magnetism. You must know basic calculus and linear algebra and have some background in differential equations. Since more advanced mathematics will not show up until the second half of the course, the first half of the course will include an optional remedial differential equations component for those who need it.</p>
+<p>The course web site was developed and tested primarily with Google Chrome. We support current versions of Mozilla Firefox as well. The video player is designed to work with Flash. While we provide a partial non-Flash fallback for the video, as well as partial support for Internet Explorer, other browsers, and tablets, portions of the functionality will be unavailable.</p>
\ No newline at end of file
diff --git a/common/test/data/full/about/syllabus.html b/common/test/data/full/about/syllabus.html
new file mode 100644
index 0000000000..af41f420f5
--- /dev/null
+++ b/common/test/data/full/about/syllabus.html
@@ -0,0 +1,17 @@
+<ul>
+  <li><strong>Week 1:</strong> What is World History?</li>
+  <li><strong>Week 2:</strong> Peoples, Plagues and Plunders</li>
+  <li><strong>Week 3:</strong> Warfare and Motion</li>
+  <li><strong>Week 4:</strong> Conquests</li>
+  <li><strong>Week 5:</strong> The Beginnings of Globalization in the Atlantic Worlds</li>
+  <li><strong>Week 6:</strong> The Beginnings of Globalization in the Indian Ocean Worlds</li>
+  <li><strong>Week 7:</strong> The Worlds that Merchants Made</li>
+  <li><strong>Week 8:</strong> The Seventeenth-Century Crisis</li>
+  <li><strong>Week 9:</strong> Empire and Enlightenment</li>
+  <li><strong>Week 10:</strong> The Wealth of Nations</li>
+  <li><strong>Week 11:</strong> The World in Revolution</li>
+  <li><strong>Week 12:</strong> States and Nations</li>
+  <li><strong>Week 13:</strong> Global Frontiers</li>
+  <li><strong>Week 14:</strong> Empires and Nations</li>
+  <li><strong>Week 15:</strong> Back to the Future</li>
+</ul>
diff --git a/common/test/data/full/about/textbook.html b/common/test/data/full/about/textbook.html
new file mode 100644
index 0000000000..f07e7bac75
--- /dev/null
+++ b/common/test/data/full/about/textbook.html
@@ -0,0 +1 @@
+<p>The course uses the textbook Foundations of Analog and Digital Electronic Circuits, by Anant Agarwal and Jeffrey H. Lang. Morgan Kaufmann Publishers, Elsevier, July 2005. While recommended, the book is not required: relevant sections will be provided electronically as part of the online course for personal use in connection with this course only. The copyright for the book is owned by Elsevier. The book can be purchased on <a href="http://www.amazon.com/exec/obidos/ASIN/1558607358/ref=nosim/mitopencourse-20">Amazon</a>.</p>
\ No newline at end of file
diff --git a/common/test/data/full/about/video.html b/common/test/data/full/about/video.html
new file mode 100644
index 0000000000..2959101024
--- /dev/null
+++ b/common/test/data/full/about/video.html
@@ -0,0 +1 @@
+<iframe width="560" height="315" src="http://www.youtube.com/embed/p2Q6BrNhdh8" frameborder="0" allowfullscreen></iframe>
\ No newline at end of file
diff --git a/common/test/data/full/chapter/Overview.xml b/common/test/data/full/chapter/Overview.xml
new file mode 100644
index 0000000000..8a0d3ef7ec
--- /dev/null
+++ b/common/test/data/full/chapter/Overview.xml
@@ -0,0 +1,9 @@
+<sequential>
+  <video youtube="0.75:izygArpw-Qo,1.0:p2Q6BrNhdh8,1.25:1EeWXzPdhSA,1.50:rABDYkeK0x8" slug="Welcome" format="Video" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="Welcome"/>
+  <sequential filename="System_Usage_Sequence" slug="System_Usage_Sequence" format="Lecture Sequence" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="System Usage Sequence"/>
+  <vertical slug="Lab0_Using_the_tools" format="Lab" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="Lab0: Using the tools">
+    <html slug="html_19" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never"> See the <a href="/section/labintro"> Lab Introduction </a> or <a href="/static/handouts/schematic_tutorial.pdf">Interactive Lab Usage Handout </a> for information on how to do the lab </html>
+    <problem filename="Lab_0_Using_the_Tools" slug="Lab_0_Using_the_Tools" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="false" name="Lab 0: Using the Tools"/>
+  </vertical>
+  <problem filename="Circuit_Sandbox" slug="Circuit_Sandbox" format="Lab" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="false" name="Circuit Sandbox"/>
+</sequential>
diff --git a/common/test/data/full/chapter/Week_1.xml b/common/test/data/full/chapter/Week_1.xml
new file mode 100644
index 0000000000..229c7601ab
--- /dev/null
+++ b/common/test/data/full/chapter/Week_1.xml
@@ -0,0 +1,10 @@
+<sequential>
+  <sequential filename="Administrivia_and_Circuit_Elements" slug="Administrivia_and_Circuit_Elements" format="Lecture Sequence" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="Administrivia and Circuit Elements"/>
+  <vertical slug="Basic_Circuit_Analysis" format="Homework" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="closed" rerandomize="per_student" due="March 18" graded="true" name="Basic Circuit Analysis">
+    <problem filename="H1P1_Energy" slug="H1P1_Energy" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="closed" rerandomize="per_student" due="March 18" graded="true" name="H1P1: Energy"/>
+    <problem filename="H1P2_Duality" slug="H1P2_Duality" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="closed" rerandomize="per_student" due="March 18" graded="true" name="H1P2: Duality"/>
+    <problem filename="H1P3_Poor_Workmanship" slug="H1P3_Poor_Workmanship" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="closed" rerandomize="per_student" due="March 18" graded="true" name="H1P3: Poor Workmanship"/>
+  </vertical>
+  <problem filename="Resistor_Divider" slug="Resistor_Divider" format="Lab" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" due="March 18" graded="true" name="Resistor Divider"/>
+  <html filename="Week_1_Tutorials" slug="Week_1_Tutorials" format="Tutorial Index" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="Week 1 Tutorials"/>
+</sequential>
diff --git a/common/test/data/full/circuits/120V60Hz.gif b/common/test/data/full/circuits/120V60Hz.gif
new file mode 100644
index 0000000000000000000000000000000000000000..75f9142d22f73650d0c67057937afec625e89e45
GIT binary patch
literal 11037
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
L!bZ~K1H}Fhi=J>v

literal 0
HcmV?d00001

diff --git a/common/test/data/full/circuits/Lab1_1.png b/common/test/data/full/circuits/Lab1_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..75929dfda76c24b01b2b6769ddc015ac8d70ffe2
GIT binary patch
literal 6553
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

literal 0
HcmV?d00001

diff --git a/common/test/data/full/circuits/duality.gif b/common/test/data/full/circuits/duality.gif
new file mode 100644
index 0000000000000000000000000000000000000000..50ae55b057a63666be5b89ebf5b11fee8870244c
GIT binary patch
literal 2569
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

literal 0
HcmV?d00001

diff --git a/common/test/data/full/circuits/heaters-bad.gif b/common/test/data/full/circuits/heaters-bad.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fafd7b3f7c2fb043204facf0d3229e38362fdddf
GIT binary patch
literal 2187
zcmV;62z2*HNk%v~VXy(m0Du4h00030|Nkri000260mlFU0{)DTsmtvTqeP(Ei?iOm
z`+rU1NS5Y_rs~SJ?pp%ze9H8V=lag~ero&mg2JNlh)gPB#O15$j7q1}stam0VYA$>
z_lw+uA>y(5j803+YD)VJkE7Xey8MpM^XzTD{tp<aB^cmGc!-E-IG5Py_-L?rCJ9+-
z=|wq~dCA$iw0S@$`cOdv>WP}Vr&8L`>dN*yajIHtdj(YJAX6s0;2S}EJ4|ev+pFuE
z{2MtUTnrt}aB8zvt-P#oE%GewEe#rE9Xj1yZoc-dzHVGY&WxTQ4j)g(evgkm`0mEv
zUmwp<w|oREZE6Aqp|*bvvyt)?qM*cJ?ixBwC@-T%{)(J1Ow<G-q{xvZH7wld@Zw2-
zp-Q@Z2{We5nKWzKG^vRZN0tHUrBqn)l1G9Abrjv<hX@v>K9}-z2GK&nqd2JMNNUmC
zIDqJ=p|a`-><qCq1aj4iZEH%X5GRs-qBGrEwCBX|V)fOnnYT>1osEPnFy6Kj`L-~O
zi(9P4q-Y_|@)%I$T$7wJ-eqrar^$La2hCYUm}e=Y@04!0m(b}?dO@cav|35*H?!rw
z4pjR{?lij}R)(Fo@NL(UgHIg}rg!4at&_(sPWU)+=fI;AMgB$kVdK}QXIITVpZ0Uu
z^Nb(T{QGa*;qjec3G$|Vn(gnsNBJ@T+;#W<v+9=)pnCu1*B=)J{xzU|>0y!}feUtV
zV1tl7XrP1?vJ+v17E+-hhvjXkPKQ%uXxdO2Pyh^wvs`F}h_Gm*P>L$<)E#vt!uX4e
zhv?`8iFg2$qKq^879fK^CbSff)fEY$c}V6sBx*GZC`SiSM(LMu-qH3Xj##d!rHxf~
zDUXuug-K-`KqmPmm`ql9q?cv3Y1@=W-Z-b6bYh0)opqQvR3U-x>63UL66)l9A(f~o
z2tSyKD3MZ5+Q(;<UKJ^L`)pc=rEH;>>6tO00O@|2af(!^qF(A|r>K6)#7L^TI;y8?
z97O69QWe@#se9sTD{sNpNve=fq3HfAmcYJx>##Ixag?#MlIHBGw6aR9WmP2$;<B}>
zS*@gs?ZK^t-eS8Ry4JQz?zEwW%O|+ZvP(uLj=4J`y!u=VtGf90J1@RPoC|QX0Y4k>
z!C4BN1i=gQ`>?+VW?MtKEbih}l`&+D@d`y*{AS0RLEM<f>ng^9$qWxXOE;w^<+8ZB
z_O<e(!F+7m&2a5I@^&@*V8^a3ynOROcI`~_&#AU7TFy+X4ByZ<fQ;eB;W%yC)lo}5
zwbDivO9{~xhs|r6ULy^5#Ferl?Y}Nk{f*IWn|i3#2<r$pII*5=@D-!@C+6A9vCW6r
z9?z{3ZGtB~cEQ2|fw(_r=Kc-ML6QI4w<(u11S#djNFubtTQ<hA;fq6E?=z;8&NbZ_
z8;g+8C-(aH>8QUrxZ?F9ZEs7{C{+#cSMqJU#Dd1GanU~ajv|cW2oG4<<Q1=PuRX8*
zG-YJxNlq(k`i}YZ)PI|G^-bEnkLpYb8a?;EEaJH>)NJm0;F^P8Ke55L-#qveZ#_PG
zK}&6!E0$l>_Yd!piGBYAU;q)8HsU>pa1;^E`r7xs{^9R|#>-y9ba$Ax-DPC4<DdU9
z*g*~+>wW@!90k)czcS%ufq-G23Mq!N6vC--P|=!2ULlJh(XW9wB%<@ox5M%cA{?{h
zUN(*<x*{6!gi$ox{_Y?Lwn0%bBH|;U6djl&)nP4lLjzg-R1q|sC9h<DTh$l4_&emu
zi;QJ-;~T*k$Lkf4js}Fz9pR|FD*7phOZ4L(@fb)iPLPE?G~^)xr$h+45OP?FRue(>
z$nf#-gV-zMDC8!+vSc!p(5fBDB8V9|k`isBoZ{<RxX4njNQ^QQWh)_>NLZ!|eFtnE
zC&zM2T*AU(lO$xVnkK>AwGw_q)Z{MtSdn{4QklzKLo-)7x+8K;n#mL<&u*DUR(2A1
zKFgmTvH8tvT9cM@gyzi5c}{2kQk}*W<oW9PEyS48aig@H4NsZNhv~DHIPB*Oby>G{
z!fK%DET}>LJ?YSd;*)3kbP5usXvuD7vtsLt3{LF%#*YPUjEB41ID_fRVIp*+6aD7f
zP>N1AD)O0{yHtnHSPUkDbV3{@pEs!mQ$)@)qAVS%Bz+WAc^Xxt_FL&t3xw0kUG%4e
zoM|%e6IH41l&bgCp*+u%RjvAzpEM=vQsHT{qylo9Y?Ww3&8nQRiq)%JO(I#DidNcv
zw5Do(D_+-H*0vHfreEvpS^fIguHJR9gzcJP4-44D+SRIz9i9;68n>ygFtCzUs%4Ra
z+01Trvu=%SWg*M9$C}l&s8uXwTdSwNsdlxE6>3vyTief;bhb=ulm{5)TPqz-T8jxS
zos9k)Pa}jbD_rC)ChZgjSvgm^7xU0`dsN+gU6(a|a_x3m*4@c|_p;dq>Ueci-sqk;
z4C%%0dZ`;;p1zm7@omw3!5cFB-Z!oJeb;`0)?V)ZcNO*Z?|_%qU+W&YunE@gf}OXk
zCN{UOV~U7`mrGg)KRC7w?21JVvcTYd*oqtOu>VTvS;>$IdMS2qiJgc-80QsF{p0YA
z(feW<3kgU<q2aNRnqw0RnYlgYFosjg-XQB$i&R8%h4*Sb+p1T|Llz=yRczzqN!i6p
z&Y&jc>SZIBcE4dZ@s>N|<0b<+$YI6^g=yU6r>r^0ZN8+F)wE*&%z4AJJJANt402or
zhJeW#HZPTZX{e$e`nA#6^P)#v3r9biuJRl6q+vS@NnhHjjkffrb9)O-f4Z}w_VlRV
zTxmt08q}%2?W#|!H&wqH)sZ&!s*lVcTaTL1A=*oDe+}$l3wzkaF1E4hGiw#&I@yNh
NHM5(2&HNMq06X-sY&ZY_

literal 0
HcmV?d00001

diff --git a/common/test/data/full/circuits/heaters-parallel.gif b/common/test/data/full/circuits/heaters-parallel.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c961ab596eb0830ace68c617015c65372d222389
GIT binary patch
literal 2230
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
EJEWIqG5`Po

literal 0
HcmV?d00001

diff --git a/common/test/data/full/course.xml b/common/test/data/full/course.xml
new file mode 100644
index 0000000000..52d4753a1a
--- /dev/null
+++ b/common/test/data/full/course.xml
@@ -0,0 +1 @@
+<course filename="6.002_Spring_2012" slug="6.002_Spring_2012" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="6.002 Spring 2012"/>
diff --git a/common/test/data/full/course/6.002_Spring_2012.xml b/common/test/data/full/course/6.002_Spring_2012.xml
new file mode 100644
index 0000000000..d6398cdc46
--- /dev/null
+++ b/common/test/data/full/course/6.002_Spring_2012.xml
@@ -0,0 +1,12 @@
+<sequential>
+  <chapter filename="Overview" slug="Overview" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="Overview"/>
+  <chapter filename="Week_1" slug="Week_1" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="Week 1"/>
+  <chapter slug="Midterm_Exam" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="Midterm Exam">
+    <sequential slug="Midterm_Exam_1121" format="Midterm" graceperiod="0 day 0 hours 5 minutes 0 seconds" showanswer="attempted" rerandomize="per_student" due="April 30, 12:00" graded="true" name="Midterm Exam">
+      <vertical slug="vertical_1122" graceperiod="0 day 0 hours 5 minutes 0 seconds" showanswer="attempted" rerandomize="per_student" due="April 30, 12:00" graded="true">
+        <html filename="Midterm_Exam_1123" slug="Midterm_Exam_1123" graceperiod="0 day 0 hours 5 minutes 0 seconds" rerandomize="per_student" due="April 30, 12:00" graded="true" name="Midterm Exam"/>
+      </vertical>
+      <vertical filename="vertical_1124" slug="vertical_1124" graceperiod="0 day 0 hours 5 minutes 0 seconds" showanswer="attempted" rerandomize="per_student" due="April 30, 12:00" graded="true"/>
+    </sequential>
+  </chapter>
+</sequential>
diff --git a/common/test/data/full/course_settings.json b/common/test/data/full/course_settings.json
new file mode 100644
index 0000000000..bdeed93549
--- /dev/null
+++ b/common/test/data/full/course_settings.json
@@ -0,0 +1,35 @@
+{
+	"GRADER" : [
+	    {
+	        "type" : "Homework",
+	        "min_count" : 12,
+	        "drop_count" : 2,
+	        "short_label" : "HW",
+	        "weight" : 0.15
+	    },
+	    {
+	        "type" : "Lab",
+	        "min_count" : 12,
+	        "drop_count" : 2,
+	        "category" : "Labs",
+	        "weight" : 0.15
+	    },
+	    {
+	        "type" : "Midterm",
+	        "name" : "Midterm Exam",
+	        "short_label" : "Midterm",
+	        "weight" : 0.3
+	    },
+	    {
+	        "type" : "Final",
+	        "name" : "Final Exam",
+	        "short_label" : "Final",
+	        "weight" : 0.4
+	    }
+	],
+	"GRADE_CUTOFFS" : {
+		"A" : 0.87, 
+		"B" : 0.7, 
+		"C" : 0.6
+	}
+}
diff --git a/common/test/data/full/custom_tags/book b/common/test/data/full/custom_tags/book
new file mode 100644
index 0000000000..ece6f288db
--- /dev/null
+++ b/common/test/data/full/custom_tags/book
@@ -0,0 +1 @@
+More information given in <a href="/book/${page}">the text</a>. 
diff --git a/common/test/data/full/custom_tags/discuss b/common/test/data/full/custom_tags/discuss
new file mode 100644
index 0000000000..ac56590074
--- /dev/null
+++ b/common/test/data/full/custom_tags/discuss
@@ -0,0 +1 @@
+<a href='https://6002x.mitx.mit.edu/discussion/questions/scope:all/sort:activity-desc/tags:${tag}/page:1/'> Discussion: ${tag} </a>
\ No newline at end of file
diff --git a/common/test/data/full/custom_tags/image b/common/test/data/full/custom_tags/image
new file mode 100644
index 0000000000..d2939ba88c
--- /dev/null
+++ b/common/test/data/full/custom_tags/image
@@ -0,0 +1 @@
+<img src="http://pmitros.csail.mit.edu/tutorial/images/${file}" />
diff --git a/common/test/data/full/custom_tags/slides b/common/test/data/full/custom_tags/slides
new file mode 100644
index 0000000000..7a33ffd6c7
--- /dev/null
+++ b/common/test/data/full/custom_tags/slides
@@ -0,0 +1 @@
+Lecture Slides Handout [<a href="/static/handouts/6002-L${lecnum}-oei12-gaps.pdf">Clean </a>][<a href="/static/handouts/6002-L${lecnum}-oei12-gaps-annotated.pdf">Annotated</a>]
\ No newline at end of file
diff --git a/common/test/data/full/custom_tags/videodev b/common/test/data/full/custom_tags/videodev
new file mode 100644
index 0000000000..3e268517d9
--- /dev/null
+++ b/common/test/data/full/custom_tags/videodev
@@ -0,0 +1,3 @@
+<video width="560" height="340" controls>
+<source src="http://pmitros.csail.mit.edu/tutorial/raw_links/${name}.webm">
+</video>
diff --git a/common/test/data/full/html/Final_Exam_2010.html b/common/test/data/full/html/Final_Exam_2010.html
new file mode 100644
index 0000000000..c1ae88d89a
--- /dev/null
+++ b/common/test/data/full/html/Final_Exam_2010.html
@@ -0,0 +1,17 @@
+<html>
+  <body>
+    <center>
+                           Final Exam
+</center>
+    <p>This exam covers weeks 1-13. You may use your calculator, your notes, your book, the internet, or any other auxiliary materials that you think can help you. However, you are not allowed to communicate with any person on any topic associated with this course while you are taking this exam.</p>
+    <p>
+Once you click on the next tab, you will have 24 hours to complete the examination. For each problem you will be allowed exactly three submissions.  Your
+answers to that problem will be checked after each submission, so you
+can fix mistakes you may have made, within the three-submission limit.
+Your most recently checked answer is the answer that will contribute to your grade on the exam.
+</p>
+    <p>
+Each answer box on the exam contributes equally to your grade on the exam, regardless of how they are grouped as problems. 
+</p>
+  </body>
+</html>
diff --git a/common/test/data/full/html/FirstOrderSystemHint.xml b/common/test/data/full/html/FirstOrderSystemHint.xml
new file mode 100644
index 0000000000..cc92bfd319
--- /dev/null
+++ b/common/test/data/full/html/FirstOrderSystemHint.xml
@@ -0,0 +1,8 @@
+Hint
+<br/><br/>
+Remember that the time evolution of any variable \(x(t)\) governed by
+a first-order system with a time-constant \(\tau\) for a time \(t) between an initial
+value \(x(t_0)\) and a final value \(x(\infty)\) is the following:
+<br/><br/>
+\(x(t) = x(\infty) + (x(t_0) - x(\infty)) e^(-(t-t_0)/\tau)\)
+<br/><br/>
diff --git a/common/test/data/full/html/Lab2A.html b/common/test/data/full/html/Lab2A.html
new file mode 100644
index 0000000000..7fe52cc1be
--- /dev/null
+++ b/common/test/data/full/html/Lab2A.html
@@ -0,0 +1,105 @@
+<script type="text/javascript">
+$(document).ready(function() { 
+$("#r1_slider").slider({
+value: 1, min: 1, max: 10, step: 1, slide: schematic.component_slider,
+schematic: "ctrls", component: "R1", property: "r", analysis: "dc",
+})
+
+$("#r2_slider").slider({
+value: 1, min: 1, max: 10, step: 1, slide: schematic.component_slider,
+schematic: "ctrls", component: "R2", property: "r", analysis: "dc",
+})
+
+$("#r3_slider").slider({
+value: 1, min: 1, max: 10, step: 1, slide: schematic.component_slider,
+schematic: "ctrls", component: "R3", property: "r", analysis: "dc",
+})
+
+$("#r4_slider").slider({
+value: 1, min: 1, max: 10, step: 1, slide: schematic.component_slider,
+schematic: "ctrls", component: "R4", property: "r", analysis: "dc",
+})
+
+$("#slider").slider(); });
+</script>
+
+<b>Lab 2A: Superposition Experiment</b>
+
+<br><br><i>Note: This part of the lab is just to develop your intuition about
+superposition.  There are no responses that need to be checked.</i>
+
+<br/><br/>Circuits with multiple sources can be hard to analyze as-is.  For example, what is the voltage
+between the two terminals on the right of Figure 1?
+
+<center>
+<input width="425" type="hidden" height="150" id="schematic1" parts="" analyses="" class="schematic ctrls" name="test2" value="[[&quot;w&quot;,[160,64,184,64]],[&quot;w&quot;,[160,16,184,16]],[&quot;w&quot;,[64,16,112,16]],[&quot;w&quot;,[112,64,88,64]],[&quot;w&quot;,[64,64,88,64]],[&quot;g&quot;,[88,64,0],{},[&quot;0&quot;]],[&quot;w&quot;,[112,64,160,64]],[&quot;w&quot;,[16,64,64,64]],[&quot;r&quot;,[160,16,0],{&quot;name&quot;:&quot;R4&quot;,&quot;r&quot;:&quot;1&quot;},[&quot;1&quot;,&quot;0&quot;]],[&quot;r&quot;,[160,16,1],{&quot;name&quot;:&quot;R3&quot;,&quot;r&quot;:&quot;1&quot;},[&quot;1&quot;,&quot;2&quot;]],[&quot;i&quot;,[112,64,6],{&quot;name&quot;:&quot;&quot;,&quot;value&quot;:&quot;6A&quot;},[&quot;0&quot;,&quot;2&quot;]],[&quot;r&quot;,[64,16,0],{&quot;name&quot;:&quot;R2&quot;,&quot;r&quot;:&quot;1&quot;},[&quot;2&quot;,&quot;0&quot;]],[&quot;r&quot;,[64,16,1],{&quot;name&quot;:&quot;R1&quot;,&quot;r&quot;:&quot;1&quot;},[&quot;2&quot;,&quot;3&quot;]],[&quot;v&quot;,[16,16,0],{&quot;name&quot;:&quot;&quot;,&quot;value&quot;:&quot;8V&quot;},[&quot;3&quot;,&quot;0&quot;]],[&quot;view&quot;,-24,0,2]]"/>
+Figure 1.  Example multi-source circuit
+</center>
+
+<br/><br/>We can use superposition to make the analysis much easier.
+The circuit in Figure 1 can be decomposed into two separate
+subcircuits: one involving only the voltage source and one involving only the
+current source.  We'll analyze each circuit separately and combine the
+results using superposition.  Recall that to decompose a circuit for
+analysis, we'll pick each source in turn and set all the other sources
+to zero (i.e., voltage sources become short circuits and current
+sources become open circuits).  The circuit above has two sources, so
+the decomposition produces two subcircuits, as shown in Figure 2.
+
+<center>
+<table><tr><td>
+<input style="display:inline;" width="425" type="hidden" height="150" id="schematic2" parts="" analyses="" class="schematic ctrls" name="test2" value="[[&quot;w&quot;,[160,64,184,64]],[&quot;w&quot;,[160,16,184,16]],[&quot;w&quot;,[64,16,112,16]],[&quot;w&quot;,[112,64,88,64]],[&quot;w&quot;,[64,64,88,64]],[&quot;g&quot;,[88,64,0],{},[&quot;0&quot;]],[&quot;w&quot;,[112,64,160,64]],[&quot;w&quot;,[16,64,64,64]],[&quot;r&quot;,[160,16,0],{&quot;name&quot;:&quot;R4&quot;,&quot;r&quot;:&quot;1&quot;},[&quot;1&quot;,&quot;0&quot;]],[&quot;r&quot;,[160,16,1],{&quot;name&quot;:&quot;R3&quot;,&quot;r&quot;:&quot;1&quot;},[&quot;1&quot;,&quot;2&quot;]],[&quot;r&quot;,[64,16,0],{&quot;name&quot;:&quot;R2&quot;,&quot;r&quot;:&quot;1&quot;},[&quot;2&quot;,&quot;0&quot;]],[&quot;r&quot;,[64,16,1],{&quot;name&quot;:&quot;R1&quot;,&quot;r&quot;:&quot;1&quot;},[&quot;2&quot;,&quot;3&quot;]],[&quot;v&quot;,[16,16,0],{&quot;name&quot;:&quot;&quot;,&quot;value&quot;:&quot;8V&quot;},[&quot;3&quot;,&quot;0&quot;]],[&quot;view&quot;,-24,0,2]]"/>
+(a) Subcircuit for analyzing contribution of voltage source
+</td><td>
+<input width="425" type="hidden" height="150" id="schematic3" parts="" analyses="" class="schematic ctrls" name="test2" value="[[&quot;w&quot;,[16,16,16,64]],[&quot;w&quot;,[160,64,184,64]],[&quot;w&quot;,[160,16,184,16]],[&quot;w&quot;,[64,16,112,16]],[&quot;w&quot;,[112,64,88,64]],[&quot;w&quot;,[64,64,88,64]],[&quot;g&quot;,[88,64,0],{},[&quot;0&quot;]],[&quot;w&quot;,[112,64,160,64]],[&quot;w&quot;,[16,64,64,64]],[&quot;r&quot;,[160,16,0],{&quot;name&quot;:&quot;R4&quot;,&quot;r&quot;:&quot;1&quot;},[&quot;1&quot;,&quot;0&quot;]],[&quot;r&quot;,[160,16,1],{&quot;name&quot;:&quot;R3&quot;,&quot;r&quot;:&quot;1&quot;},[&quot;1&quot;,&quot;2&quot;]],[&quot;i&quot;,[112,64,6],{&quot;name&quot;:&quot;&quot;,&quot;value&quot;:&quot;6A&quot;},[&quot;0&quot;,&quot;2&quot;]],[&quot;r&quot;,[64,16,0],{&quot;name&quot;:&quot;R2&quot;,&quot;r&quot;:&quot;1&quot;},[&quot;2&quot;,&quot;0&quot;]],[&quot;r&quot;,[64,16,1],{&quot;name&quot;:&quot;R1&quot;,&quot;r&quot;:&quot;1&quot;},[&quot;2&quot;,&quot;3&quot;]],[&quot;view&quot;,-24,0,2]]"/>
+(b) Subcircuit for analyzing contribution of current source
+</td></tr></table>
+<br>Figure 2.  Decomposition of Figure 1 into subcircuits
+</center>
+
+<br/>Let's use the DC analysis capability of the schematic tool to see superposition
+in action.  The sliders below control the resistances of R1, R2, R3 and R4 in all
+the diagrams.  As you move the sliders, the schematic tool will adjust the appropriate
+resistance, perform a DC analysis and display the node voltages on the diagrams.  Here's
+what you want to observe as you play with the sliders:
+
+<ul style="margin-left:2em;margin-top:1em;margin-right:2em;margin-bottom:1em;">
+<i>The voltage for a node in Figure 1 is the sum of the voltages for
+that node in Figures 2(a) and 2(b), just as predicted by
+superposition. (Note that due to round-off in the display of the
+voltages, the sum of the displayed voltages in Figure 2 may only be within
+.01 of the voltages displayed in Figure 1.)</i>
+</ul>
+
+<br>
+<center>
+<table><tr valign="top">
+<td>
+  <table>
+    <tr valign="top">
+      <td>R1</td>
+      <td>
+	<div id="r1_slider" style="width:200px; height:10px; margin-left:15px"></div>
+      </td>
+    </tr>
+    <tr valign="top">
+      <td>R2</td>
+      <td>
+	<div id="r2_slider" style="width:200px; height:10px; margin-left:15px; margin-top:10px;"></div>
+      </td>
+    </tr>
+    <tr valign="top">
+      <td>R3</td>
+      <td>
+	<div id="r3_slider" style="width:200px; height:10px; margin-left:15px; margin-top:10px;"></div>
+      </td>
+    </tr>
+    <tr valign="top">
+      <td>R4</td>
+      <td>
+	<div id="r4_slider" style="width:200px; height:10px; margin-left:15px; margin-top:10px;"></div>
+      </td>
+    </tr>
+  </table>
+</td></tr></table>
+</center>
diff --git a/common/test/data/full/html/Midterm.html b/common/test/data/full/html/Midterm.html
new file mode 100644
index 0000000000..57e75c6ccc
--- /dev/null
+++ b/common/test/data/full/html/Midterm.html
@@ -0,0 +1,35 @@
+<center>
+                           Midterm Exam
+</center>
+
+<p>
+This is a twenty four hour examination.  You can start the exam when it is
+convenient for you, but you must complete this examination by 12:00pm (noon) 
+GMT on April 30th. Please look up what time this is in your local time zone.
+</p>
+
+<p>
+When you open the next page, you will have started the examination.
+You do not need to start now: you will not be timed until you open the
+next page.  Once you have opened the next page page you must complete
+the exam and make your final submission within twenty four hours of starting
+the exam.
+</p>
+
+<p>
+You may use any notes, computational, or auxiliary materials that you
+think can help you.  However, you may not communicate with any person
+about this examination while working on it. Furthermore, you may not 
+communicate about the exam until the exam has been closed for everyone. 
+</p>
+
+<p>
+For each problem you will be allowed exactly three submissions.  Your
+answers to that problem will be checked after each submission, so you
+can fix mistakes you may have made, within the three-submission limit.
+</p>
+
+<p>
+If you want to go back and study some more before starting this
+exam you can do so. Good Luck!
+</p>
diff --git a/common/test/data/full/html/Midterm_Exam_1080.html b/common/test/data/full/html/Midterm_Exam_1080.html
new file mode 100644
index 0000000000..32b4a151a0
--- /dev/null
+++ b/common/test/data/full/html/Midterm_Exam_1080.html
@@ -0,0 +1,34 @@
+<html>
+  <body>
+    <center>
+                           Midterm Exam
+</center>
+    <p>
+This is a twenty four hour examination.  You can start the exam when it is
+convenient for you, but you must complete this examination by 12:00pm (noon) 
+GMT on April 30th. Please look up what time this is in your local time zone.
+</p>
+    <p>
+When you open the next page, you will have started the examination.
+You do not need to start now: you will not be timed until you open the
+next page.  Once you have opened the next page page you must complete
+the exam and make your final submission within twenty four hours of starting
+the exam.
+</p>
+    <p>
+You may use any notes, computational, or auxiliary materials that you
+think can help you.  However, you may not communicate with any person
+about this examination while working on it. Furthermore, you may not 
+communicate about the exam until the exam has been closed for everyone. 
+</p>
+    <p>
+For each problem you will be allowed exactly three submissions.  Your
+answers to that problem will be checked after each submission, so you
+can fix mistakes you may have made, within the three-submission limit.
+</p>
+    <p>
+If you want to go back and study some more before starting this
+exam you can do so. Good Luck!
+</p>
+  </body>
+</html>
diff --git a/common/test/data/full/html/Midterm_Exam_1123.html b/common/test/data/full/html/Midterm_Exam_1123.html
new file mode 100644
index 0000000000..32b4a151a0
--- /dev/null
+++ b/common/test/data/full/html/Midterm_Exam_1123.html
@@ -0,0 +1,34 @@
+<html>
+  <body>
+    <center>
+                           Midterm Exam
+</center>
+    <p>
+This is a twenty four hour examination.  You can start the exam when it is
+convenient for you, but you must complete this examination by 12:00pm (noon) 
+GMT on April 30th. Please look up what time this is in your local time zone.
+</p>
+    <p>
+When you open the next page, you will have started the examination.
+You do not need to start now: you will not be timed until you open the
+next page.  Once you have opened the next page page you must complete
+the exam and make your final submission within twenty four hours of starting
+the exam.
+</p>
+    <p>
+You may use any notes, computational, or auxiliary materials that you
+think can help you.  However, you may not communicate with any person
+about this examination while working on it. Furthermore, you may not 
+communicate about the exam until the exam has been closed for everyone. 
+</p>
+    <p>
+For each problem you will be allowed exactly three submissions.  Your
+answers to that problem will be checked after each submission, so you
+can fix mistakes you may have made, within the three-submission limit.
+</p>
+    <p>
+If you want to go back and study some more before starting this
+exam you can do so. Good Luck!
+</p>
+  </body>
+</html>
diff --git a/common/test/data/full/html/Week_13_Tutorials.html b/common/test/data/full/html/Week_13_Tutorials.html
new file mode 100644
index 0000000000..b7bd9577e3
--- /dev/null
+++ b/common/test/data/full/html/Week_13_Tutorials.html
@@ -0,0 +1,19 @@
+<html>
+  <body>
+    <h1>Week 13 Tutorials</h1>
+    <section class="tutorials">
+      <h2> Basic Tutorials </h2>
+      <ul>
+        <li><a href="/section/wk13_solder">Soldering</a> -- Steve
+       Finberg, one of the pioneers in from Draper Lab, talks about
+       soldering. </li>
+      </ul>
+      <h2> Bonus Tutorials </h2>
+      <ul>
+        <li><a href="/section/wk13_FreqResp">Frequency Response
+       Curves</a> -- We explain several techniques for understanding
+       and approximating Bode plots. </li>
+      </ul>
+    </section>
+  </body>
+</html>
diff --git a/common/test/data/full/html/Week_1_Tutorials.html b/common/test/data/full/html/Week_1_Tutorials.html
new file mode 100644
index 0000000000..ebe87f0282
--- /dev/null
+++ b/common/test/data/full/html/Week_1_Tutorials.html
@@ -0,0 +1,47 @@
+<html>
+  <body>
+    <h1>Week 1 Tutorials</h1>
+    <section class="tutorials">
+      <h2> Introduction </h2>
+      <ul>
+        <li><a href="/section/intro"> Welcome! </a> - We introduce
+      ourselves and explain the tutorial format. </li>
+      </ul>
+      <h2>Basic Tutorials </h2>
+      <ul>
+        <li><a href="/section/circuit_abstraction">The Circuit
+        Abstraction</a> - We look at a lightbulb, and see that abstracting
+      away the circuit from the geometry of the wiring has no visible
+      effect. </li>
+        <li><a href="/section/a_real_circuit/">Lightbulb Circuit</a> - We
+      look at the voltage across a lightbulb with a multimeter, and
+      confirm the device is symmetric.  In the process, we see reference
+      directions for currents, voltages, and polarity for powers. </li>
+        <li><a href="/section/parallel_resistors">Parallel Resistors</a> -
+      An explanation of equivalent circuits in the context of parallel
+      resistors.</li>
+        <li><a href="/section/series_and_parallel">Combination of Series
+        and Parallel</a> - Slightly more complex networks of resistors
+      simplified with equivalent networks.</li>
+        <li><a href="/section/3r_nodal">Nodal Analysis</a> - A simple
+      example of nodal analysis.</li>
+        <li><a href="/section/floating_voltage_3r">Floating Voltage</a> -
+      Nodal analysis with a floating source.</li>
+        <li><a href="/section/combination_rules">Combination Rules</a> -
+      We show how to apply combination rules to solving simple
+      circuits.</li>
+      </ul>
+      <h2>Worked Problems </h2>
+      <p> For the first week, we work through <a href="http://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-002-circuits-and-electronics-spring-2007/assignments/hw1.pdf"> the first problem set from 2007</a></p>
+      <ul>
+        <li><a href="/section/exercise_1_1">OCW Exercise 1-1</a>: Find voltages in a simple series and parallel circuit, and show power is conserved</li>
+        <li><a href="/section/ex_1_2">OCW Exercise 1-2</a> - Synthesize a network of 3/5k and 5/3k from at most four 1k resistors</li>
+        <li><a href="/section/problem_1-1">OCW Problem 1-1/Textbook 2.7</a> - Find the current through a resistor in a network of resistors</li>
+        <li><a href="/section/problem_1-2_part1">OCW Problem 1-2</a> - Analyze long chains of resistors (similar to transmission lines or R1R2 ladders) </li>
+        <li><a href="/section/problem_1_3">OCW Problem 1-3 </a> - Reverse engineer a black-box resistor network</li>
+      </ul>
+      <hr/>
+      <p>  Since the course has students from a diverse set of backgrounds, the first week's tutorials includes several extra segments, worked out with greater detail, to help bring everyone up to speed. </p>
+    </section>
+  </body>
+</html>
diff --git a/common/test/data/full/html/linearity_clarify.html b/common/test/data/full/html/linearity_clarify.html
new file mode 100644
index 0000000000..555f394c88
--- /dev/null
+++ b/common/test/data/full/html/linearity_clarify.html
@@ -0,0 +1,39 @@
+	     Clarification of the term "Linear"
+  <p>
+    The term "linear" is very clear when applied to a
+    mathematical function.  A function F is linear if and only
+    if it obeys homogeneity and superposition:
+    </p><p>
+    Homogeneity:        F(cx) = cF(x)
+    <br/>
+    Superposition:      F(x+y) = F(x) + F(y)
+    </p><p>
+    In the context of what we have seen so far, the only
+    elements that are linear as mathematical functions are
+    resistors.  An independent voltage source or an independent
+    current source is not a linear element.  (There are also
+    linear dependent sources, linear capacitors and linear
+    inductors, but we have not yet introduced them in our class.
+    You will see them later.)
+    </p><p>
+    Formally, a circuit composed of only linear elements is a
+    linear circuit.  When we add independent sources to a linear
+    circuit as inputs, we get a circuit that is not linear
+    because it has an offset: its v-i characteristic at a pair
+    of exposed terminals may not pass through the origin.
+    However, we can make a Thevenin or Norton equivalent model
+    of such a circuit: the Thevenin resistance summarizes the
+    effect of the linear elements and the Thevenin voltage
+    summarizes the effect of the independent sources.
+    </p><p>
+    However the term "linear," when applied to an electrical
+    circuit often takes on an informal meaning.  We often say
+    that a circuit containing only linear elements and
+    independent sources is a "linear circuit."  So, in the
+    informal sense, a linear circuit is one where we can apply
+    the Thevenin or Norton theorems to summarize the behavior at
+    a pair of exposed terminals.
+    </p><p>
+    Sorry for the confusion of words -- natural language is like
+    that!
+  </p>
diff --git a/common/test/data/full/html/linearity_clarify.xml b/common/test/data/full/html/linearity_clarify.xml
new file mode 100644
index 0000000000..066b22a110
--- /dev/null
+++ b/common/test/data/full/html/linearity_clarify.xml
@@ -0,0 +1,39 @@
+	     Clarification of the term "Linear"
+  <p>
+    The term "linear" is very clear when applied to a
+    mathematical function.  A function F is linear if and only
+    if it obeys homogeneity and superposition:
+    </p><p>
+    Homogeneity:        F(cx) = cF(x)
+    <br/>
+    Superposition:      F(x+y) = F(x) + F(y)
+    </p><p>
+    In the context of what we have seen so far, the only
+    elements that are linear as mathematical functions are
+    resistors.  An independent voltage source or an independent
+    current source is not a linear element.  (There are also
+    linear dependent sources, linear
+    inductors, and other linear elements, but we have not yet introduced them in our class.
+    You will see them later.)
+    </p><p>
+    Formally, a circuit composed of only linear elements is a
+    linear circuit.  When we add independent sources to a linear
+    circuit as inputs, we get a circuit that is not linear
+    because it has an offset: its v-i characteristic at a pair
+    of exposed terminals may not pass through the origin.
+    However, we can make a Thevenin or Norton equivalent model
+    of such a circuit: the Thevenin resistance summarizes the
+    effect of the linear elements and the Thevenin voltage
+    summarizes the effect of the independent sources.
+    </p><p>
+    However the term "linear," when applied to an electrical
+    circuit often takes on an informal meaning.  We often say
+    that a circuit containing only linear elements and
+    independent sources is a "linear circuit."  So, in the
+    informal sense, a linear circuit is one where we can apply
+    the Thevenin or Norton theorems to summarize the behavior at
+    a pair of exposed terminals.
+    </p><p>
+    Sorry for the confusion of words -- natural language is like
+    that!
+  </p>
diff --git a/common/test/data/full/html/schematic_tutorial.html b/common/test/data/full/html/schematic_tutorial.html
new file mode 100644
index 0000000000..991201ab15
--- /dev/null
+++ b/common/test/data/full/html/schematic_tutorial.html
@@ -0,0 +1,75 @@
+<p/><b>Usage Summary:</b>
+
+<table style="border-spacing:2em; border-collapse: separate;">
+
+<tr>
+<td style="width:10em;">Add a component</td>
+<td>Click on the component in the parts bin (the columns of part icons to
+the right of the diagram area) and drag it onto the diagram.  Release
+the mouse when the component is in the correct position.
+</td>
+</tr>
+
+<tr>
+<td>Move a component</td>
+<td>Click to select a component in the diagram (it will turn green)
+and then drag it to its new location.  You can use shift-click to add
+a component to the current selection.  Or you can click somewhere in
+the diagram that is not on top of a component and drag out a selection
+rectangle -- components intersecting the rectangle will be added to
+the current selection.
+</td>
+</tr>
+
+<tr>
+<td>Rotate a component</td>
+<td>Click to select a component in the diagram (it will turn green)
+and then type the letter "r" on the keyboard.  The component will
+be rotated 90 degrees.  Additional rotations will move the component
+through its eight possible orientations (4 compass points and their
+reflections).
+</td>
+</tr>
+
+<tr>
+<td>Delete a component</td>
+<td>Click to select the component in the diagram (shift-click to
+select multiple components) then type DEL or BACKSPACE on your
+keyboard.
+</td>
+</tr>
+
+<tr>
+<td>Change a component's properties</td>
+<td>Double click on the component.  This will bring up an Edit Properties
+window that has input fields for each of the component's properties.
+Click OK to change the values.  Click CANCEL or the window's close
+button to abort the changes.  Numeric values can be entered using
+engineeering notation:
+
+<center><table style="border-collapse:separate; border-spacing:1em;">
+<tr><th>suffix</th><th>multiplier</th> <th style="width:3em"></th> <th>suffix</th><th>multiplier</th></tr>
+<tr><td>T</td><td>\(10^{12}\)</td> <td></td> <td>u</td><td>\(10^{-6}\)</td></tr>
+<tr><td>G</td><td>\(10^{9}\)</td> <td></td> <td>n</td><td>\(10^{-9}\)</td></tr>
+<tr><td>M</td><td>\(10^{6}\)</td> <td></td> <td>p</td><td>\(10^{-12}\)</td></tr>
+<tr><td>k</td><td>\(10^{3}\)</td> <td></td> <td>f</td><td>\(10^{-15}\)</td></tr>
+<tr><td>m</td><td>\(10^{-3}\)</td></tr>
+</table></center>
+
+</td>
+</tr>
+
+<tr>
+<td>Add a wire</td>
+<td>Wires start at connection points, the open circles that
+appear at the terminals of components or the ends of wires.
+Click on a connection point to start a wire -- a green wire
+will appear with one end anchored at the starting point.
+Drag the mouse and release the mouse button when the other
+end of the wire is positioned as you wish.  Once a wire has
+been added to the diagram it can be manipulated like any other
+component.
+</td>
+</tr>
+
+</table>
diff --git a/common/test/data/full/html/sound_labs/mosfet_amplifier.html b/common/test/data/full/html/sound_labs/mosfet_amplifier.html
new file mode 100644
index 0000000000..c7f2f1ad81
--- /dev/null
+++ b/common/test/data/full/html/sound_labs/mosfet_amplifier.html
@@ -0,0 +1,124 @@
+<script type="text/javascript" src="/static/courses/6002/js/sound_labs/sound.js"></script>
+<script type="text/javascript" src="/static/courses/6002/js/sound_labs/plotter.js"></script>
+<script type="text/javascript" src="/static/courses/6002/js/sound_labs/circuit.js"></script>
+<script type="text/javascript" src="/static/courses/6002/js/sound_labs/mosfet_amplifier.js"></script>
+
+<h2>LAB 5B: MOSFET AMPLIFIER EXPERIMENT</h2>
+<section class="problem">
+<startouttext />
+<p>Note: This part of the lab is just to develop your intuition about
+amplifiers and biasing, and to have fun with music! There are no responses
+that need to be checked.</p>
+<p>The graph plots the selected voltages from the amplifier circuit below. You
+can also listen to various signals by selecting  from the radio buttons to
+the right of the graph. This way you can both see and hear various signals.
+You can use the sliders to the right of the amplifier circuit to  control
+various parameters of the MOSFET and the amplifier. The parameter \(V_{MAX}\)
+sets the maximum range on the plots. You can also select an input voltage
+type (e.g., sine wave, square wave, various types of music) using the drop
+down menu to the right of the graph. When describing AC signals, the
+voltages on the sliders refer to peak-to-peak values.</p>
+<p>1. To begin your first experiment, go ahead and use the pull down menu to
+select a sine wave input.  Then,  adjust the sliders to an approximate
+baseline setting shown below.</p>
+<p>Baseline setting of sliders:
+<br />
+\(V_{S}=1.6V\), \(v_{IN}=3V\), \(Frequency=1000Hz\), \(V_{BIAS}=2.5V\), \(R=10K\Omega\), \(k=1mA/V^{2}\), \(V_{T}=1V\), \(V_{MAX}=2V\).</p> 
+<p>You will observe in the plot that the baseline setting of the sliders for
+the various amplifiers parameters produces a distorted sine wave signal for
+\(v_{OUT}\). Next, go ahead and select one of the music signals as the input and
+listen to each of \(v_{IN}\) and \(v_{OUT}\), and confirm for yourself that the
+output  sounds distorted for the chosen slider settings.  You will notice
+that the graph now plots the music signal waveforms. Think about all the
+reasons why the amplifier is producing a distorted output.</p>
+<p>2. For the second experiment, we will study the amplifier's small signal
+behavior.  Select a sine wave as the input signal.  To study the small
+signal behavior, reduce the value of \(v_{IN}\) to 0.1V (peak-to-peak) by
+using the \(v_{IN}\) slider. Keeping the rest of the parameters at their
+baseline settings, derive an appropriate value of \(V_{BIAS}\) that will ensure
+saturation region operation for the MOSFET for the 0.1V peak-to-peak swing
+for \(v_{IN}\).  Make sure to think about both positive and negative excursions
+of the signals.</p>  
+</p>Next, use the \(V_{BIAS}\) slider to choose your computed value for \(V_{BIAS}\) and
+see if the observed plot of \(v_{OUT}\)  is more or less distortion free. If
+your calculation was right, then the output will indeed be distortion free.</p>
+<p>Next, select one of the music signals as the input and listen to each of
+\(v_{IN}\) and \(v_{OUT}\), and confirm for yourself that the output  sounds much
+better than in Step 1. Also, based on sound volume, confirm that \(v_{OUT}\) is
+an amplified version of \(v_{IN}\).</p>
+<p>3. Now go ahead and experiment with various other settings while listening
+to the music signal at \(v_{OUT}\). Observe the plots and listen to \(v_{OUT}\) as
+you change, for example,  the bias voltage \(V_{BIAS}\). You will notice that
+the amplifier distorts the input signal when \(V_{BIAS}\) becomes too small, or
+when it becomes too large.  You can also experiment with various values of
+\(v_{IN}\), \(R_{L}\), etc., and see how they affect the amplification and distortion.</p>
+<endouttext />
+</section>
+
+<section class="tool-wrapper">
+  <div id="controlls-container">
+
+    <div class="graph-controls">
+      <div class="music-wrapper">
+        <select id="musicTypeSelect" size="1">
+          <option value = "0">Zero Input</option>
+          <option value = "1">Unit Impulse</option>
+          <option value = "2">Unit Step</option>
+          <option selected="selected" value = "3">Sine Wave</option>
+          <option value = "4">Square Wave</option>
+          <option value = "5">Classical Music</option>
+          <option value = "6">Folk Music</option>
+          <option value = "7">Jazz Music</option>
+          <option value = "8">Reggae Music</option>
+        </select>
+
+        <input id="playButton" type="button" value="Play" />
+      </div>
+
+      <div class="inputs-wrapper">
+        <div id="graph-output">
+          <p>Graph:</p>
+          <ul>
+            <li><label for="vinCheckbox"><input id="vinCheckbox" type="checkbox" checked="yes"/>v<sub>IN</sub></label></li>
+            <li><label for="voutCheckbox"><input id="voutCheckbox" type="checkbox" checked="yes"/>v<sub>OUT</sub></label> </li>
+            <li><label for="vrCheckbox"><input id="vrCheckbox" type="checkbox"/>v<sub>R</sub></label></li>
+          </ul>
+        </div>
+
+        <div id="graph-listen">
+          <p>Listen to:</p>
+          <ul>
+            <li><label for="vinRadioButton"><input id="vinRadioButton" type="radio" checked="yes" name="listenToWhat"/>v<sub>IN</sub></label></li>
+            <li><label for="voutRadioButton"><input id="voutRadioButton" type="radio" name="listenToWhat"/>v<sub>OUT</sub></label></li>
+            <li><label for="vrRadioButton"><input id="vrRadioButton" type="radio" name="listenToWhat"/>v<sub>R</sub></label></li>
+          </ul>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="schematic-sliders">
+      <div class="slider-label" id="vs"></div>
+      <div class="slider" id="vsSlider"></div>
+      <div class="slider-label" id="vin"></div>
+      <div class="slider" id="vinSlider"></div>
+      <div class="slider-label" id="freq"></div>
+      <div class="slider" id="freqSlider"></div>
+      <div class="slider-label" id="vbias"></div>
+      <div class="slider" id="vbiasSlider"></div>
+      <div class="slider-label" id="r"></div>
+      <div class="slider" id="rSlider"></div>
+      <div class="slider-label" id="k"></div>
+      <div class="slider" id="kSlider"></div>
+      <div class="slider-label" id="vt"></div>
+      <div class="slider" id="vtSlider"></div>
+      <div class="slider-label" id="vmax"></div>
+      <div class="slider" id="vmaxSlider"></div>
+    </div>
+  </div>
+  <div id="graph-container">
+    <canvas id="graph" width="500" height="500">Your browser must support the Canvas element and have JavaScript enabled to view this tool.</canvas>
+    <canvas id="diag1" width="500" height="500">Your browser must support the Canvas element and have JavaScript enabled to view this tool.</canvas>
+  </div>
+
+</section>
diff --git a/common/test/data/full/html/sound_labs/rc_filters.html b/common/test/data/full/html/sound_labs/rc_filters.html
new file mode 100644
index 0000000000..c52f8022a4
--- /dev/null
+++ b/common/test/data/full/html/sound_labs/rc_filters.html
@@ -0,0 +1,111 @@
+<script type="text/javascript" src="/static/courses/6002/js/sound_labs/sound.js"></script>
+<script type="text/javascript" src="/static/courses/6002/js/sound_labs/plotter.js"></script>
+<script type="text/javascript" src="/static/courses/6002/js/sound_labs/circuit.js"></script>
+<script type="text/javascript" src="/static/courses/6002/js/sound_labs/rc_filters.js"></script>
+<h2>LAB 10B: RC FILTERS WITH FREQUENCY RESPONSE EXPERIMENT</h2>
+<section class="problem">
+<startouttext />
+<p>Note: Use this part of the lab to build your intuition about filters and frequency response, and to have fun with music! There are no responses that need to be checked.</p>
+<p>Recall from the audio lab in Week 5 that the graph plots the selected voltages from the circuit shown below. This week the circuit is an RC filter. You can also listen to various signals by selecting from the radio buttons to the right of the graph. This way you can both see and hear various signals. You can use the sliders to the right of the circuit to control various circuit and input signal parameters. (Note that you can get finer control of some of the slider values by clicking on the slider and using the arrow keys). Recall that the parameter \(V_{MAX}\) sets the maximum range on the graph. You can also select an input voltage type (e.g., sine wave, square wave, various types of music) using the drop down menu to the right of the graph. When describing AC signals, the voltages on the sliders refer to peak-to-peak values.</p>
+<p>1. To begin your first experiment, use the pull down menu to select a sine wave input. Then, adjust the sliders to these approximate baseline settings:
+<br />
+\(v_{IN} = 3V\), \(Frequency = 1000 Hz\), \(V_{BIAS} = 0V\), \(R = 1K\Omega\), \(v_C(0) = 0V\), \(C = 110nF\), \(V_{MAX} = 2V\).
+<br />
+Observe the waveforms for \(v_{IN}\) and \(v_C\) in the graph. You can also listen to \(v_{IN}\) and \(v_C\). You will observe that the amplitude of \(v_C\)  is slightly smaller than the amplitude of \(v_{IN}\).
+<br />
+Compute the break frequency of the filter circuit for the given circuit parameters. (Note that the break frequency is also called the cutoff frequency or the corner frequency).
+<br /> 
+Change the frequency of the sinusoid so that it is approximately 3 times the break frequency.
+<br />
+Observe the waveforms for \(v_{IN}\) and \(v_C\) in the graph. Also listen to \(v_{IN}\) and \(v_C\). Think about why the sinusoid at \(v_C\) is significantly more attenuated than the original 1KHz sinusoid.
+<br /> 
+Keeping the input signal unchanged,  observe the waveforms for \(v_{IN}\) and \(v_R\) in the graph. Also listen to \(v_{IN}\) and \(v_R\). Think about why  the sinusoid at \(v_R\) is significantly louder than the sinusoid at \(v_C\).</p>
+<p>2. Next, use the pull down menu to select a music signal of your choice. Adjust the sliders to the approximate baseline settings:
+<br />
+\(v_{IN} = 3V\), \(V_{BIAS} = 0V\), \(R = 1K\Omega\), \(v_C(0) = 0V\), \(C = 110nF\), \(V_{MAX} = 2V\).
+<br />
+Listen to the signals at \(v_{IN}\) and \(v_C\). Notice any difference between the signals?
+<br />
+Next, increase the capacitance value and observe the difference in the sound of \(v_{IN}\) and \(v_C\) as the capacitance increases. You should notice that the higher frequency components of \(v_C\) are attenuated as the capacitance is increased. 
+Convince yourself that when the signal is taken at \(v_C\), the circuit behaves like a low-pass filter.</p>
+<p>3. Re-adjust the sliders to the approximate baseline settings:
+<br />
+\(v_{IN} = 3V\), \(V_{BIAS} = 0V\), \(R = 1K\Omega\), \(v_C(0) = 0V\), \(C = 110nF\), \(V_{MAX} = 2V\).
+<br />
+Try to create a high-pass filter from the same circuit by taking the signal output across a different element and possibly changing some of the element values.
+</p>
+<endouttext />
+</section>
+
+<section class="tool-wrapper">
+  <div id="controlls-container">
+    <div class="graph-controls">
+      <div class="music-wrapper">
+      <select id="musicTypeSelect" size="1">
+        <option value = "0">Zero Input</option>
+        <option value = "1">Unit Impulse</option>
+        <option value = "2">Unit Step</option>
+        <option selected="selected" value = "3">Sine Wave</option>
+        <option value = "4">Square Wave</option>
+        <option value = "5">Classical Music</option>
+        <option value = "6">Folk Music</option>
+        <option value = "7">Jazz Music</option>
+        <option value = "8">Reggae Music</option>
+      </select>
+      <input id="playButton" type="button" value="Play" />
+      </div>
+
+      <div class="inputs-wrapper">
+        <div id="graph-output">
+          <p>Graph:</p>
+          <ul>
+            <li><label for="vinCheckbox"><input id="vinCheckbox" type="checkbox" checked="yes"/>v<sub>IN</sub></label></li>
+            <li><label for="vcCheckbox"><input id="vcCheckbox" type="checkbox" checked="yes"/>v<sub>C</sub></label> </li>
+            <li><label for="vrCheckbox"><input id="vrCheckbox" type="checkbox"/>v<sub>R</sub></label></li>
+          </ul>
+        </div>
+
+        <div id="graph-listen">
+          <p>Listen to:</p>
+          <ul>
+            <li><label for="vinRadioButton"><input id="vinRadioButton" type="radio" checked="yes" name="listenToWhat"/>v<sub>IN</sub></label></li>
+            <li><label for="vcRadioButton"><input id="vcRadioButton" type="radio" name="listenToWhat"/>v<sub>C</sub></label></li>
+            <li><label for="vrRadioButton"><input id="vrRadioButton" type="radio" name="listenToWhat"/>v<sub>R</sub></label></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <div class="schematic-sliders">
+      <div class="slider-label" id="fc">f<sub>C</sub> = </div>
+      <div class="slider-label" id="vin"></div>
+      <div class="slider" id="vinSlider"></div>
+      <div class="slider-label" id="freq"></div>
+      <div class="slider" id="freqSlider"></div>
+      <div class="slider-label" id="vbias"></div>
+      <div class="slider" id="vbiasSlider"></div>
+      <div class="slider-label" id="r"></div>
+      <div class="slider" id="rSlider"></div>
+      <div class="slider-label" id="vc0"></div>
+      <div class="slider" id="vc0Slider"></div>
+      <div class="slider-label" id="c"></div>
+      <div class="slider" id="cSlider"></div>
+      <div class="slider-label" id="vmax"></div>
+      <div class="slider" id="vmaxSlider"></div>
+    </div>
+  </div>
+  <div id="graph-container">
+    <div id="graphTabs">
+      <ul>
+        <li><a href="#time">Time</a></li>
+        <li><a href="#magnitude">Magnitude</a></li>
+        <li><a href="#phase">Phase</a></li>
+      </ul>	
+      <canvas id="time" width="500" height="500">Your browser must support the Canvas element and have JavaScript enabled to view this tool.</canvas>
+      <canvas id="magnitude" width="500" height="500">Your browser must support the Canvas element and have JavaScript enabled to view this tool.</canvas>
+      <canvas id="phase" width="500" height="500">Your browser must support the Canvas element and have JavaScript enabled to view this tool.</canvas>
+    </div>  
+
+    <canvas id="diag2" width="500" height="500">Your browser must support the Canvas element and have JavaScript enabled to view this tool.</canvas>
+  </div>
+
+</section>
diff --git a/common/test/data/full/html/sound_labs/series_rlc.html b/common/test/data/full/html/sound_labs/series_rlc.html
new file mode 100644
index 0000000000..4856d5c5ed
--- /dev/null
+++ b/common/test/data/full/html/sound_labs/series_rlc.html
@@ -0,0 +1,111 @@
+<script type="text/javascript" src="/static/courses/6002/js/sound_labs/sound.js"></script>
+<script type="text/javascript" src="/static/courses/6002/js/sound_labs/plotter.js"></script>
+<script type="text/javascript" src="/static/courses/6002/js/sound_labs/circuit.js"></script>
+<script type="text/javascript" src="/static/courses/6002/js/sound_labs/series_rlc.js"></script>
+<h2>SERIES RLC CIRCUIT WITH FREQUENCY RESPONSE EXPERIMENT</h2>
+<section class="problem">
+<startouttext />
+<p>\(I(s) =  \frac{1}{R + Ls + 1/Cs}V_{in}(s) = \frac{s/L}{s^2 + sR/L + 1/LC}V_{in}(s)\)</p>
+<p>\(I(s) = \frac{s/L}{s^2 + 2\alpha s + \omega_0^2}V_{in}(s)\)</p>
+<p>\(\omega_0 = \frac{1}{\sqrt{LC}} , \alpha = \frac{R}{2L}\)</p>
+<p>Band-Pass Filter:</p>
+<p>\(V_r(s) = RI(s) = \frac{sR/L}{s^2 + 2\alpha s + \omega_0^2}V_{in}(s) = \frac{2\alpha s}{s^2 + 2\alpha s + \omega_0^2}V_{in}(s) = \frac{2\alpha s}{(s-s_1)(s-s_2)}V_{in}(s)\)</p>
+<p>Gain magnitude: \(G_R = \frac{2\alpha w}{|j\omega - s_1||j\omega - s_2|}\)</p>
+<p>Phase: \(\Phi_R = \pi/2-\Phi(j\omega - s_1) -\Phi(j\omega - s_2)\)</p>
+<p>Low-Pass Filter:</p>
+<p>\(V_c(s) = I(s)/sC = \frac{1/LC}{s^2 + 2\alpha s + \omega_0^2}V_{in}(s) = \frac{\omega_0^2}{s^2 + 2\alpha s + \omega_0^2}V_{in}(s) = \frac{\omega_0^2}{(s-s_1)(s-s_2)}V_{in}(s)\)</p>
+<p>Gain magnitude: \(G_C = \frac{\omega_0^2}{|j\omega - s_1||j\omega - s_2|}\)</p>
+<p>Phase: \(\Phi_C = -\Phi(j\omega - s_1) -\Phi(j\omega - s_2)\)</p>
+<p>High-Pass Filter:</p>
+<p>\(V_l(s) = sLI(s) = \frac{s^2}{s^2 + 2\alpha s + \omega_0^2}V_{in}(s) = \frac{s^2}{(s-s_1)(s-s_2)}V_{in}(s)\)</p>
+<p>Gain magnitude: \(G_L = \frac{\omega^2}{|j\omega - s_1||j\omega - s_2|}\)</p>
+<p>Phase: \(\Phi_L = -\Phi(j\omega - s_1) -\Phi(j\omega - s_2)\)</p>
+<br />
+<p>Under-Damped: \(\alpha < \omega_0\)</p>
+<p>Complex roots: \(s_{1,2} = -\alpha \pm j\sqrt{\omega_0^2 - \alpha^2}\)</p>
+<p>Critically-Damped: \(\alpha = \omega_0\)</p>
+<p>Double real root: \(s_{1,2} = -\alpha\)</p>
+<p>Over-Damped: \(\alpha > \omega_0\)</p>
+<p>Real roots: \(s_{1,2} = -\alpha \pm\sqrt{\alpha^2 - \omega_0^2}\)</p>
+<endouttext />
+</section>
+
+<section class="tool-wrapper">
+  <div id="controlls-container">
+
+    <div class="graph-controls">
+      <div class="music-wrapper">
+      <select id="musicTypeSelect" size="1">
+        <option value = "0">Zero Input</option>
+        <option value = "1">Unit Impulse</option>
+        <option value = "2">Unit Step</option>
+        <option selected="selected" value = "3">Sine Wave</option>
+        <option value = "4">Square Wave</option>
+        <option value = "5">Classical Music</option>
+        <option value = "6">Folk Music</option>
+        <option value = "7">Jazz Music</option>
+        <option value = "8">Reggae Music</option>
+      </select>
+      <input id="playButton" type="button" value="Play" />
+      </div>
+
+      <div class="inputs-wrapper">
+        <div id="graph-output">
+          <p>Graph:</p>
+          <ul>
+            <li><label for="vinCheckbox"><input id="vinCheckbox" type="checkbox" checked="yes"/>v<sub>IN</sub></label></li>
+            <li><label for="vrCheckbox"><input id="vrCheckbox" type="checkbox"/>v<sub>R</sub></label></li>
+            <li><label for="vlCheckbox"><input id="vlCheckbox" type="checkbox"/>v<sub>L</sub></label></li>
+            <li><label for="vcCheckbox"><input id="vcCheckbox" type="checkbox" checked="yes"/>v<sub>C</sub></label> </li>
+          </ul>
+        </div>
+
+        <div id="graph-listen">
+          <p>Listen to:</p>
+          <ul>
+            <li><label for="vinRadioButton"><input id="vinRadioButton" type="radio" checked="yes" name="listenToWhat"/>v<sub>IN</sub></label></li>
+            <li><label for="vrRadioButton"><input id="vrRadioButton" type="radio" name="listenToWhat"/>v<sub>R</sub></label></li>
+            <li><label for="vlRadioButton"><input id="vlRadioButton" type="radio" name="listenToWhat"/>v<sub>L</sub></label></li>
+            <li><label for="vcRadioButton"><input id="vcRadioButton" type="radio" name="listenToWhat"/>v<sub>C</sub></label></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <div class="schematic-sliders">
+      <div class="slider-label" id="vin"></div>
+      <div class="slider" id="vinSlider"></div>
+      <div class="slider-label" id="freq"></div>
+      <div class="slider" id="freqSlider"></div>
+      <div class="slider-label" id="vbias"></div>
+      <div class="slider" id="vbiasSlider"></div>
+      <div class="slider-label" id="r"></div>
+      <div class="slider" id="rSlider"></div>
+      <div class="slider-label" id="l"></div>
+      <div class="slider" id="lSlider"></div>
+      <div class="slider-label" id="c"></div>
+      <div class="slider" id="cSlider"></div>
+      <div class="slider-label" id="vc0"></div>
+      <div class="slider" id="vc0Slider"></div>
+      <div class="slider-label" id="i0"></div>
+      <div class="slider" id="i0Slider"></div>
+      <div class="slider-label" id="vmax"></div>
+      <div class="slider" id="vmaxSlider"></div>
+    </div>
+  </div>
+  <div id="graph-container">
+    <div id="graphTabs">
+      <ul>
+        <li><a href="#time">Time</a></li>
+        <li><a href="#magnitude">Magnitude</a></li>
+        <li><a href="#phase">Phase</a></li>
+      </ul>	
+      <canvas id="time" width="500" height="500">Your browser must support the Canvas element and have JavaScript enabled to view this tool.</canvas>
+      <canvas id="magnitude" width="500" height="500">Your browser must support the Canvas element and have JavaScript enabled to view this tool.</canvas>
+      <canvas id="phase" width="500" height="500">Your browser must support the Canvas element and have JavaScript enabled to view this tool.</canvas>
+    </div>  
+
+    <canvas id="diag3" width="500" height="500">Your browser must support the Canvas element and have JavaScript enabled to view this tool.</canvas>
+
+  </div>
+
+</section>
diff --git a/common/test/data/full/html/test.html b/common/test/data/full/html/test.html
new file mode 100644
index 0000000000..ba35cf08e8
--- /dev/null
+++ b/common/test/data/full/html/test.html
@@ -0,0 +1 @@
+Test file for HTML in data
diff --git a/common/test/data/full/html/units_hint.html b/common/test/data/full/html/units_hint.html
new file mode 100644
index 0000000000..02648b31e7
--- /dev/null
+++ b/common/test/data/full/html/units_hint.html
@@ -0,0 +1,4 @@
+Hint
+<br/><br/>
+Be careful of units here.  Make sure you notice multipliers such
+as u, k, m, M.
diff --git a/common/test/data/full/info/guest_handouts.html b/common/test/data/full/info/guest_handouts.html
new file mode 100644
index 0000000000..27827b9660
--- /dev/null
+++ b/common/test/data/full/info/guest_handouts.html
@@ -0,0 +1,119 @@
+<header>
+  <h1> Handouts </h1>
+</header>
+
+<ol class="treeview-handoutsnav">
+  <li> <a href="/static/handouts/syllabus.pdf"> Syllabus </a></li>
+  <li> <a href="/static/handouts/calendar.pdf"> 6.002x At-A-Glance (calendar) </a></li>
+  <li> <a href="/wiki/view/StaffListing"> Staff Listing </a></li>
+  <li> <a href="/wiki/view/MathReview"> Math Review </a></li>
+  <li> <a href="/static/handouts/schematic_tutorial.pdf"> Using the Interactive Laboratory </a></li>
+  <li> <a href="/static/handouts/SystemTools.pdf"> How to Use the System</a></li>
+  <li> <a href="/wiki/view/QuestionAnswerFAQ"> How to Use the Question/Answer forum </a></li>
+
+  <li>
+    <h4>Lecture Slides</h4>
+    <ul>
+      <li>
+        <h3>S1 - Administrivia and Circuit Elements</h3>
+	<p><a href="/static/handouts/6002-L1-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L1-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+
+      <li>
+        <h3>S2 - Circuit Analysis Toolchest</h3>
+        <p><a href="/static/handouts/6002-L2-oei12-gaps.pdf">Clean </a>  <a href="/static/handouts/6002-L2-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+
+      <li>
+        <h3>S3 - Linearity and Superposition</h3>
+        <p><a href="/static/handouts/6002-L3-oei12-gaps.pdf">Clean </a>  <a href="/static/handouts/6002-L3-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+
+      <li>
+        <h3>S4 - Static Discipline and Boolean Logic</h3>
+        <p><a href="/static/handouts/6002-L4-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L4-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S5 - Inside the Gate</h3>
+        <p><a href="/static/handouts/6002-L5-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L5-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S6 -  Circuits with Nonlinear Elements</h3>
+        <p><a href="/static/handouts/6002-L6-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L6-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S7 - Incremental Analysis </h3>
+        <p><a href="/static/handouts/6002-L7-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L7-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S8 - Dependent Sources and Amplifiers </h3>
+        <p><a href="/static/handouts/6002-L8-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L8-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S9 - MOSFETs: Large Signals</h3>
+        <p><a href="/static/handouts/6002-L9-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L9-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S10 - MOSFET Amplifiers: Small Signal Model</h3>
+        <p><a href="/static/handouts/6002-L10-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L10-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S11 - Small-Signal Circuit Models</h3>
+        <p><a href="/static/handouts/6002-L11-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L11-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S12 - Capacitors and First-Order Circuits</h3>
+        <p><a href="/static/handouts/6002-L12-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L12-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S13 - Inductors and First-Order Circuits</h3>
+        <p><a href="/static/handouts/6002-L13-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L13-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S14 - Speed of Digital Circuits</h3>
+        <p><a href="/static/handouts/6002-L14-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L14-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S15 - Ramps, Steps, and Impulses</h3>
+        <p><a href="/static/handouts/6002-L15-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L15-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S16 - State and Memory</h3>
+        <p><a href="/static/handouts/6002-L16-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L16-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S17 - Undamped Second-Order Systems</h3>
+        <p><a href="/static/handouts/6002-L17-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L17-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S18 - Damped Second-Order Systems</h3>
+        <p><a href="/static/handouts/6002-L18-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L18-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S19 - Sinusoidal Steady State</h3>
+        <p><a href="/static/handouts/6002-L19-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L19-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S20 - The Impedance Model</h3>
+        <p><a href="/static/handouts/6002-L20-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L20-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S21 - Filters</h3>
+        <p><a href="/static/handouts/6002-L21-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L21-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S22 - Time Domain Versus Frequency Domain Analysis</h3>
+        <p><a href="/static/handouts/6002-L22-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L22-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S23 - The Operational Amplifier Abstraction</h3>
+        <p><a href="/static/handouts/6002-L23-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L23-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S24 - Operational Amplifier Circuits</h3>
+        <p><a href="/static/handouts/6002-L24-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L24-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+    </ul>
+  </li>
+
+</ol>
diff --git a/common/test/data/full/info/guest_updates.html b/common/test/data/full/info/guest_updates.html
new file mode 100644
index 0000000000..c70c6e56ec
--- /dev/null
+++ b/common/test/data/full/info/guest_updates.html
@@ -0,0 +1,8 @@
+<h1> Updates </h1>
+<ol>
+<li>
+<section class="update-description">
+Welcome to 6002x. Please look around.
+</section>
+</li>
+</ol>
diff --git a/common/test/data/full/info/handouts.html b/common/test/data/full/info/handouts.html
new file mode 100644
index 0000000000..e13dad43b1
--- /dev/null
+++ b/common/test/data/full/info/handouts.html
@@ -0,0 +1,169 @@
+<header>
+  <h1> Handouts </h1>
+</header>
+
+<ol class="treeview-handoutsnav">
+  <li> <a href="/static/handouts/syllabus.pdf"> Syllabus </a></li>
+  <li> <a href="/static/handouts/calendar.pdf"> 6.002x At-A-Glance (calendar) </a></li>
+  <li> <a href="/wiki/view/StaffListing"> Staff Listing </a></li>
+  <li> <a href="/wiki/view/MathReview"> Math Review </a></li>
+  <li> <a href="/static/handouts/schematic_tutorial.pdf"> Using the Interactive Laboratory </a></li>
+  <li> <a href="/static/handouts/SystemTools.pdf"> How to Use the System</a></li>
+  <li> <a href="/wiki/view/QuestionAnswerFAQ"> How to Use the Question/Answer forum </a></li>
+
+  <li>
+    <h4>Lecture Slides</h4>
+    <ul>
+      <li>
+        <h3>S1 - Administrivia and Circuit Elements</h3>
+	<p><a href="/static/handouts/6002-L1-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L1-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+
+      <li>
+        <h3>S2 - Circuit Analysis Toolchest</h3>
+        <p><a href="/static/handouts/6002-L2-oei12-gaps.pdf">Clean </a>  <a href="/static/handouts/6002-L2-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+
+      <li>
+        <h3>S3 - Linearity and Superposition</h3>
+        <p><a href="/static/handouts/6002-L3-oei12-gaps.pdf">Clean </a>  <a href="/static/handouts/6002-L3-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+
+      <li>
+        <h3>S4 - Static Discipline and Boolean Logic</h3>
+        <p><a href="/static/handouts/6002-L4-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L4-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S5 - Inside the Gate</h3>
+        <p><a href="/static/handouts/6002-L5-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L5-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S6 -  Circuits with Nonlinear Elements</h3>
+        <p><a href="/static/handouts/6002-L6-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L6-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S7 - Incremental Analysis </h3>
+        <p><a href="/static/handouts/6002-L7-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L7-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S8 - Dependent Sources and Amplifiers </h3>
+        <p><a href="/static/handouts/6002-L8-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L8-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S9 - MOSFETs: Large Signals</h3>
+        <p><a href="/static/handouts/6002-L9-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L9-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S10 - MOSFET Amplifiers: Small Signal Model</h3>
+        <p><a href="/static/handouts/6002-L10-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L10-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S11 - Small-Signal Circuit Models</h3>
+        <p><a href="/static/handouts/6002-L11-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L11-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S12 - Capacitors and First-Order Circuits</h3>
+        <p><a href="/static/handouts/6002-L12-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L12-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S13 - Inductors and First-Order Circuits</h3>
+        <p><a href="/static/handouts/6002-L13-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L13-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S14 - Speed of Digital Circuits</h3>
+        <p><a href="/static/handouts/6002-L14-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L14-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S15 - Ramps, Steps, and Impulses</h3>
+        <p><a href="/static/handouts/6002-L15-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L15-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S16 - State and Memory</h3>
+        <p><a href="/static/handouts/6002-L16-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L16-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S17 - Undamped Second-Order Systems</h3>
+        <p><a href="/static/handouts/6002-L17-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L17-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S18 - Damped Second-Order Systems</h3>
+        <p><a href="/static/handouts/6002-L18-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L18-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S19 - Sinusoidal Steady State</h3>
+        <p><a href="/static/handouts/6002-L19-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L19-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S20 - The Impedance Model</h3>
+        <p><a href="/static/handouts/6002-L20-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L20-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S21 - Filters</h3>
+        <p><a href="/static/handouts/6002-L21-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L21-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+      <li>
+        <h3>S22 - Time Domain Versus Frequency Domain Analysis</h3>
+        <p><a href="/static/handouts/6002-L22-oei12-gaps.pdf">Clean </a> <a href="/static/handouts/6002-L22-oei12-gaps-annotated.pdf">Annotated</a></p>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <h4>Weekly solutions</h4>
+
+    <ul>
+      <li>
+        <h3>Week 1 Solutions</h3>
+        <p><a href="/static/handouts/solutions/Week1Ex.pdf">Exercises </a> <a href="/static/handouts/solutions/Week1HW.pdf">Homework</a> <a href="/static/handouts/solutions/Week1Lab.pdf">Lab</a></p> 
+      </li>
+
+      <li>
+        <h3>Week 2 Solutions</h3>
+        <p><a href="/static/handouts/solutions/Week2Ex.pdf">Exercises </a> <a href="/static/handouts/solutions/Week2HW.pdf">Homework</a> <a href="/static/handouts/solutions/Week2Lab2B.pdf">Lab</a></p> 
+      </li>
+
+      <li>
+        <h3>Week 3 Solutions</h3>
+        <p><a href="/static/handouts/solutions/Week3Ex.pdf">Exercises </a> <a href="/static/handouts/solutions/Week3HW.pdf">Homework</a> <a href="/static/handouts/solutions/Week3Lab.pdf">Lab</a></p>
+      </li>
+
+      <li>
+        <h3>Week 4 Solutions</h3>
+        <p><a href="/static/handouts/solutions/Week4Ex.pdf">Exercises </a> <a href="/static/handouts/solutions/Week4HW.pdf">Homework</a> <a href="/static/handouts/solutions/Week4Lab.pdf">Lab</a></p>
+      </li>
+
+      <li>
+        <h3>Week 5 Solutions</h3>
+        <p><a href="/static/handouts/solutions/Week5Ex.pdf">Exercises </a><a href="/static/handouts/solutions/Week5HW.pdf">Homework</a> <a href="/static/handouts/solutions/Week5Lab.pdf">Lab</a></p>
+      </li>
+  
+      <li>
+        <h3>Week 6 Solutions</h3>
+        <p><a href="/static/handouts/solutions/Week6Ex.pdf">Exercises </a><a href="/static/handouts/solutions/Week6HW.pdf">Homework</a> <a href="/static/handouts/solutions/Week6Lab.pdf">Lab</a></p>
+        </li>
+      <li>
+        <h3>Week 7 Solutions</h3>
+        <p><a href="/static/handouts/solutions/Week7Ex.pdf">Exercises </a><a href="/static/handouts/solutions/Week7HW.pdf">Homework</a> <a href="/static/handouts/solutions/Week7Lab.pdf">Lab</a></p>
+        </li>
+      <li>
+        <h3>Week 8 Solutions</h3>
+        <p><a href="/static/handouts/solutions/Week8Ex.pdf">Exercises </a><a href="/static/handouts/solutions/Week8HW.pdf">Homework</a> <a href="/static/handouts/solutions/Week8Lab.pdf">Lab</a></p>
+      <li>
+        <h3>Week 9 Solutions</h3>
+        <p><a href="/static/handouts/solutions/Week9Ex.pdf">Exercises </a></p>
+        </li>
+      <li>
+        <h3>Week 10 Solutions</h3>
+        <p><a href="/static/handouts/solutions/Week10Ex.pdf">Exercises </a></p>
+        </li>
+      <li>
+        <h3>Week 11 Solutions</h3>
+        <p><a href="/static/handouts/solutions/Week11Ex.pdf">Exercises </a></p>
+        </li>
+  </ul>
+  </li>
+  <li>
+    <h3>Midterm Review Problems </h3>
+    <p><a href="/static/handouts/6002x-MidTermReview-S2012-clean.pdf">Clean </a> <a href="/static/handouts/6002x-MidTermReview-S2012.pdf">With Solutions</a></p>
+  </li>
+  <li> <a href="/static/handouts/solutions/Midterm.pdf"> Midterm Solutions </a></li>
+</ol>
diff --git a/common/test/data/full/info/updates.html b/common/test/data/full/info/updates.html
new file mode 100644
index 0000000000..6531ed417d
--- /dev/null
+++ b/common/test/data/full/info/updates.html
@@ -0,0 +1,194 @@
+<h1> Updates </h1>
+<ol>
+<li> <h2>May 7</h2>
+<section class="update-description">
+<ul>
+<li> There is a review of complex numbers available in the Week 10 tutorials, provided by Prof. Jeremy Orloff of the MIT math department. A link has also been provided in the <a href="https://6002x.mitx.mit.edu/wiki/view/MathReview">Math Review</a> section of the wiki. </li>
+</ul>
+</li>
+<li> <h2>May 2 </h2>
+<section class="update-description">
+<ul>
+<li> We have opened the show-answer button on the midterm. </li>
+<li> There was a four hour outage in posting ability on the discussion board Monday night. It has been fixed. We apologise for the inconvenience.</li>
+</ul>
+</li>
+<li> <h2>April 30 </h2>
+<section class="update-description">
+<ul>
+<li> The midterm closed early this morning. Staff solutions will be available next week, but you are encouraged to discuss the problems that you thought were particularly hard on the discussion forum. Congratulations on making it halfway through the course! </li>
+</ul>
+</li>
+<li> <h2>April 25 </h2>
+<section class="update-description">
+<ul>
+<li> The midterm is now available. It will close after midnight on Sunday night has passed in all timezones. Specifically, it will close 12:00pm (noon) GMT, April 30th. It covers the material in weeks one through six. Good Luck!</li>
+<li> Absolutely no collaboration is allowed on the midterm. Prof. Agarwal has provided a clarification of the collaboration policy on the <a href="https://6002x.mitx.mit.edu/discussion/question/55202/collaboration-guidelines"> discussion forum. </a> </li>
+</ul>
+</li>
+<li> <h2>April 23 </h2>
+<section class="update-description">
+<ul>
+<li> Reminder: the midterm will be released on Wednesday and close on Sunday. Please see the April 3 and April 9 announcements for more logistical details.</li> 
+<li> Some students have put together extra study materials for the quiz. There are <a href="https://6002x.mitx.mit.edu/discussion/question/45083/how-about-a-course-flashcard-system-as-a-study-aid"> flashcards </a> and <a href="https://6002x.mitx.mit.edu/discussion/question/43696/summaries-for-lectures-1-to-12-more-added-april-19"> summaries </a></li>
+<li>The grading programs for the sequence 15 exercises have been fixed. Thanks to all of the participants in <a href="https://6002x.mitx.mit.edu/discussion/question/49561/midterm-warning-no-spaces-allowed-in-answer-s15e1"> this thread </a> for pointing out their difficulties. </li>
+</ul>
+</li>
+<li> <h2>April 23 </h2>
+<section class="update-description">
+<ul>
+<li>There was a bug that caused the Week 6 homework and lab to close early in some timezones. That bug has been fixed, and the due date for Week 6 assignments has been moved to Tuesday night at midnight. We apologize for the inconvenience.</li>
+<li>In order to help people study for the midterm this week, we will release the Week 6 solutions on their normal release schedule. You will be able to see them later today. Please do not look at the solutions before submitting your Week 6 assignments. We are relying on your honesty and adherence to the Honor Code in this matter.</li>
+</ul>
+</li>
+<li> <h2>April 16 </h2>
+<section class="update-description">
+<ul>
+<li>Weeks 6 and 9 will require more mathematical background than the rest of the course. Please bear with us for those two weeks. This is necessary to understanding the roots of the more intuitive tools that will be developed over the remainder of the course for understanding dynamic systems. </li>
+</ul>
+</li>
+<li> <h2>April 9 </h2>
+<section class="update-description">
+<ul>
+<li>The wiki now saves circuits as part of the revision history. The format for entering circuits into the wiki is now the keyword "circuit-schematic:". There will be a few minutes of downtime as old circuits are converted into the new format.</li>
+<li> Although you will have 24 hours to complete the midterm, we do not anticipate that the time limit will be the limiting factor in completing the exam. We hope that it will only take you a couple of hours to finish.</li>
+<li> In order to clear up some confusion in the format the exam will take, we have posted <a href="/section/MidtermFormatExamples/"> two example exam questions</a>. </li>
+<li> At least one of the questions on the exam will be strongly inspired by a question from the homeworks, so it would be worth your time to make sure that you understand all of the homework solutions.  </li>
+<li> We have released a review packet for the midterm,  <a href="/static/handouts/6002x-MidTermReview-S2012-clean.pdf">without solutions </a>, and  <a href="/static/handouts/6002x-MidTermReview-S2012.pdf">with solutions</a>. Note that the exam covers material from weeks one through six. If you have not yet finished going through the material for those weeks, we would encourage going through learning the material in the format that it was initially published before using these review resources.</li>
+</ul>
+</li>
+<li> <h2>April 3 </h2>
+<section class="update-description">
+<ul>
+<li> The exam will be released in the courseware section on Wednesday, April 25th. It will be closed at the end of Sunday, April 29th. See the chart below for release and close times in selected time zones. The exam will consist of two elements in sequence: a cover sheet and the exam itself. Once you click past the cover sheet and open the exam, <strong>you will have twenty-four hours to complete it.</strong> Please be careful to keep track of your own time, as we have no mechanism to warn you when your time is about to expire.
+<br/>
+<br/>
+<table>
+<tr><td>release</td><td>close</td></tr>
+<tr><td>10:00pm GMT April 25th   &nbsp</td> <td>12:00pm GMT April 30th</td></tr>
+<tr><td>5:00pm EST April 25th</td> <td>7:00am EST April 30th</td></tr>
+<tr><td>2:00pm PST April 25th</td> <td>4:00am PST April 30th</td></tr>
+<tr><td>3:30am IST April 26th</td> <td>5:30pm IST April 30th</td></tr>
+</table>
+</li>
+<li> The format of the exam will be very similar to the homeworks, with one exception: you will have a limited number of opportunities to check your answers. You will only be able to check your answers three times before you will no longer be able change your response.</li>
+<li> There was a short period this morning when the grade plot was showing percentages incorrectly due to a bug in the display code. We apologize for any inconvenience. If you run into any other display issues, please try reloading your browser.</li>
+</ul>
+</section>
+<li> <h2>April 2 </h2>
+<section class="update-description">
+<ul>
+<li>We will soon start using differential equations in the course material. We have posted a little bit of <a href="/wiki/view/MathReview"> math review </a> on the wiki for people who need a refresher.</li>
+<li>Please note that we are unable to change the due dates of the assignments for any person for any reason. If something unexpected comes up, we ask that you use one of your allocated two dropped homeworks or two dropped labs.</li>
+<li>The third week's assignments have been due, so new students who have registered late will not have enough dropped assignments allocated to them to earn all of the points in the course. New students are encouraged to use the course material for their own enrichment, to earn all of the points still available to be earned, or wait until the next offering </li>
+</ul>
+</section>
+
+<li> <h2> March 26 </h2>
+<section class="update-description">
+<ul>
+<li> Thomas Loch wrote a number of <a href="http://userscripts.org/tags/mitx">scripts</a> that offer
+enhancements to MITx. These scripts need a Firefox plug-in, 
+<a href="https://addons.mozilla.org/en-US/firefox/addon/greasemonkey/">GreaseMonkey</a>, in order to work. 
+They provide functionality like quality and volume selection for
+videos, integration with our IRC server, and automatic advance
+of lecture sequences when a video finishes playing. Note that some sequences
+ -- such as this week's tutorials -- rely on the break between videos.</li>
+<li> There's an unofficial <a href="http://irc.mitx.mit.edu/webchat/">
+web client </a> for the IRC channel now available. Please pick a
+username better than the default. </li>
+<li> There is a lab experiment this week that requires a recent
+version of Chrome or Firefox to work. This is the first content that
+will not work with IE (it processes sound in the browser in a way which
+is not possible with IE).
+</ul>
+</section>
+<li> <h2> March 19th</h2>
+<section class="update-description">
+<ul>
+<li> The last update originally listed the wrong name for the creater of the course downloader. Josiah Yan wrote the utility. </li>
+</ul>
+</section>
+</li>
+<li> <h2>March 15th</h2>
+<section class="update-description">
+<ul>
+<li>We have posted solutions to the ungraded lecture exercises. Solutions
+to graded assessments will be available after the deadline.</li>
+<li> Several
+students asked about how to submit homeworks -- simply hit "check" --
+your problems are automatically checked, saved, and graded.</li>
+</ul>
+<p> As
+some <a href="http://en.wikipedia.org/wiki/Internet_Relay_Chat">IRC</a>
+users already know, a couple of 6.002x students have put together
+tools that have been requested in the discussion forums: </p>
+<ul><li> Jeff Kent created a scrolling textbook viewer. We posted his tool <a href='/static/contrib/xbook.html'> here </a></li>
+<li> Josiah Yan posted a downloader for the course on his <a href='https://github.com/terriblybored/MITx-6002x-Video-Downloader'> github account. </a> </li>
+</ul>
+If you haven't visited the IRC channel
+(irc.mitx.mit.edu, channel
+#6002), feel free to download an IRC client, and check it out. Good place
+to meet other students, and occasionally, the devs.
+</section>
+</li>
+<li>
+<h2> March 12th </h2>
+<section class="update-description">
+Due to student feedback in the forums, we have changed due dates from
+the beginning of the weekend to the end of the weekend. Enjoy the
+extra time to complete assignments! Otherwise, we now have better
+error messages for incorrect inputs, and a slew of other minor
+fixes. If you experience any problems after the update, please try
+holding shift and hitting the reload button in your browser.
+</section>
+</li>
+<li>
+<h2> March 8th </h2>
+<section class="update-description">
+It is great to see all the activity in the discussion forum! We recently updated <a href='/wiki/view/QuestionAnswerFAQ'> <strong>the wiki </strong> </a> with more detailed guidance on how to get help from the course staff. We encourage you to check out those guidelines in order to get the most benefit from that resource. 
+</section>
+</li>
+<li>
+    <h2> March 6th</h2>
+    <section class="update-description">
+      <p> Several key issues were reported: </p>
+
+      <ul> 
+	<li> Tolerance on S1E2 was set a bit too tight -- many
+      solutions (including our own -- we printed more digits at the
+      time these were tested) were marked wrong since we required
+      many digits. This is now corrected.
+	<li> Several students reported (correctly) that our error
+      messages are unclear. A dictionary: 
+	  <div style="margin-left:50px">
+	  <ul> <li> &quot;Unknown error&quot; -- this occurs if you
+      submit non-numeric answers to numeric problems. This most
+      commonly occurs if a comma is used instead of a decimal point,
+      or units are included. 
+	      <li> &quot;Syntax error&quot; occurs when you type in a
+      formula with an error. E.g. (((
+		<li> &quot;Undefined&quot; means you used an invalid
+      variable in your answer. E.g. if you used 'z' when taking the
+      derivative of e^x (instead of just 'e' and 'x'). 
+	      </ul>
+	  </div>
+	<li> Some of the documentation refers to a &quot;save&quot;
+	button. This was eliminated based on user tests prior to
+	release, but we still had references to it in our
+	documentation. Please use the check button instead, which both
+	checks your answers and saves.
+      </ul>
+    </section>
+</li>
+<li>
+    <h2> March 5th</h2>
+<section class="update-description">
+Welcome to 6.002x!
+ 
+You can find a video tutorial for the system tools  <a href="/courseware/6.002_Spring_2012/Overview/System_Usage_Sequence/">"System Usage Sequence"</a> in the Overview section of the courseware. There are also several system usage handouts in the handouts section on the side, including the "6.002x At-a-Glance (Calendar)". The System Usage video sequence walks you through the various features of the online learning platform, and the 6.002x At-a-Glance handout provides a detailed week-by-week schedule of course topics, textbook readings,  and deadlines. After you familiarize yourself with the various features of the MITx platform, you can jump right into the coursework by working on "Administrivia and Circuit Elements",  the first  Lecture Sequence in Week 1.
+ 
+Enjoy the course!
+    </section>
+</li>
+</ol>
diff --git a/common/test/data/full/js/cktsim.js b/common/test/data/full/js/cktsim.js
new file mode 100755
index 0000000000..225c528c7a
--- /dev/null
+++ b/common/test/data/full/js/cktsim.js
@@ -0,0 +1,1959 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//  Circuit simulator
+//
+//////////////////////////////////////////////////////////////////////////////
+
+// Copyright (C) 2011 Massachusetts Institute of Technology
+
+
+// create a circuit for simulation using "new cktsim.Circuit()"
+
+// for modified nodal analysis (MNA) stamps see
+// http://www.analog-electronics.eu/analog-electronics/modified-nodal-analysis/modified-nodal-analysis.xhtml
+
+cktsim = (function() {
+    
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Circuit
+	//
+	//////////////////////////////////////////////////////////////////////////////
+
+	// types of "nodes" in the linear system
+	T_VOLTAGE = 0;
+	T_CURRENT = 1;
+
+        v_newt_lim = 0.3;   // Voltage limited Newton great for Mos/diodes
+	v_abstol = 1e-6;	// Absolute voltage error tolerance
+	i_abstol = 1e-12;	// Absolute current error tolerance
+        eps = 1.0e-12;           // A very small number compared to one.
+	dc_max_iters = 1000;	// max iterations before giving pu
+	max_tran_iters = 20;	// max iterations before giving up
+	time_step_increase_factor = 2.0;  // How much can lte let timestep grow.
+	lte_step_decrease_factor = 8;    // Limit lte one-iter timestep shrink.
+	nr_step_decrease_factor = 4;     // Newton failure timestep shink.
+	reltol = 0.0001;		// Relative tol to max observed value
+        lterel = 10;             // LTE/Newton tolerance ratio (> 10!)
+        res_check_abs = Math.sqrt(i_abstol); // Loose Newton residue check
+        res_check_rel = Math.sqrt(reltol); // Loose Newton residue check
+
+	function Circuit() {
+	    this.node_map = new Array();
+	    this.ntypes = [];
+	    this.initial_conditions = [];  // ic's for each element
+
+	    this.devices = [];  // list of devices
+	    this.device_map = new Array();  // map name -> device
+	    this.voltage_sources = [];  // list of voltage sources
+	    this.current_sources = [];  // list of current sources
+
+	    this.finalized = false;
+	    this.diddc = false;
+	    this.node_index = -1;
+
+	    this.periods = 1
+	}
+
+	// index of ground node
+	Circuit.prototype.gnd_node = function() {
+	    return -1;
+	}
+
+	// allocate a new node index
+	Circuit.prototype.node = function(name,ntype,ic) {
+	    this.node_index += 1;
+	    if (name) this.node_map[name] = this.node_index;
+	    this.ntypes.push(ntype);
+	    this.initial_conditions.push(ic);
+	    return this.node_index;
+	}
+
+	// call to finalize the circuit in preparation for simulation
+	Circuit.prototype.finalize = function() {
+	    if (!this.finalized) {
+		this.finalized = true;
+		this.N = this.node_index + 1;  // number of nodes
+
+		// give each device a chance to finalize itself
+		for (var i = this.devices.length - 1; i >= 0; --i)
+		    this.devices[i].finalize(this);
+
+		// set up augmented matrix and various temp vectors
+		this.matrix = mat_make(this.N, this.N+1);
+		this.Gl = mat_make(this.N, this.N);  // Matrix for linear conductances
+		this.G = mat_make(this.N, this.N);  // Complete conductance matrix
+		this.C = mat_make(this.N, this.N);  // Matrix for linear L's and C's
+
+		this.soln_max = new Array(this.N);   // max abs value seen for each unknown
+		this.abstol = new Array(this.N);
+		this.solution = new Array(this.N);
+		this.rhs = new Array(this.N);
+		for (var i = this.N - 1; i >= 0; --i) {	    
+		    this.soln_max[i] = 0.0;
+		    this.abstol[i] = this.ntypes[i] == T_VOLTAGE ? v_abstol : i_abstol;
+		    this.solution[i] = 0.0;
+		    this.rhs[i] = 0.0;
+		}
+
+		// Load up the linear elements once and for all
+		for (var i = this.devices.length - 1; i >= 0; --i) {
+		    this.devices[i].load_linear(this)
+		}
+
+		// Check for voltage source loops. 
+		n_vsrc = this.voltage_sources.length;
+		if (n_vsrc > 0) { // At least one voltage source
+		    var GV = mat_make(n_vsrc, this.N);  // Loop check
+		    for (var i = n_vsrc - 1; i >= 0; --i) {
+			var branch = this.voltage_sources[i].branch;
+			for (var j = this.N - 1; j >= 0; j--)
+			    GV[i][j] = this.Gl[branch][j];
+		    }
+		    var rGV = mat_rank(GV);
+		    if (rGV < n_vsrc) {
+			alert('Warning!!! Circuit has a voltage source loop or a source or current probe shorted by a wire, please remove the source or the wire causing the short.');
+			alert('Warning!!! Simulator might produce meaningless results or no result with illegal circuits.');
+			return false;		
+		    }
+		}
+	    }
+	    return true;		
+	}
+
+	// load circuit from JSON netlist (see schematic.js)
+	Circuit.prototype.load_netlist = function(netlist) {
+	    // set up mapping for all ground connections
+	    for (var i = netlist.length - 1; i >= 0; --i) {
+		var component = netlist[i];
+		var type = component[0];
+		if (type == 'g') {
+		    var connections = component[3];
+		    this.node_map[connections[0]] = this.gnd_node();
+		}
+	    }
+
+	    // process each component in the JSON netlist (see schematic.js for format)
+	    var found_ground = false;
+	    for (var i = netlist.length - 1; i >= 0; --i) {
+		var component = netlist[i];
+		var type = component[0];
+
+		// ignore wires, ground connections, scope probes and view info
+		if (type == 'view' || type == 'w' || type == 'g' || type == 's' || type == 'L') {
+		    continue;
+		}
+
+		var properties = component[2];
+		var name = properties['name'];
+		if (name==undefined || name=='')
+		    name = '_' + properties['_json_'].toString();
+
+		// convert node names to circuit indicies
+		var connections = component[3];
+		for (var j = connections.length - 1; j >= 0; --j) {
+		    var node = connections[j];
+		    var index = this.node_map[node];
+		    if (index == undefined) index = this.node(node,T_VOLTAGE);
+		    else if (index == this.gnd_node()) found_ground = true;
+		    connections[j] = index;
+		}
+
+		// process the component
+		if (type == 'r')	// resistor
+		    this.r(connections[0],connections[1],properties['r'],name);
+		else if (type == 'd')	// diode
+		    this.d(connections[0],connections[1],properties['area'],properties['type'],name);
+		else if (type == 'c')   // capacitor
+		    this.c(connections[0],connections[1],properties['c'],name);
+		else if (type == 'l')	// inductor
+		    this.l(connections[0],connections[1],properties['l'],name);
+		else if (type == 'v') 	// voltage source
+		    this.v(connections[0],connections[1],properties['value'],name);
+		else if (type == 'i') 	// current source
+		    this.i(connections[0],connections[1],properties['value'],name);
+		else if (type == 'o') 	// op amp
+		    this.opamp(connections[0],connections[1],connections[2],connections[3],properties['A'],name);
+		else if (type == 'n') 	// n fet
+		    this.n(connections[0],connections[1],connections[2],properties['W/L'],name);
+		else if (type == 'p') 	// p fet
+		    this.p(connections[0],connections[1],connections[2],properties['W/L'],name);
+		else if (type == 'a') 	// current probe == 0-volt voltage source
+		    this.v(connections[0],connections[1],'0',name);
+	    }
+
+	    if (!found_ground) { // No ground on schematic
+		alert('Please make at least one connection to ground  (inverted T symbol)');
+		return false;
+	    }
+	    return true;
+	    
+	}
+
+	// if converges: updates this.solution, this.soln_max, returns iter count
+	// otherwise: return undefined and set this.problem_node
+	// Load should compute -f and df/dx (note the sign pattern!)
+        Circuit.prototype.find_solution = function(load,maxiters) {
+	    var soln = this.solution;
+	    var rhs = this.rhs;
+	    var d_sol = new Array();
+	    var abssum_compare;
+	    var converged,abssum_old=0, abssum_rhs;
+	    var use_limiting = false;
+	    var down_count = 0;
+
+	    // iteratively solve until values convere or iteration limit exceeded
+	    for (var iter = 0; iter < maxiters; iter++) {
+		// set up equations
+		load(this,soln,rhs);
+
+		// Compute norm of rhs, assume variables of v type go with eqns of i type
+		abssum_rhs = 0;
+		for (var i = this.N - 1; i >= 0; --i)
+		    if (this.ntypes[i] == T_VOLTAGE)
+			abssum_rhs += Math.abs(rhs[i]);
+
+		if ((iter > 0) && (use_limiting == false) && (abssum_old < abssum_rhs)) {  
+		    // Old rhsnorm was better, undo last iter and turn on limiting
+		    for (var i = this.N - 1; i >= 0; --i)
+			soln[i] -= d_sol[i];
+		    iter -= 1;
+		    use_limiting = true;
+		}
+	        else {  // Compute the Newton delta
+		    //d_sol = mat_solve(this.matrix,rhs);
+		    d_sol = mat_solve_rq(this.matrix,rhs);
+
+		    // If norm going down for ten iters, stop limiting
+		    if (abssum_rhs < abssum_old)
+			down_count += 1;
+		    else 
+			down_count = 0;
+		    if (down_count > 10) {
+			use_limiting = false;
+			down_count = 0;
+		    }
+
+		    // Update norm of rhs
+		    abssum_old = abssum_rhs;		    
+		}
+
+		// Update the worst case abssum for comparison.
+		if ((iter == 0) || (abssum_rhs > abssum_compare))
+		    abssum_compare = abssum_rhs;
+
+		// Check residue convergence, but loosely, and give up 
+		// on last iteration
+		if ( (iter < (maxiters - 1)) &&
+		     (abssum_rhs > (res_check_abs+res_check_rel*abssum_compare)))
+		    converged = false;
+		else converged = true;
+
+
+		// Update solution and check delta convergence
+		for (var i = this.N - 1; i >= 0; --i) {
+		    // Simple voltage step limiting to encourage Newton convergence
+		    if (use_limiting) {
+			if (this.ntypes[i] == T_VOLTAGE) {
+			    d_sol[i] = (d_sol[i] > v_newt_lim) ? v_newt_lim : d_sol[i];
+			    d_sol[i] = (d_sol[i] < -v_newt_lim) ? -v_newt_lim : d_sol[i];
+			}
+		    }
+		    soln[i] += d_sol[i];
+		    thresh = this.abstol[i] + reltol*this.soln_max[i];
+		    if (Math.abs(d_sol[i]) > thresh) {
+			converged = false;
+			this.problem_node = i;
+		    }
+		}
+
+		//alert(numeric.prettyPrint(this.solution);)
+                if (converged == true) {
+		    for (var i = this.N - 1; i >= 0; --i) 
+			if (Math.abs(soln[i]) > this.soln_max[i])
+			    this.soln_max[i] = Math.abs(soln[i]);
+		    
+		    return iter+1;
+		}
+	    }
+	    return undefined;
+	}
+
+	// DC analysis
+	Circuit.prototype.dc = function() {
+
+	    // Allocation matrices for linear part, etc.
+	    if (this.finalize() == false)
+		return undefined;
+
+	    // Define -f and df/dx for Newton solver
+	    function load_dc(ckt,soln,rhs) {
+		// rhs is initialized to -Gl * soln
+		mat_v_mult(ckt.Gl, soln, rhs, -1.0);
+		// G matrix is initialized with linear Gl
+		mat_copy(ckt.Gl,ckt.G);
+		// Now load up the nonlinear parts of rhs and G
+		for (var i = ckt.devices.length - 1; i >= 0; --i)
+			ckt.devices[i].load_dc(ckt,soln,rhs);
+		// G matrix is copied in to the system matrix
+		mat_copy(ckt.G,ckt.matrix);
+	    }
+
+	    // find the operating point
+	    var iterations = this.find_solution(load_dc,dc_max_iters);
+
+	    if (typeof iterations == 'undefined') {
+	    // too many iterations
+		if (this.current_sources.length > 0) {
+		    alert('Newton Method Failed, do your current sources have a conductive path to ground?');
+		} else {
+		    alert('Newton Method Failed, it may be your circuit or it may be our simulator.');
+		}
+
+		return undefined
+	    } else {
+		// Note that a dc solution was computed
+		this.diddc = true;
+		// create solution dictionary
+		var result = new Array();
+		// capture node voltages
+		for (var name in this.node_map) {
+		    var index = this.node_map[name];
+		    result[name] = (index == -1) ? 0 : this.solution[index];
+		}
+		// capture branch currents from voltage sources
+		for (var i = this.voltage_sources.length - 1; i >= 0; --i) {
+		    var v = this.voltage_sources[i];
+		    result['I('+v.name+')'] = this.solution[v.branch];
+		}
+		return result;
+	    }
+	}
+
+	// Transient analysis (needs work!)
+        Circuit.prototype.tran = function(ntpts, tstart, tstop, probenames, no_dc) {
+
+	    // Define -f and df/dx for Newton solver
+	    function load_tran(ckt,soln,rhs) {
+		// Crnt is initialized to -Gl * soln
+		mat_v_mult(ckt.Gl, soln, ckt.c,-1.0);
+		// G matrix is initialized with linear Gl
+		mat_copy(ckt.Gl,ckt.G);
+		// Now load up the nonlinear parts of crnt and G
+		for (var i = ckt.devices.length - 1; i >= 0; --i)
+		    ckt.devices[i].load_tran(ckt,soln,ckt.c,ckt.time);
+		// Exploit the fact that storage elements are linear
+		mat_v_mult(ckt.C, soln, ckt.q, 1.0);
+		// -rhs = c - dqdt
+		for (var i = ckt.N-1; i >= 0; --i) {
+		    var dqdt = ckt.alpha0*ckt.q[i] + ckt.alpha1*ckt.oldq[i] + 
+			ckt.alpha2*ckt.old2q[i];
+		    //alert(numeric.prettyPrint(dqdt));
+		    rhs[i] = ckt.beta0[i]*ckt.c[i] + ckt.beta1[i]*ckt.oldc[i] - dqdt;
+		}
+		// matrix = beta0*G + alpha0*C.
+		mat_scale_add(ckt.G,ckt.C,ckt.beta0,ckt.alpha0,ckt.matrix);
+	    }
+
+	    var p = new Array(3);
+	    function interp_coeffs(t, t0, t1, t2) {
+		// Poly coefficients
+		var dtt0 = (t - t0);
+		var dtt1 = (t - t1);
+		var dtt2 = (t - t2);
+		var dt0dt1 = (t0 - t1);
+		var dt0dt2 = (t0 - t2);
+		var dt1dt2 = (t1 - t2);
+		p[0] = (dtt1*dtt2)/(dt0dt1 * dt0dt2);
+		p[1] = (dtt0*dtt2)/(-dt0dt1 * dt1dt2);
+		p[2] = (dtt0*dtt1)/(dt0dt2 * dt1dt2);
+		return p;
+	    }
+
+	    function pick_step(ckt, step_index) {
+		var min_shrink_factor = 1.0/lte_step_decrease_factor;
+	        var max_growth_factor = time_step_increase_factor;
+		var N = ckt.N;
+		var p = interp_coeffs(ckt.time, ckt.oldt, ckt.old2t, ckt.old3t);
+		var trapcoeff = 0.5*(ckt.time - ckt.oldt)/(ckt.time - ckt.old3t);
+		var maxlteratio = 0.0;
+		for (var i = ckt.N-1; i >= 0; --i) {
+		    if (ckt.ltecheck[i]) { // Check lte on variable
+			var pred = p[0]*ckt.oldsol[i] + p[1]*ckt.old2sol[i] + p[2]*ckt.old3sol[i];
+			var lte = Math.abs((ckt.solution[i] - pred))*trapcoeff;
+			var lteratio = lte/(lterel*(ckt.abstol[i] + reltol*ckt.soln_max[i]));
+			maxlteratio = Math.max(maxlteratio, lteratio);
+		    }
+		}
+		var new_step;
+		var lte_step_ratio = 1.0/Math.pow(maxlteratio,1/3); // Cube root because trap
+		if (lte_step_ratio < 1.0) { // Shrink the timestep to make lte
+		    lte_step_ratio = Math.max(lte_step_ratio,min_shrink_factor);
+		    new_step = (ckt.time - ckt.oldt)*0.75*lte_step_ratio;
+		    new_step = Math.max(new_step, ckt.min_step);
+		} else {
+		    lte_step_ratio = Math.min(lte_step_ratio, max_growth_factor);
+		    if (lte_step_ratio > 1.2)  /* Increase timestep due to lte. */
+			new_step = (ckt.time - ckt.oldt) * lte_step_ratio / 1.2;
+		    else 
+			new_step = (ckt.time - ckt.oldt);
+		    new_step = Math.min(new_step, ckt.max_step);
+		}
+		return new_step;
+	    }
+	    
+	    // Standard to do a dc analysis before transient
+	    // Otherwise, do the setup also done in dc.
+	    no_dc = false;
+	    if ((this.diddc == false) && (no_dc == false)) {
+		if (this.dc() == undefined) { // DC failed, realloc mats and vects.
+		    alert('DC failed, trying transient analysis from zero.');		    
+		    this.finalized = false;  // Reset the finalization.
+		    if (this.finalize() == false) 
+			return undefined;
+		}
+	    }
+	    else {
+		if (this.finalize() == false) // Allocate matrices and vectors.
+		    return undefined;
+	    }
+
+	    // Tired of typing this, and using "with" generates hate mail.
+	    var N = this.N;
+
+	    // build array to hold list of results for each variable
+	    // last entry is for timepoints.
+	    var response = new Array(N + 1);
+	    for (var i = N; i >= 0; --i) response[i] = new Array();
+
+	    // Allocate back vectors for up to a second order method
+	    this.old3sol = new Array(this.N);
+	    this.old3q = new Array(this.N);
+	    this.old2sol = new Array(this.N);
+	    this.old2q = new Array(this.N);
+	    this.oldsol = new Array(this.N);
+	    this.oldq = new Array(this.N);
+	    this.q = new Array(this.N);
+	    this.oldc = new Array(this.N);
+	    this.c = new Array(this.N);
+	    this.alpha0 = 1.0;
+	    this.alpha1 = 0.0;
+	    this.alpha2 = 0.0;
+	    this.beta0 = new Array(this.N);
+	    this.beta1 = new Array(this.N);
+
+	    // Mark a set of algebraic variable (don't miss hidden ones!).
+	    this.ar = this.algebraic(this.C);
+
+	    // Non-algebraic variables and probe variables get lte
+	    this.ltecheck = new Array(this.N);
+	    for (var i = N; i >= 0; --i) 
+		this.ltecheck[i] = (this.ar[i] == 0);
+
+	    for (var name in this.node_map) {
+		var index = this.node_map[name];
+		for (var i = probenames.length; i >= 0; --i) {
+		    if (name == probenames[i]) {
+			this.ltecheck[index] = true;
+			break;
+		    }
+		}
+	    }
+
+	    // Check for periodic sources
+	    var period = tstop - tstart;
+	    for (var i = this.voltage_sources.length - 1; i >= 0; --i) {
+		var per = this.voltage_sources[i].src.period;
+		if (per > 0)
+		    period = Math.min(period, per);
+	    }
+	    for (var i = this.current_sources.length - 1; i >= 0; --i) {
+		var per = this.current_sources[i].src.period;
+		if (per > 0)
+		    period = Math.min(period, per);
+	    }
+	    this.periods = Math.ceil((tstop - tstart)/period);
+	    //alert('number of periods ' + this.periods);
+
+	
+	    this.time = tstart;
+	    // ntpts adjusted by numbers of periods in input
+	    this.max_step = (tstop - tstart)/(this.periods*ntpts);
+	    this.min_step = this.max_step/1e8;
+	    var new_step = this.max_step/1e6;
+	    this.oldt = this.time - new_step;
+
+	    // Initialize old crnts, charges, and solutions.
+	    load_tran(this,this.solution,this.rhs)
+	    for (var i = N-1; i >= 0; --i) {
+		this.old3sol[i] = this.solution[i];
+		this.old2sol[i] = this.solution[i];
+		this.oldsol[i] = this.solution[i];
+		this.old3q[i] = this.q[i]; 
+		this.old2q[i] = this.q[i]; 
+		this.oldq[i] = this.q[i]; 
+		this.oldc[i] = this.c[i]; 
+	    }
+
+	    
+	    var beta0,beta1;
+	    // Start with two pseudo-Euler steps, maximum 50000 steps/period
+	    var max_nsteps = this.periods*50000;
+	    for(var step_index = -3; step_index < max_nsteps; step_index++) {
+		// Save the just computed solution, and move back q and c.
+		for (var i = this.N - 1; i >= 0; --i) {
+		    if (step_index >= 0)
+			response[i].push(this.solution[i]);
+		    this.oldc[i] = this.c[i];
+		    this.old3sol[i] = this.old2sol[i];
+		    this.old2sol[i] = this.oldsol[i];
+		    this.oldsol[i] = this.solution[i];
+		    this.old3q[i] = this.oldq[i];
+		    this.old2q[i] = this.oldq[i];
+		    this.oldq[i] = this.q[i];
+
+		}
+
+		if (step_index < 0) {  // Take a prestep using BE
+		    this.old3t = this.old2t - (this.oldt-this.old2t)
+		    this.old2t = this.oldt - (tstart-this.oldt)
+		    this.oldt = tstart - (this.time - this.oldt);
+		    this.time = tstart;
+		    beta0 = 1.0;  
+		    beta1 = 0.0;		
+		} else {  // Take a regular step
+		    // Save the time, and rotate time wheel
+		    response[this.N].push(this.time);
+		    this.old3t = this.old2t;
+		    this.old2t = this.oldt;
+		    this.oldt = this.time;
+		    // Make sure we come smoothly in to the interval end.
+		    if (this.time >= tstop) break;  // We're done.
+		    else if(this.time + new_step > tstop)
+			this.time = tstop;
+		    else if(this.time + 1.5*new_step > tstop)
+			this.time += (2/3)*(tstop - this.time);
+		    else
+			this.time += new_step;
+
+		    // Use trap (average old and new crnts.
+		    beta0 = 0.5;
+		    beta1 = 0.5;	
+		}
+
+		// For trap rule, turn off current avging for algebraic eqns
+		for (var i = this.N - 1; i >= 0; --i) {
+		    this.beta0[i] = beta0 + this.ar[i]*beta1;
+		    this.beta1[i] = (1.0 - this.ar[i])*beta1;
+		}
+
+		// Loop to find NR converging timestep with okay LTE
+		while (true) {
+		    // Set the timestep coefficients (alpha2 is for bdf2).
+		    this.alpha0 = 1.0/(this.time - this.oldt);
+		    this.alpha1 = -this.alpha0;
+		    this.alpha2 = 0;
+
+		    // If timestep is 1/10,000th of tstop, just use BE.
+		    if ((this.time-this.oldt) < 1.0e-4*tstop) {
+			for (var i = this.N - 1; i >= 0; --i) {
+			    this.beta0[i] = 1.0;
+			    this.beta1[i] = 0.0;
+			}
+		    }  
+		    // Use Newton to compute the solution.
+		    var iterations = this.find_solution(load_tran,max_tran_iters);
+
+		    // If NR succeeds and stepsize is at min, accept and newstep=maxgrowth*minstep.
+		    // Else if Newton Fails, shrink step by a factor and try again
+		    // Else LTE picks new step, if bigger accept current step and go on.
+		    if ((iterations != undefined) && 
+			(step_index <= 0 || (this.time-this.oldt) < (1+reltol)*this.min_step)) {
+			if (step_index > 0) new_step = time_step_increase_factor*this.min_step;
+			break;
+		    } else if (iterations == undefined) {  // NR nonconvergence, shrink by factor
+			//alert('timestep nonconvergence ' + this.time + ' ' + step_index);
+			this.time = this.oldt + 
+			    (this.time - this.oldt)/nr_step_decrease_factor;
+		    } else {  // Check the LTE and shrink step if needed.
+			new_step = pick_step(this, step_index);
+			if (new_step < (1.0 - reltol)*(this.time - this.oldt)) {
+			    this.time = this.oldt + new_step;  // Try again   
+			}
+			else
+			    break;  // LTE okay, new_step for next step
+		    }
+		}
+	    }
+
+	    // create solution dictionary
+	    var result = new Array();
+	    for (var name in this.node_map) {
+		var index = this.node_map[name];
+		result[name] = (index == -1) ? 0 : response[index];
+	    }
+	    // capture branch currents from voltage sources
+	    for (var i = this.voltage_sources.length - 1; i >= 0; --i) {
+		var v = this.voltage_sources[i];
+		result['I('+v.name+')'] = response[v.branch];
+	    }
+
+	    result['_time_'] = response[this.N];
+	    return result;
+	}
+
+	// AC analysis: npts/decade for freqs in range [fstart,fstop]
+	// result['_frequencies_'] = vector of log10(sample freqs)
+	// result['xxx'] = vector of dB(response for node xxx)
+        // NOTE: Normalization removed in schematic.js, jkw.
+        Circuit.prototype.ac = function(npts,fstart,fstop,source_name) {
+
+	    if (this.dc() == undefined) { // DC failed, realloc mats and vects.
+		return undefined;
+	    }
+
+	    var N = this.N;
+	    var G = this.G;
+	    var C = this.C;
+
+	    // Complex numbers, we're going to need a bigger boat
+	    var matrixac = mat_make(2*N, (2*N)+1);
+
+            // Get the source used for ac
+	    if (this.device_map[source_name] === undefined) {
+		alert('AC analysis refers to unknown source ' + source_name);
+		return 'AC analysis failed, unknown source';
+	    }
+	    this.device_map[source_name].load_ac(this,this.rhs);
+
+	    // build array to hold list of magnitude and phases for each node
+	    // last entry is for frequency values
+	    var response = new Array(2*N + 1);
+	    for (var i = 2*N; i >= 0; --i) response[i] = new Array();
+
+	    // multiplicative frequency increase between freq points
+	    var delta_f = Math.exp(Math.LN10/npts);
+
+	    var phase_offset = new Array(N);
+	    for (var i = N-1; i >= 0; --i) phase_offset[i] = 0;
+
+	    var f = fstart;
+	    fstop *= 1.0001;  // capture that last freq point!
+	    while (f <= fstop) {
+		var omega = 2 * Math.PI * f;
+		response[2*N].push(f);   // 2*N for magnitude and phase
+
+		// Find complex x+jy that sats Gx-omega*Cy=rhs; omega*Cx+Gy=0
+		// Note: solac[0:N-1]=x, solac[N:2N-1]=y
+		for (var i = N-1; i >= 0; --i) {
+		    // First the rhs, replicated for real and imaginary
+		    matrixac[i][2*N] = this.rhs[i];
+		    matrixac[i+N][2*N] = 0;
+
+		    for (var j = N-1; j >= 0; --j) {
+			matrixac[i][j] = G[i][j];
+			matrixac[i+N][j+N] = G[i][j];
+			matrixac[i][j+N] = -omega*C[i][j];
+			matrixac[i+N][j] = omega*C[i][j];
+		    }
+		}
+
+		// Compute the small signal response
+		var solac = mat_solve(matrixac);
+
+		// Save magnitude and phase
+		for (var i = N - 1; i >= 0; --i) {
+		    var mag = Math.sqrt(solac[i]*solac[i] + solac[i+N]*solac[i+N]);
+		    response[i].push(mag);
+
+		    // Avoid wrapping phase, add or sub 180 for each jump
+		    var phase = 180*(Math.atan2(solac[i+N],solac[i])/Math.PI);
+		    var phasei = response[i+N];
+		    var L = phasei.length;
+		    // Look for a one-step jump greater than 90 degrees
+		    if (L > 1) {
+			var phase_jump = phase + phase_offset[i] - phasei[L-1];
+			if (phase_jump > 90) {
+			    phase_offset[i] -= 360;
+			} else if (phase_jump < -90) {
+			    phase_offset[i] += 360;
+			}
+		    }
+		    response[i+N].push(phase + phase_offset[i]);
+		}
+		f *= delta_f;    // increment frequency
+	    }
+
+	    // create solution dictionary
+	    var result = new Array();
+	    for (var name in this.node_map) {
+		var index = this.node_map[name];
+		result[name] = (index == -1) ? 0 : response[index];
+		result[name+'_phase'] = (index == -1) ? 0 : response[index+N];
+	    }
+	    result['_frequencies_'] = response[2*N];
+	    return result;
+	}
+
+
+        // Helper for adding devices to a circuit, warns on duplicate device names.
+        Circuit.prototype.add_device = function(d,name) {
+	    // Add device to list of devices and to device map
+	    this.devices.push(d);
+	    d.name = name;
+	    if (name) {
+		if (this.device_map[name] === undefined) 
+		    this.device_map[name] = d;
+		else {
+		    alert('Warning: two circuit elements share the same name ' + name);
+		    this.device_map[name] = d;
+		}
+	    }
+	    return d;
+	}
+
+	Circuit.prototype.r = function(n1,n2,v,name) {
+	    // try to convert string value into numeric value, barf if we can't
+	    if ((typeof v) == 'string') {
+		v = parse_number(v,undefined);
+		if (v === undefined) return undefined;
+	    }
+
+	    if (v != 0) {
+		var d = new Resistor(n1,n2,v);
+		return this.add_device(d, name);
+	    } else return this.v(n1,n2,'0',name);   // zero resistance == 0V voltage source
+	}
+
+	Circuit.prototype.d = function(n1,n2,area,type,name) {
+	    // try to convert string value into numeric value, barf if we can't
+	    if ((typeof area) == 'string') {
+		area = parse_number(area,undefined);
+		if (area === undefined) return undefined;
+	    }
+
+	    if (area != 0) {
+		var d = new Diode(n1,n2,area,type);
+		return this.add_device(d, name);
+	    } // zero area diodes discarded.
+	}
+
+
+	Circuit.prototype.c = function(n1,n2,v,name) {
+	    // try to convert string value into numeric value, barf if we can't
+	    if ((typeof v) == 'string') {
+		v = parse_number(v,undefined);
+		if (v === undefined) return undefined;
+	    }
+	    var d = new Capacitor(n1,n2,v);
+	    return this.add_device(d, name);
+	}
+
+	Circuit.prototype.l = function(n1,n2,v,name) {
+	    // try to convert string value into numeric value, barf if we can't
+	    if ((typeof v) == 'string') {
+		v = parse_number(v,undefined);
+		if (v === undefined) return undefined;
+	    }
+	    var branch = this.node(undefined,T_CURRENT);
+	    var d = new Inductor(n1,n2,branch,v);
+	    return this.add_device(d, name);
+	}
+
+        Circuit.prototype.v = function(n1,n2,v,name) {
+	    var branch = this.node(undefined,T_CURRENT);
+	    var d = new VSource(n1,n2,branch,v);
+	    this.voltage_sources.push(d);
+	    return this.add_device(d, name);
+	}
+
+	Circuit.prototype.i = function(n1,n2,v,name) {
+	    var d = new ISource(n1,n2,v);
+	    this.current_sources.push(d);
+	    return this.add_device(d, name);
+	}
+
+        Circuit.prototype.opamp = function(np,nn,no,ng,A,name) {
+	    // try to convert string value into numeric value, barf if we can't
+	    if ((typeof A) == 'string') {
+		ratio = parse_number(A,undefined);
+		if (A === undefined) return undefined;
+	    }
+	    var branch = this.node(undefined,T_CURRENT);
+	    var d = new Opamp(np,nn,no,ng,branch,A,name);
+	    return this.add_device(d, name);
+	}
+
+        Circuit.prototype.n = function(d,g,s, ratio, name) {
+	    // try to convert string value into numeric value, barf if we can't
+	    if ((typeof ratio) == 'string') {
+		ratio = parse_number(ratio,undefined);
+		if (ratio === undefined) return undefined;
+	    }
+	    var d = new Fet(d,g,s,ratio,name,'n');
+	    return this.add_device(d, name);
+	}
+
+        Circuit.prototype.p = function(d,g,s, ratio, name) {
+	    // try to convert string value into numeric value, barf if we can't
+	    if ((typeof ratio) == 'string') {
+		ratio = parse_number(ratio,undefined);
+		if (ratio === undefined) return undefined;
+	    }
+	    var d = new Fet(d,g,s,ratio,name,'p');
+	    return this.add_device(d, name);
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Support for creating conductance and capacitance matrices associated with
+        //  modified nodal analysis (unknowns are node voltages and inductor and voltage
+        //  source currents). 
+        //  The linearized circuit is written as 
+        //          C d/dt x = G x + rhs
+        //  x - vector of node voltages and element currents
+        //  rhs - vector of source values
+        //  C - Matrix whose values are capacitances and inductances, has many zero rows.
+        //  G - Matrix whose values are conductances and +-1's.
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	// add val component between two nodes to matrix M
+	// Index of -1 refers to ground node
+        Circuit.prototype.add_two_terminal = function(i,j,g,M) {
+	    if (i >= 0) {
+		M[i][i] += g;
+		if (j >= 0) {
+		    M[i][j] -= g;
+		    M[j][i] -= g;
+		    M[j][j] += g;
+		}
+	    } else if (j >= 0)
+		M[j][j] += g;
+	}
+
+	// add val component between two nodes to matrix M
+	// Index of -1 refers to ground node
+        Circuit.prototype.get_two_terminal = function(i,j,x) {
+	    var xi_minus_xj = 0;
+	    if (i >= 0) xi_minus_xj = x[i];
+	    if (j >= 0) xi_minus_xj -= x[j];
+	    return xi_minus_xj
+	}
+
+        Circuit.prototype.add_conductance_l = function(i,j,g) {
+            this.add_two_terminal(i,j,g, this.Gl)
+	}
+
+        Circuit.prototype.add_conductance = function(i,j,g) {
+            this.add_two_terminal(i,j,g, this.G)
+	}
+
+        Circuit.prototype.add_capacitance = function(i,j,c) {
+            this.add_two_terminal(i,j,c,this.C)
+	}
+
+	// add individual conductance to Gl matrix
+	Circuit.prototype.add_to_Gl = function(i,j,g) {
+	    if (i >=0 && j >= 0)
+		this.Gl[i][j] += g;
+	}
+
+	// add individual conductance to Gl matrix
+	Circuit.prototype.add_to_G = function(i,j,g) {
+	    if (i >=0 && j >= 0)
+		this.G[i][j] += g;
+	}
+
+	// add individual capacitance to C matrix
+	Circuit.prototype.add_to_C = function(i,j,c) {
+	    if (i >=0 && j >= 0)
+		this.C[i][j] += c;
+	}
+
+	// add source info to rhs
+        Circuit.prototype.add_to_rhs = function(i,v,rhs) {
+	    if (i >= 0)	rhs[i] += v;
+	}
+
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Generic matrix support - making, copying, factoring, rank, etc
+	//  Note, Matrices are stored using nested javascript arrays.
+	////////////////////////////////////////////////////////////////////////////////
+
+        // Allocate an NxM matrix
+        function mat_make(N,M) {
+	    var mat = new Array(N);	
+	    for (var i = N - 1; i >= 0; --i) {	    
+		mat[i] = new Array(M);
+		for (var j = M - 1; j >= 0; --j) {	    
+		    mat[i][j] = 0.0;
+		}
+	    }
+	    return mat;
+	}
+
+        // Form b = scale*Mx
+        function mat_v_mult(M,x,b,scale) {
+	    var n = M.length;
+	    var m = M[0].length;
+	    
+	    if (n != b.length || m != x.length)
+		throw 'Rows of M mismatched to b or cols mismatch to x.';
+
+	    for (var i = 0; i < n; i++) {
+		var temp = 0;
+		for (var j = 0; j < m; j++) temp += M[i][j]*x[j];
+		b[i] = scale*temp;  // Recall the neg in the name
+	    }
+	}
+
+        // C = scalea*A + scaleb*B, scalea, scaleb eithers numbers or arrays (row scaling)
+        function mat_scale_add(A, B, scalea, scaleb, C) {
+	    var n = A.length;
+	    var m = A[0].length;
+	    
+	    if (n > B.length || m > B[0].length)
+		throw 'Row or columns of A to large for B';
+	    if (n > C.length || m > C[0].length)
+		throw 'Row or columns of A to large for C';
+	    if ((typeof scalea == 'number') && (typeof scaleb == 'number'))
+		for (var i = 0; i < n; i++)
+		    for (var j = 0; j < m; j++)
+			C[i][j] = scalea*A[i][j] + scaleb*B[i][j];
+	    else if ((typeof scaleb == 'number') && (scalea instanceof Array))
+		for (var i = 0; i < n; i++)
+		    for (var j = 0; j < m; j++)
+			C[i][j] = scalea[i]*A[i][j] + scaleb*B[i][j];
+	    else if ((typeof scaleb instanceof Array) && (scalea instanceof Array))
+		for (var i = 0; i < n; i++)
+		    for (var j = 0; j < m; j++)
+			C[i][j] = scalea[i]*A[i][j] + scaleb[i]*B[i][j];
+	    else
+		throw 'scalea and scaleb must be scalars or Arrays';
+	}
+
+        // Returns a vector of ones and zeros, ones denote algebraic
+        // variables (rows that can be removed without changing rank(M).
+        Circuit.prototype.algebraic = function(M) {
+	    var Nr = M.length
+	    Mc = mat_make(Nr, Nr);
+	    mat_copy(M,Mc);
+	    var R = mat_rank(Mc);
+
+	    var one_if_alg = new Array(Nr);
+	    for (var row = 0; row < Nr; row++) {  // psuedo gnd row small
+		for (var col = Nr - 1; col >= 0; --col)
+		    Mc[row][col] = 0;
+		if (mat_rank(Mc) == R)  // Zeroing row left rank unchanged
+		    one_if_alg[row] = 1;
+		else { // Zeroing row changed rank, put back
+		    for (var col = Nr - 1; col >= 0; --col)
+			Mc[row][col] = M[row][col];
+		    one_if_alg[row] = 0;
+		}
+	    }
+	    return one_if_alg;
+	}
+
+        // Copy A -> using the bounds of A
+	function mat_copy(src,dest) {
+	    var n = src.length;
+	    var m = src[0].length;
+	    if (n > dest.length || m >  dest[0].length)
+		throw 'Rows or cols > rows or cols of dest';
+
+	    for (var i = 0; i < n; i++)
+		for (var j = 0; j < m; j++)
+		    dest[i][j] = src[i][j];
+	}
+	    
+        // Copy and transpose A -> using the bounds of A
+	function mat_copy_transposed(src,dest) {
+	    var n = src.length;
+	    var m = src[0].length;
+	    if (n > dest[0].length || m >  dest.length)
+		throw 'Rows or cols > cols or rows of dest';
+
+	    for (var i = 0; i < n; i++)
+		for (var j = 0; j < m; j++)
+		    dest[j][i] = src[i][j];
+	}
+
+
+	// Uses GE to determine rank.
+        function mat_rank(Mo) {
+	    var Nr = Mo.length;  // Number of rows
+	    var Nc = Mo[0].length;  // Number of columns
+	    var temp,i,j;
+	    // Make a copy to avoid overwriting
+	    M = mat_make(Nr, Nc);
+	    mat_copy(Mo,M);
+
+	    // Find matrix maximum entry
+	    var max_abs_entry = 0;
+	    for(var row = Nr-1; row >= 0; --row) {
+		for(var col = Nr-1; col >= 0; --col) {
+		    if (Math.abs(M[row][col]) > max_abs_entry)
+			max_abs_entry = Math.abs(M[row][col]);
+		}
+	    }
+
+	    // Gaussian elimination to find rank
+	    var the_rank = 0;
+	    var start_col = 0;
+	    for (var row = 0; row < Nr; row++) {
+		// Search for first nonzero column in the remaining rows.
+		for (var col = start_col; col < Nc; col++) {
+		    var max_v = Math.abs(M[row][col]);
+		    var max_row = row;
+		    for (var i = row + 1; i < Nr; i++) {
+			temp = Math.abs(M[i][col]);
+			if (temp > max_v) { max_v = temp; max_row = i; }
+		    }
+		    // if max_v non_zero, column is nonzero, eliminate in subsequent rows
+		    if (Math.abs(max_v) > eps*max_abs_entry) {
+			start_col = col+1;
+			the_rank += 1;
+		        // Swap rows to get max in M[row][col]
+			temp = M[row];
+			M[row] = M[max_row];
+			M[max_row] = temp;
+
+			// now eliminate this column for all subsequent rows
+			for (var i = row + 1; i < Nr; i++) {
+			    temp = M[i][col]/M[row][col];   // multiplier for current row
+			    if (temp != 0)  // subtract 
+			    for (var j = col; j < Nc; j++) M[i][j] -= M[row][j]*temp;
+			}
+			// Now move on to the next row
+			break;
+		    }
+		}
+	    }
+
+	    // return the rank
+	    return the_rank;
+	}
+
+	// Solve Mx=b and return vector x using R^TQ^T factorization. 
+        // Multiplication by R^T implicit, should be null-space free soln.
+        // M should have the extra column!
+        // Almost everything is in-lined for speed, sigh.
+        function mat_solve_rq(M, rhs) {
+
+	    var Nr = M.length;  // Number of rows
+	    var Nc = M[0].length;  // Number of columns
+
+	    // Copy the rhs in to the last column of M if one is given.
+	    if (rhs != null) {
+		for (var row = Nr - 1; row >= 0; --row)
+		    M[row][Nc-1] = rhs[row];
+	    }
+
+	    var mat_scale = 0; // Sets the scale for comparison to zero.
+	    var max_nonzero_row = Nr-1;  // Assumes M nonsingular.
+	    for (var row = 0; row < Nr; row++) {  
+		// Find largest row with largest 2-norm
+		var max_row = row;
+		var maxsumsq = 0;
+		for (var rowp = row; rowp < Nr; rowp++) {
+		    var Mr = M[rowp];
+		    var sumsq = 0;
+		    for (var col = Nc-2; col >= 0; --col)  // Last col=rhs
+			sumsq += Mr[col]*Mr[col];
+		    if ((row == rowp) || (sumsq > maxsumsq)) {
+			max_row = rowp;
+			maxsumsq = sumsq;
+		    }
+		}
+		if (max_row > row) { // Swap rows if not max row
+		    var temp = M[row];
+		    M[row] = M[max_row];
+		    M[max_row] = temp;
+		}
+
+		// Calculate row norm, save if this is first (largest)
+		row_norm = Math.sqrt(maxsumsq);
+		if (row == 0) mat_scale = row_norm;
+
+		// Check for all zero rows
+		if (row_norm > mat_scale*eps)
+		    scale = 1.0/row_norm;
+		else {
+		    max_nonzero_row = row - 1;  // Rest will be nullspace of M
+		    break;
+		}
+
+
+		// Nonzero row, eliminate from rows below
+		var Mr = M[row];
+		for (var col =  Nc-1; col >= 0; --col) // Scale rhs also
+		    Mr[col] *= scale;
+		for (var rowp = row + 1; rowp < Nr; rowp++) { // Update.
+		    var Mrp = M[rowp];
+		    var inner = 0;
+		    for (var col =  Nc-2; col >= 0; --col)  // Project 
+			inner += Mr[col]*Mrp[col];
+		    for (var col =  Nc-1; col >= 0; --col) // Ortho (rhs also)
+			Mrp[col] -= inner *Mr[col];
+		}
+	    }
+
+	    // Last Column of M has inv(R^T)*rhs.  Scale rows of Q to get x.
+	    var x = new Array(Nc-1);
+	    for (var col = Nc-2; col >= 0; --col)
+		x[col] = 0;
+	    for (var row = max_nonzero_row; row >= 0; --row) {
+		Mr = M[row];
+		for (var col = Nc-2; col >= 0; --col) {
+		    x[col] += Mr[col]*Mr[Nc-1];
+		}
+	    }
+
+	    // Return solution.
+	    return x;
+	}
+
+	// solve Mx=b and return vector x given augmented matrix M = [A | b]
+	// Uses Gaussian elimination with partial pivoting
+        function mat_solve(M,rhs) {
+	    var N = M.length;      // augmented matrix M has N rows, N+1 columns
+	    var temp,i,j;
+
+	    // Copy the rhs in to the last column of M if one is given.
+	    if (rhs != null) {
+		for (var row = 0; row < N ; row++)
+		    M[row][N] = rhs[row];
+	    }
+
+	    // gaussian elimination
+	    for (var col = 0; col < N ; col++) {
+		// find pivot: largest abs(v) in this column of remaining rows
+		var max_v = Math.abs(M[col][col]);
+		var max_col = col;
+		for (i = col + 1; i < N; i++) {
+		    temp = Math.abs(M[i][col]);
+		    if (temp > max_v) { max_v = temp; max_col = i; }
+		}
+
+		// if no value found, generate a small conductance to gnd
+		// otherwise swap current row with pivot row
+		if (max_v == 0) M[col][col] = eps; 
+		else {
+		    temp = M[col];
+		    M[col] = M[max_col];
+		    M[max_col] = temp;
+		}
+
+		// now eliminate this column for all subsequent rows
+		for (i = col + 1; i < N; i++) {
+		    temp = M[i][col]/M[col][col];   // multiplier we'll use for current row
+		    if (temp != 0)
+			// subtract current row from row we're working on
+			// remember to process b too!
+			for (j = col; j <= N; j++) M[i][j] -= M[col][j]*temp;
+		}
+	    }
+
+	    // matrix is now upper triangular, so solve for elements of x starting
+	    // with the last row
+	    var x = new Array(N);
+	    for (i = N-1; i >= 0; --i) {
+		temp = M[i][N];   // grab b[i] from augmented matrix as RHS
+		// subtract LHS term from RHS using known x values
+		for (j = N-1; j > i; --j) temp -= M[i][j]*x[j];
+		// now compute new x value
+		x[i] = temp/M[i][i];
+	    }
+
+	    // return solution
+	    return x;
+	}
+
+	// test solution code, expect x = [2,3,-1]
+	//M = [[2,1,-1,8],[-3,-1,2,-11],[-2,1,2,-3]];
+	//x = mat_solve(M);
+	//y = 1;  // so we have place to set a breakpoint :)
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Device base class
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	function Device() {
+	}
+
+	// complete initial set up of device
+	Device.prototype.finalize = function() {
+	}
+
+        // Load the linear elements in to Gl and C
+        Device.prototype.load_linear = function(ckt) {
+	}
+
+	// load linear system equations for dc analysis
+	// (inductors shorted and capacitors opened)
+        Device.prototype.load_dc = function(ckt,soln,rhs) {
+	}
+
+	// load linear system equations for tran analysis
+	Device.prototype.load_tran = function(ckt,soln) {
+	}
+
+	// load linear system equations for ac analysis:
+	// current sources open, voltage sources shorted
+	// linear models at operating point for everyone else
+	Device.prototype.load_ac = function(ckt,rhs) {
+	}
+
+	// return time of next breakpoint for the device
+	Device.prototype.breakpoint = function(time) {
+	    return undefined;
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Parse numbers in engineering notation
+	//
+	///////////////////////////////////////////////////////////////////////////////
+
+	// convert first character of argument into an integer
+	function ord(ch) {
+	    return ch.charCodeAt(0);
+	}
+
+	// convert string argument to a number, accepting usual notations
+	// (hex, octal, binary, decimal, floating point) plus engineering
+	// scale factors (eg, 1k = 1000.0 = 1e3).
+	// return default if argument couldn't be interpreted as a number
+	function parse_number(s,default_v) {
+	    var slen = s.length;
+	    var multiplier = 1;
+	    var result = 0;
+	    var index = 0;
+
+	    // skip leading whitespace
+	    while (index < slen && s.charAt(index) <= ' ') index += 1;
+	    if (index == slen) return default_v;
+
+	    // check for leading sign
+	    if (s.charAt(index) == '-') {
+		multiplier = -1;
+		index += 1;
+	    } else if (s.charAt(index) == '+')
+		index += 1;
+	    var start = index;   // remember where digits start
+
+	    // if leading digit is 0, check for hex, octal or binary notation
+	    if (index >= slen) return default_v;
+	    else if (s.charAt(index) == '0') {
+		index += 1;
+		if (index >= slen) return 0;
+		if (s.charAt(index) == 'x' || s.charAt(index) == 'X') { // hex
+		    while (true) {
+			index += 1;
+			if (index >= slen) break;
+			if (s.charAt(index) >= '0' && s.charAt(index) <= '9')
+			    result = result*16 + ord(s.charAt(index)) - ord('0');
+			else if (s.charAt(index) >= 'A' && s.charAt(index) <= 'F')
+			    result = result*16 + ord(s.charAt(index)) - ord('A') + 10;
+			else if (s.charAt(index) >= 'a' && s.charAt(index) <= 'f')
+			    result = result*16 + ord(s.charAt(index)) - ord('a') + 10;
+			else break;
+		    }
+		    return result*multiplier;
+		} else if (s.charAt(index) == 'b' || s.charAt(index) == 'B') {  // binary
+		    while (true) {
+			index += 1;
+			if (index >= slen) break;
+			if (s.charAt(index) >= '0' && s.charAt(index) <= '1')
+			    result = result*2 + ord(s.charAt(index)) - ord('0');
+			else break;
+		    }
+		    return result*multiplier;
+		} else if (s.charAt(index) != '.') { // octal
+		    while (true) {
+			if (s.charAt(index) >= '0' && s.charAt(index) <= '7')
+			    result = result*8 + ord(s.charAt(index)) - ord('0');
+			else break;
+			index += 1;
+			if (index >= slen) break;
+		    }
+		    return result*multiplier;
+		}
+	    }
+    
+	    // read decimal integer or floating-point number
+	    while (true) {
+		if (s.charAt(index) >= '0' && s.charAt(index) <= '9')
+		    result = result*10 + ord(s.charAt(index)) - ord('0');
+		else break;
+		index += 1;
+		if (index >= slen) break;
+	    }
+
+	    // fractional part?
+	    if (index < slen && s.charAt(index) == '.') {
+		while (true) {
+		    index += 1;
+		    if (index >= slen) break;
+		    if (s.charAt(index) >= '0' && s.charAt(index) <= '9') {
+			result = result*10 + ord(s.charAt(index)) - ord('0');
+			multiplier *= 0.1;
+		    } else break;
+		}
+	    }
+
+	    // if we haven't seen any digits yet, don't check
+	    // for exponents or scale factors
+	    if (index == start) return default_v;
+
+	    // type of multiplier determines type of result:
+	    // multiplier is a float if we've seen digits past
+	    // a decimal point, otherwise it's an int or long.
+	    // Up to this point result is an int or long.
+	    result *= multiplier;
+
+	    // now check for exponent or engineering scale factor.  If there
+	    // is one, result will be a float.
+	    if (index < slen) {
+		var scale = s.charAt(index);
+		index += 1;
+		if (scale == 'e' || scale == 'E') {
+		    var exponent = 0;
+		    multiplier = 10.0;
+		    if (index < slen) {
+			if (s.charAt(index) == '+') index += 1;
+			else if (s.charAt(index) == '-') {
+			    index += 1;
+			    multiplier = 0.1;
+			}
+		    }
+		    while (index < slen) {
+			if (s.charAt(index) >= '0' && s.charAt(index) <= '9') {
+			    exponent = exponent*10 + ord(s.charAt(index)) - ord('0');
+			    index += 1;
+			} else break;
+		    }
+		    while (exponent > 0) {
+			exponent -= 1;
+			result *= multiplier;
+		    }
+		} else if (scale == 't' || scale == 'T') result *= 1e12;
+		else if (scale == 'g' || scale == 'G') result *= 1e9;
+		else if (scale == 'M') result *= 1e6;
+		else if (scale == 'k' || scale == 'K') result *= 1e3;
+		else if (scale == 'm') result *= 1e-3;
+		else if (scale == 'u' || scale == 'U') result *= 1e-6;
+		else if (scale == 'n' || scale == 'N') result *= 1e-9;
+		else if (scale == 'p' || scale == 'P') result *= 1e-12;
+		else if (scale == 'f' || scale == 'F') result *= 1e-15;
+	    }
+	    // ignore any remaining chars, eg, 1kohms returns 1000
+	    return result;
+	}
+
+	Circuit.prototype.parse_number = parse_number;  // make it easy to call from outside
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Sources
+	//
+	///////////////////////////////////////////////////////////////////////////////
+
+	// argument is a string describing the source's value (see comments for details)
+	// source types: dc,step,square,triangle,sin,pulse,pwl,pwl_repeating
+
+	// returns an object with the following attributes:
+	//   fun -- name of source function
+	//   args -- list of argument values
+	//   value(t) -- compute source value at time t
+	//   inflection_point(t) -- compute time after t when a time point is needed
+	//   dc -- value at time 0
+	//   period -- repeat period for periodic sources (0 if not periodic)
+	
+	function parse_source(v) {
+	    // generic parser: parse v as either <value> or <fun>(<value>,...)
+	    var src = new Object();
+	    src.period = 0; // Default not periodic
+	    src.value = function(t) { return 0; }  // overridden below
+	    src.inflection_point = function(t) { return undefined; };  // may be overridden below
+
+	    // see if there's a "(" in the description
+	    var index = v.indexOf('(');
+	    var ch;
+	    if (index >= 0) {
+		src.fun = v.slice(0,index);   // function name is before the "("
+		src.args = [];	// we'll push argument values onto this list
+		var end = v.indexOf(')',index);
+		if (end == -1) end = v.length;
+
+		index += 1;     // start parsing right after "("
+		while (index < end) {
+		    // figure out where next argument value starts
+		    ch = v.charAt(index);
+		    if (ch <= ' ') { index++; continue; }
+		    // and where it ends
+		    var arg_end = v.indexOf(',',index);
+		    if (arg_end == -1) arg_end = end;
+		    // parse and save result in our list of arg values
+		    src.args.push(parse_number(v.slice(index,arg_end),undefined));
+		    index = arg_end + 1;
+		}
+	    } else {
+		src.fun = 'dc';
+		src.args = [parse_number(v,0)];
+	    }
+
+	    // post-processing for constant sources
+	    // dc(v)
+	    if (src.fun == 'dc') {
+		var v = arg_value(src.args,0,0);
+		src.args = [v];
+		src.value = function(t) { return v; }  // closure
+	    }
+
+	    // post-processing for impulse sources
+	    // impulse(height,width)
+	    else if (src.fun == 'impulse') {
+		var h = arg_value(src.args,0,1);  // default height: 1
+		var w = Math.abs(arg_value(src.args,2,1e-9));  // default width: 1ns
+		src.args = [h,w];  // remember any defaulted values
+		pwl_source(src,[0,0,w/2,h,w,0],false);
+	    }
+
+	    // post-processing for step sources
+	    // step(v_init,v_plateau,t_delay,t_rise)
+	    else if (src.fun == 'step') {
+		var v1 = arg_value(src.args,0,0);  // default init value: 0V
+		var v2 = arg_value(src.args,1,1);  // default plateau value: 1V
+		var td = Math.max(0,arg_value(src.args,2,0));  // time step starts
+		var tr = Math.abs(arg_value(src.args,3,1e-9));  // default rise time: 1ns
+		src.args = [v1,v2,td,tr];  // remember any defaulted values
+		pwl_source(src,[td,v1,td+tr,v2],false);
+	    }
+
+	    // post-processing for square wave
+	    // square(v_init,v_plateau,freq,duty_cycle)
+	    else if (src.fun == 'square') {
+		var v1 = arg_value(src.args,0,0);  // default init value: 0V
+		var v2 = arg_value(src.args,1,1);  // default plateau value: 1V
+		var freq = Math.abs(arg_value(src.args,2,1));  // default frequency: 1Hz
+		var duty_cycle  = Math.min(100,Math.abs(arg_value(src.args,3,50)));  // default duty cycle: 0.5
+		src.args = [v1,v2,freq,duty_cycle];  // remember any defaulted values
+
+		var per = freq == 0 ? Infinity : 1/freq;
+		var t_change = 0.01 * per;   // rise and fall time
+		var t_pw = .01 * duty_cycle * 0.98 * per;  // fraction of cycle minus rise and fall time
+		pwl_source(src,[0,v1,t_change,v2,t_change+t_pw,
+				v2,t_change+t_pw+t_change,v1,per,v1],true);
+	    }
+
+	    // post-processing for triangle
+	    // triangle(v_init,v_plateua,t_period)
+	    else if (src.fun == 'triangle') {
+		var v1 = arg_value(src.args,0,0);  // default init value: 0V
+		var v2 = arg_value(src.args,1,1);  // default plateau value: 1V
+		var freq = Math.abs(arg_value(src.args,2,1));  // default frequency: 1s
+		src.args = [v1,v2,freq];  // remember any defaulted values
+
+		var per = freq == 0 ? Infinity : 1/freq;
+		pwl_source(src,[0,v1,per/2,v2,per,v1],true);
+	    }
+
+	    // post-processing for pwl and pwlr sources
+	    // pwl[r](t1,v1,t2,v2,...)
+	    else if (src.fun == 'pwl' || src.fun == 'pwl_repeating') {
+		pwl_source(src,src.args,src.fun == 'pwl_repeating');
+	    }
+
+	    // post-processing for pulsed sources
+	    // pulse(v_init,v_plateau,t_delay,t_rise,t_fall,t_width,t_period)
+	    else if (src.fun == 'pulse') {
+		var v1 = arg_value(src.args,0,0);  // default init value: 0V
+		var v2 = arg_value(src.args,1,1);  // default plateau value: 1V
+		var td = Math.max(0,arg_value(src.args,2,0));  // time pulse starts
+		var tr = Math.abs(arg_value(src.args,3,1e-9));  // default rise time: 1ns
+		var tf = Math.abs(arg_value(src.args,4,1e-9));  // default rise time: 1ns
+		var pw = Math.abs(arg_value(src.args,5,1e9));  // default pulse width: "infinite"
+		var per = Math.abs(arg_value(src.args,6,1e9));  // default period: "infinite"
+		src.args = [v1,v2,td,tr,tf,pw,per];
+
+		var t1 = td;       // time when v1 -> v2 transition starts
+		var t2 = t1 + tr;  // time when v1 -> v2 transition ends
+		var t3 = t2 + pw;  // time when v2 -> v1 transition starts
+		var t4 = t3 + tf;  // time when v2 -> v1 transition ends
+
+		pwl_source(src,[t1,v1, t2,v2, t3,v2, t4,v1, per,v1],true);
+	    }
+
+	    // post-processing for sinusoidal sources
+	    // sin(v_offset,v_amplitude,freq_hz,t_delay,phase_offset_degrees)
+	    else if (src.fun == 'sin') {
+		var voffset = arg_value(src.args,0,0);  // default offset voltage: 0V
+		var va = arg_value(src.args,1,1);  // default amplitude: -1V to 1V
+		var freq = Math.abs(arg_value(src.args,2,1));  // default frequency: 1Hz
+		src.period = 1.0/freq;
+
+		var td = Math.max(0,arg_value(src.args,3,0));  // default time delay: 0sec
+		var phase = arg_value(src.args,4,0);  // default phase offset: 0 degrees
+		src.args = [voffset,va,freq,td,phase];
+
+		phase /= 360.0;
+
+		// return value of source at time t
+		src.value = function(t) {  // closure
+		    if (t < td) return voffset + va*Math.sin(2*Math.PI*phase);
+		    else return voffset + va*Math.sin(2*Math.PI*(freq*(t - td) + phase));
+		}
+
+		// return time of next inflection point after time t
+		src.inflection_point = function(t) {	// closure
+		    if (t < td) return td;
+		    else return undefined;
+		}
+	    }
+	
+	    // object has all the necessary info to compute the source value and inflection points
+	    src.dc = src.value(0);   // DC value is value at time 0
+	    return src;
+	}
+
+	function pwl_source(src,tv_pairs,repeat) {
+	    var nvals = tv_pairs.length;
+	    if (repeat)
+		src.period = tv_pairs[nvals-2];  // Repeat period of source
+	    if (nvals % 2 == 1) npts -= 1;  // make sure it's even!
+
+	    if (nvals <= 2) {
+		// handle degenerate case
+		src.value = function(t) { return nvals == 2 ? tv_pairs[1] : 0; }
+		src.inflection_point = function(t) { return undefined; }
+	    } else {
+		src.value = function(t) { // closure
+		    if (repeat)
+			// make time periodic if values are to be repeated
+			t = Math.fmod(t,tv_pairs[nvals-2]);
+		    var last_t = tv_pairs[0];
+		    var last_v = tv_pairs[1];
+		    if (t > last_t) {
+			var next_t,next_v;
+			for (var i = 2; i < nvals; i += 2) {
+			    next_t = tv_pairs[i];
+			    next_v = tv_pairs[i+1];
+			    if (next_t > last_t)  // defend against bogus tv pairs
+				if (t < next_t)
+				    return last_v + (next_v - last_v)*(t - last_t)/(next_t - last_t);
+			    last_t = next_t;
+			    last_v = next_v;
+			}
+		    }
+		    return last_v;
+		}
+		src.inflection_point = function(t) {  // closure
+		    if (repeat)
+			// make time periodic if values are to be repeated
+			t = Math.fmod(t,tv_pairs[nvals-2]);
+		    for (var i = 0; i < nvals; i += 2) {
+			var next_t = tv_pairs[i];
+			if (t < next_t) return next_t;
+		    }
+		    return undefined;
+		}
+	    }
+	}
+
+	// helper function: return args[index] if present, else default_v
+	function arg_value(args,index,default_v) {
+	    if (index < args.length) {
+		var result = args[index];
+		if (result === undefined) result = default_v;
+		return result;
+	    } else return default_v;
+	}
+
+	// we need fmod in the Math library!
+	Math.fmod = function(numerator,denominator) {
+	    var quotient = Math.floor(numerator/denominator);
+	    return numerator - quotient*denominator;
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Sources
+	//
+	///////////////////////////////////////////////////////////////////////////////
+
+        function VSource(npos,nneg,branch,v) {
+	    Device.call(this);
+	    
+	    this.src = parse_source(v);
+	    this.npos = npos;
+	    this.nneg = nneg;
+	    this.branch = branch;
+	}
+	VSource.prototype = new Device();
+	VSource.prototype.constructor = VSource;
+
+	// load linear part for source evaluation
+        VSource.prototype.load_linear = function(ckt) {
+	    // MNA stamp for independent voltage source
+	    ckt.add_to_Gl(this.branch,this.npos,1.0);
+	    ckt.add_to_Gl(this.branch,this.nneg,-1.0);
+	    ckt.add_to_Gl(this.npos,this.branch,1.0);
+	    ckt.add_to_Gl(this.nneg,this.branch,-1.0);
+	}
+
+	// Source voltage added to b.
+        VSource.prototype.load_dc = function(ckt,soln,rhs) {
+	    ckt.add_to_rhs(this.branch,this.src.dc,rhs);  
+	}
+
+	// Load time-dependent value for voltage source for tran
+        VSource.prototype.load_tran = function(ckt,soln,rhs,time) {
+	    ckt.add_to_rhs(this.branch,this.src.value(time),rhs);  
+	}
+
+	// return time of next breakpoint for the device
+	VSource.prototype.breakpoint = function(time) {
+	    return this.src.inflection_point(time);
+	}
+
+	// small signal model ac value
+        VSource.prototype.load_ac = function(ckt,rhs) {
+	    ckt.add_to_rhs(this.branch,1.0,rhs);
+	}
+
+	function ISource(npos,nneg,v) {
+	    Device.call(this);
+
+	    this.src = parse_source(v);
+	    this.npos = npos;
+	    this.nneg = nneg;
+	}
+	ISource.prototype = new Device();
+	ISource.prototype.constructor = ISource;
+
+        ISource.prototype.load_linear = function(ckt) {
+	    // Current source is open when off, no linear contribution
+	}
+
+	// load linear system equations for dc analysis
+	ISource.prototype.load_dc = function(ckt,soln,rhs) {
+	    var is = this.src.dc;
+
+	    // MNA stamp for independent current source
+	    ckt.add_to_rhs(this.npos,-is,rhs);  // current flow into npos
+	    ckt.add_to_rhs(this.nneg,is,rhs);   // and out of nneg
+	}
+
+	// load linear system equations for tran analysis (just like DC)
+        ISource.prototype.load_tran = function(ckt,soln,rhs,time) {
+	    var is = this.src.value(time);
+
+	    // MNA stamp for independent current source
+	    ckt.add_to_rhs(this.npos,-is,rhs);  // current flow into npos
+	    ckt.add_to_rhs(this.nneg,is,rhs);   // and out of nneg
+	}
+
+	// return time of next breakpoint for the device
+	ISource.prototype.breakpoint = function(time) {
+	    return this.src.inflection_point(time);
+	}
+
+	// small signal model: open circuit
+        ISource.prototype.load_ac = function(ckt,rhs) {
+	    // MNA stamp for independent current source
+	    ckt.add_to_rhs(this.npos,-1.0,rhs);  // current flow into npos
+	    ckt.add_to_rhs(this.nneg,1.0,rhs);   // and out of nneg
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Resistor
+	//
+	///////////////////////////////////////////////////////////////////////////////
+
+	function Resistor(n1,n2,v) {
+	    Device.call(this);
+	    this.n1 = n1;
+	    this.n2 = n2;
+	    this.g = 1.0/v;
+	}
+	Resistor.prototype = new Device();
+	Resistor.prototype.constructor = Resistor;
+
+        Resistor.prototype.load_linear = function(ckt) {
+	    // MNA stamp for admittance g
+	    ckt.add_conductance_l(this.n1,this.n2,this.g);
+	}
+
+	Resistor.prototype.load_dc = function(ckt) {
+	    // Nothing to see here, move along.
+	}
+
+	Resistor.prototype.load_tran = function(ckt,soln) {
+	}
+
+	Resistor.prototype.load_ac = function(ckt) {
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Diode
+	//
+	///////////////////////////////////////////////////////////////////////////////
+
+	function Diode(n1,n2,v,type) {
+	    Device.call(this);
+	    this.anode = n1;
+	    this.cathode = n2;
+	    this.area = v;
+	    this.type = type;  // 'normal' or 'ideal'
+	    this.is = 1.0e-14;
+	    this.ais = this.area * this.is;
+	    this.vt = (type == 'normal') ? 25.8e-3 : 0.1e-3;  // 26mv or .1mv
+	    this.exp_arg_max = 50;  // less than single precision max.
+	    this.exp_max = Math.exp(this.exp_arg_max);
+	}
+	Diode.prototype = new Device();
+        Diode.prototype.constructor = Diode;
+
+        Diode.prototype.load_linear = function(ckt) {
+	    // Diode is not linear, has no linear piece.
+	}
+
+        Diode.prototype.load_dc = function(ckt,soln,rhs) {
+	    var vd = ckt.get_two_terminal(this.anode, this.cathode, soln);
+	    var exp_arg = vd / this.vt;
+	    var temp1, temp2;
+	    // Estimate exponential with a quadratic if arg too big.
+	    var abs_exp_arg = Math.abs(exp_arg);
+	    var d_arg = abs_exp_arg - this.exp_arg_max;
+	    if (d_arg > 0) {
+		var quad = 1 + d_arg + 0.5*d_arg*d_arg;
+		temp1 = this.exp_max * quad;
+		temp2 = this.exp_max * (1 + d_arg);
+	    } else {
+		temp1 = Math.exp(abs_exp_arg);
+		temp2 = temp1;
+	    }
+	    if (exp_arg < 0) {  // Use exp(-x) = 1.0/exp(x)
+		temp1 = 1.0/temp1;
+		temp2 = (temp1*temp2)*temp1;
+	    }
+	    var id = this.ais * (temp1 - 1);
+	    var gd = this.ais * (temp2 / this.vt);
+
+	    // MNA stamp for independent current source
+	    ckt.add_to_rhs(this.anode,-id,rhs);  // current flows into anode
+	    ckt.add_to_rhs(this.cathode,id,rhs);   // and out of cathode
+	    ckt.add_conductance(this.anode,this.cathode,gd);
+	}
+
+        Diode.prototype.load_tran = function(ckt,soln,rhs,time) {
+	    this.load_dc(ckt,soln,rhs);
+	}
+
+	Diode.prototype.load_ac = function(ckt) {
+	}
+
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Capacitor
+	//
+	///////////////////////////////////////////////////////////////////////////////
+
+	function Capacitor(n1,n2,v) {
+	    Device.call(this);
+	    this.n1 = n1;
+	    this.n2 = n2;
+	    this.value = v;
+	}
+	Capacitor.prototype = new Device();
+	Capacitor.prototype.constructor = Capacitor;
+
+        Capacitor.prototype.load_linear = function(ckt) {
+	    // MNA stamp for capacitance matrix 
+	    ckt.add_capacitance(this.n1,this.n2,this.value);
+	}
+
+	Capacitor.prototype.load_dc = function(ckt,soln,rhs) {
+	}
+
+	Capacitor.prototype.load_ac = function(ckt) {
+	}
+
+	Capacitor.prototype.load_tran = function(ckt) {
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Inductor
+	//
+	///////////////////////////////////////////////////////////////////////////////
+
+	function Inductor(n1,n2,branch,v) {
+	    Device.call(this);
+	    this.n1 = n1;
+	    this.n2 = n2;
+	    this.branch = branch;
+	    this.value = v;
+	}
+	Inductor.prototype = new Device();
+	Inductor.prototype.constructor = Inductor;
+
+        Inductor.prototype.load_linear = function(ckt) {
+	    // MNA stamp for inductor linear part
+	    // L on diag of C because L di/dt = v(n1) - v(n2)
+	    ckt.add_to_Gl(this.n1,this.branch,1);
+	    ckt.add_to_Gl(this.n2,this.branch,-1);
+	    ckt.add_to_Gl(this.branch,this.n1,-1);
+	    ckt.add_to_Gl(this.branch,this.n2,1);
+	    ckt.add_to_C(this.branch,this.branch,this.value)
+	}
+
+	Inductor.prototype.load_dc = function(ckt,soln,rhs) {
+	    // Inductor is a short at dc, so is linear.
+	}
+
+	Inductor.prototype.load_ac = function(ckt) {
+	}
+
+	Inductor.prototype.load_tran = function(ckt) {
+	}
+
+
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Simple Voltage-Controlled Voltage Source Op Amp model 
+	//
+	///////////////////////////////////////////////////////////////////////////////
+
+        function Opamp(np,nn,no,ng,branch,A,name) {
+	    Device.call(this);
+	    this.np = np;
+	    this.nn = nn;
+	    this.no = no;
+	    this.ng = ng;
+	    this.branch = branch;
+	    this.gain = A;
+	    this.name = name;
+	}
+
+	Opamp.prototype = new Device();
+        Opamp.prototype.constructor = Opamp;
+        
+        Opamp.prototype.load_linear = function(ckt) {
+            // MNA stamp for VCVS: 1/A(v(no) - v(ng)) - (v(np)-v(nn))) = 0.
+	    var invA = 1.0/this.gain;
+	    ckt.add_to_Gl(this.no,this.branch,1);
+	    ckt.add_to_Gl(this.ng,this.branch,-1);
+	    ckt.add_to_Gl(this.branch,this.no,invA);
+	    ckt.add_to_Gl(this.branch,this.ng,-invA);
+	    ckt.add_to_Gl(this.branch,this.np,-1);
+	    ckt.add_to_Gl(this.branch,this.nn,1);
+	}
+
+	Opamp.prototype.load_dc = function(ckt,soln,rhs) {
+	    // Op-amp is linear.
+	}
+
+	Opamp.prototype.load_ac = function(ckt) {
+	}
+
+	Opamp.prototype.load_tran = function(ckt) {
+	}
+
+
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Simplified MOS FET with no bulk connection and no body effect.
+	//
+	///////////////////////////////////////////////////////////////////////////////
+
+
+        function Fet(d,g,s,ratio,name,type) {
+	    Device.call(this);
+	    this.d = d;
+	    this.g = g;
+	    this.s = s;
+	    this.name = name;
+	    this.ratio = ratio;
+	    if (type != 'n' && type != 'p')
+	    { throw 'fet type is not n or p';
+	    }
+	    this.type_sign = (type == 'n') ? 1 : -1;
+	    this.vt = 0.5;
+	    this.kp = 20e-6;
+            this.beta = this.kp * this.ratio;
+	    this.lambda = 0.05;
+	}
+	Fet.prototype = new Device();
+        Fet.prototype.constructor = Fet;
+
+        Fet.prototype.load_linear = function(ckt) {
+	    // FET's are nonlinear, just like javascript progammers
+	}
+
+        Fet.prototype.load_dc = function(ckt,soln,rhs) {
+	    var vds = this.type_sign * ckt.get_two_terminal(this.d, this.s, soln);
+	    if (vds < 0) { // Drain and source have swapped roles
+		var temp = this.d;
+		this.d = this.s;
+		this.s = temp;
+		vds = this.type_sign * ckt.get_two_terminal(this.d, this.s, soln);
+	    }
+	    var vgs = this.type_sign * ckt.get_two_terminal(this.g, this.s, soln);
+	    var vgst = vgs - this.vt;
+	    with (this) {
+		var gmgs,ids,gds;
+		if (vgst > 0.0 ) { // vgst < 0, transistor off, no subthreshold here.
+		    if (vgst < vds) { /* Saturation. */
+			gmgs =  beta * (1 + (lambda * vds)) * vgst;
+			ids = type_sign * 0.5 * gmgs * vgst;
+			gds = 0.5 * beta * vgst * vgst * lambda;
+		    } else {  /* Linear region */
+			gmgs =  beta * (1 + lambda * vds);
+			ids = type_sign * gmgs * vds * (vgst - 0.50 * vds);
+			gds = gmgs * (vgst - vds) + beta * lambda * vds * (vgst - 0.5 * vds);
+			gmgs *= vds;
+		    }
+		    ckt.add_to_rhs(d,-ids,rhs);  // current flows into the drain
+		    ckt.add_to_rhs(s, ids,rhs);   // and out the source		    
+		    ckt.add_conductance(d,s,gds);
+		    ckt.add_to_G(s,s, gmgs);
+		    ckt.add_to_G(d,s,-gmgs);
+		    ckt.add_to_G(d,g, gmgs);
+		    ckt.add_to_G(s,g,-gmgs);
+		}
+	    }
+	}
+
+	Fet.prototype.load_tran = function(ckt,soln,rhs) {
+	    this.load_dc(ckt,soln,rhs);
+	}
+
+	Fet.prototype.load_ac = function(ckt) {
+	}
+
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Module definition
+	//
+	///////////////////////////////////////////////////////////////////////////////
+	var module = {
+	    'Circuit': Circuit,
+	    'parse_number': parse_number,
+	    'parse_source': parse_source,
+	}
+	return module;
+    }());
diff --git a/common/test/data/full/js/schematic.js b/common/test/data/full/js/schematic.js
new file mode 100644
index 0000000000..6e7e759235
--- /dev/null
+++ b/common/test/data/full/js/schematic.js
@@ -0,0 +1,4184 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+//  Simple schematic capture
+//
+////////////////////////////////////////////////////////////////////////////////
+
+// Copyright (C) 2011 Massachusetts Institute of Technology
+
+// add schematics to a document with 
+//
+//   <input type="hidden" class="schematic" name="unique_form_id" value="JSON netlist..." .../>
+//
+// other attributes you can add to the input tag:
+//   width -- width in pixels of diagram
+//   height -- height in pixels of diagram
+//   parts -- comma-separated list of parts for parts bin (see parts_map),
+//            parts="" disables editing of diagram
+
+// JSON schematic representation:
+//  sch :=  [part, part, ...]
+//  part := [type, coords, properties, connections]
+//  type := string (see parts_map)
+//  coords := [number, ...]  // (x,y,rot) or (x1,y1,x2,y2)
+//  properties := {name: value, ...}
+//  connections := [node, ...]   // one per connection point in canoncial order
+//  node := string
+// need a netlist? just use the part's type, properites and connections
+
+// TO DO:
+// - wire labels?
+// - zoom/scroll canvas
+// - rotate multiple objects around their center of mass
+// - rubber band wires when moving components
+
+// set up each schematic entry widget
+function update_schematics() {
+    // set up each schematic on the page
+    var schematics = document.getElementsByClassName('schematic');
+    for (var i = 0; i < schematics.length; ++i)
+	if (schematics[i].getAttribute("loaded") != "true") {
+	    try {
+		new schematic.Schematic(schematics[i]);
+	    } catch (err) {
+		var msgdiv = document.createElement('div');
+		msgdiv.style.border = 'thick solid #FF0000';
+		msgdiv.style.margins = '20px';
+		msgdiv.style.padding = '20px';
+		var msg = document.createTextNode('Sorry, there a browser error in starting the schematic tool.  The tool is known to be compatible with the latest versions of Firefox and Chrome, which we recommend you use.');
+		msgdiv.appendChild(msg);
+		schematics[i].parentNode.insertBefore(msgdiv,schematics[i]);
+	    }
+	    schematics[i].setAttribute("loaded","true");
+	}
+}
+
+// add ourselves to the tasks that get performed when window is loaded
+function add_schematic_handler(other_onload) {
+    return function() {
+	// execute othe onload functions first
+	if (other_onload) other_onload();
+
+	update_schematics();
+    }
+}
+window.onload = add_schematic_handler(window.onload);
+
+// ask each schematic input widget to update its value field for submission
+function prepare_schematics() {
+    var schematics = document.getElementsByClassName('schematic');
+    for (var i = schematics.length - 1; i >= 0; i--)
+	schematics[i].schematic.update_value();
+}
+
+schematic = (function() {
+	background_style = 'rgb(220,220,220)';
+	element_style = 'rgb(255,255,255)';
+	thumb_style = 'rgb(128,128,128)';
+	normal_style = 'rgb(0,0,0)';  // default drawing color
+	component_style = 'rgb(64,64,255)';  // color for unselected components
+	selected_style = 'rgb(64,255,64)';  // highlight color for selected components
+	grid_style = "rgb(128,128,128)";
+	annotation_style = 'rgb(255,64,64)';  // color for diagram annotations
+
+	property_size = 5;  // point size for Component property text
+	annotation_size = 6;  // point size for diagram annotations
+
+	// list of all the defined parts
+	parts_map = {
+	    'g': [Ground, 'Ground connection'],
+	    'L': [Label, 'Node label'],
+	    'v': [VSource, 'Voltage source'],
+	    'i': [ISource, 'Current source'],
+	    'r': [Resistor, 'Resistor'],
+	    'c': [Capacitor, 'Capacitor'],
+	    'l': [Inductor, 'Inductor'],
+	    'o': [OpAmp, 'Op Amp'],
+	    'd': [Diode, 'Diode'],
+	    'n': [NFet, 'NFet'],
+	    'p': [PFet, 'PFet'],
+	    's': [Probe, 'Voltage Probe'],
+	    'a': [Ammeter, 'Current Probe'],
+	};
+
+	// global clipboard
+	if (typeof sch_clipboard == 'undefined')
+	    sch_clipboard = [];
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Schematic = diagram + parts bin + status area
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	// setup a schematic by populating the <div> with the appropriate children
+	function Schematic(input) {
+	    // set up diagram viewing parameters
+	    this.grid = 8;
+	    this.scale = 2;
+	    this.origin_x = input.getAttribute("origin_x");
+	    if (this.origin_x == undefined) this.origin_x = 0;
+	    this.origin_y = input.getAttribute("origin_y");
+	    if (this.origin_y == undefined) this.origin_y = 0;
+
+	    this.window_list = [];  // list of pop-up windows in increasing z order
+
+	    // use user-supplied list of parts if supplied
+	    // else just populate parts bin with all the parts
+	    this.edits_allowed = true;
+	    var parts = input.getAttribute('parts');
+	    if (parts == undefined || parts == 'None') {
+		parts = new Array();
+		for (var p in parts_map) parts.push(p);
+	    } else if (parts == '') {
+		this.edits_allowed = false;
+		parts = [];
+	    } else parts = parts.split(',');
+
+	    // now add the parts to the parts bin
+	    this.parts_bin = [];
+	    for (var i = 0; i < parts.length; i++) {
+		var part = new Part(this);
+		var pm = parts_map[parts[i]];
+		part.set_component(new pm[0](0,0,0),pm[1]);
+		this.parts_bin.push(part);
+	    }
+
+	    // use user-supplied list of analyses, otherwise provide them all
+	    // analyses="" means no analyses
+	    var analyses = input.getAttribute('analyses');
+	    if (analyses == undefined || analyses == 'None')
+		analyses = ['dc','ac','tran'];
+	    else if (analyses == '') analyses = [];
+	    else analyses = analyses.split(',');
+
+	    if (parts.length == 0 && analyses.length == 0) this.diagram_only = true;
+	    else this.diagram_only = false;
+
+	    // see what we need to submit.  Expecting attribute of the form
+	    // submit_analyses="{'tran':[[node_name,t1,t2,t3],...],
+	    //                   'ac':[[node_name,f1,f2,...],...]}"
+	    var submit = input.getAttribute('submit_analyses');
+	    if (submit && submit.indexOf('{') != -1)
+		this.submit_analyses = JSON.parse(submit);
+	    else
+		this.submit_analyses = undefined;
+
+	    // toolbar
+	    this.tools = new Array();
+	    this.toolbar = [];
+
+	    if (!this.diagram_only) {
+		this.tools['help'] = this.add_tool(help_icon,'Help: display help page',this.help);
+		this.enable_tool('help',true);
+		this.toolbar.push(null);  // spacer
+	    }
+
+	    if (this.edits_allowed) {
+		this.tools['zoomin'] = this.add_tool(zoomin_icon,'Zoom In: increase display magnification',this.zoomin);
+		this.enable_tool('zoomin',true);
+		this.tools['zoomout'] = this.add_tool(zoomout_icon,'Zoom Out: decrease display magnification',this.zoomout);
+		this.enable_tool('zoomout',true);
+		this.tools['zoomall'] = this.add_tool(zoomall_icon,'Zoom All: show entire diagram',this.zoomall);
+		this.enable_tool('zoomall',true);
+
+		this.tools['cut'] = this.add_tool(cut_icon,'Cut: move selected components from diagram to the clipboard',this.cut);
+		this.tools['copy'] = this.add_tool(copy_icon,'Copy: copy selected components into the clipboard',this.copy);
+		this.tools['paste'] = this.add_tool(paste_icon,'Paste: copy clipboard into the diagram',this.paste);
+		this.toolbar.push(null);  // spacer
+	    }
+
+	    // simulation interface if cktsim.js is loaded
+	    if (typeof cktsim != 'undefined') {
+		if (analyses.indexOf('dc') != -1) {
+		    this.tools['dc'] = this.add_tool('DC','DC Analysis',this.dc_analysis);
+		    this.enable_tool('dc',true);
+		    this.dc_max_iters = '1000';  // default values dc solution
+		}
+
+		if (analyses.indexOf('ac') != -1) {
+		    this.tools['ac'] = this.add_tool('AC','AC Small-Signal Analysis',this.setup_ac_analysis);
+		    this.enable_tool('ac',true);
+		    this.ac_npts = '50'; // default values for AC Analysis
+		    this.ac_fstart = '10';
+		    this.ac_fstop = '1G';
+		    this.ac_source_name = undefined;
+		}
+
+		if (analyses.indexOf('tran') != -1) {
+		    this.tools['tran'] = this.add_tool('TRAN','Transient Analysis',this.transient_analysis);
+		    this.enable_tool('tran',true);
+		    this.tran_npts = '100';  // default values for transient analysis
+		    this.tran_tstop = '1';
+		}
+	    }
+ 
+	    // set up diagram canvas
+	    this.canvas = document.createElement('canvas');
+	    this.width = input.getAttribute('width');
+	    this.width = parseInt(this.width == undefined ? '400' : this.width);
+	    this.canvas.width = this.width;
+	    this.height = input.getAttribute('height');
+	    this.height = parseInt(this.height == undefined ? '300' : this.height);
+	    this.canvas.height = this.height;
+
+	    // repaint simply draws this buffer and then adds selected elements on top
+	    this.bg_image = document.createElement('canvas');
+	    this.bg_image.width = this.width;
+	    this.bg_image.height = this.height;
+
+	    if (!this.diagram_only) {
+		this.canvas.tabIndex = 1; // so we get keystrokes
+		this.canvas.style.borderStyle = 'solid';
+		this.canvas.style.borderWidth = '1px';
+		this.canvas.style.borderColor = grid_style;
+		this.canvas.style.outline = 'none';
+	    }
+
+	    this.canvas.schematic = this;
+	    if (this.edits_allowed) {
+		this.canvas.addEventListener('mousemove',schematic_mouse_move,false);
+		this.canvas.addEventListener('mouseover',schematic_mouse_enter,false);
+		this.canvas.addEventListener('mouseout',schematic_mouse_leave,false);
+		this.canvas.addEventListener('mousedown',schematic_mouse_down,false);
+		this.canvas.addEventListener('mouseup',schematic_mouse_up,false);
+		this.canvas.addEventListener('dblclick',schematic_double_click,false);
+		this.canvas.addEventListener('keydown',schematic_key_down,false);
+		this.canvas.addEventListener('keyup',schematic_key_up,false);
+	    }
+
+	    // set up message area
+	    if (!this.diagram_only) {
+		this.status_div = document.createElement('div');
+		this.status = document.createTextNode('');
+		this.status_div.appendChild(this.status);
+		this.status_div.style.height = status_height + 'px';
+	    } else this.status_div = undefined;
+
+	    this.connection_points = new Array();  // location string => list of cp's
+	    this.components = [];
+
+	    this.dragging = false;
+	    this.drawCursor = false;
+	    this.cursor_x = 0;
+	    this.cursor_y = 0;
+	    this.draw_cursor = undefined;
+	    this.select_rect = undefined;
+	    this.wire = undefined;
+
+	    this.operating_point = undefined;  // result from DC analysis
+	    this.dc_results = undefined;   // saved analysis results for submission
+	    this.ac_results = undefined;   // saved analysis results for submission
+	    this.transient_results = undefined;   // saved analysis results for submission
+
+	    // state of modifier keys
+	    this.ctrlKey = false;
+	    this.shiftKey = false;
+	    this.altKey = false;
+	    this.cmdKey = false;
+
+	    // make sure other code can find us!
+	    input.schematic = this;
+	    this.input = input;
+
+	    // set up DOM -- use nested tables to do the layout
+	    var table,tr,td;
+	    table = document.createElement('table');
+	    table.rules = 'none';
+	    if (!this.diagram_only) {
+		table.frame = 'box';
+		table.style.borderStyle = 'solid';
+		table.style.borderWidth = '2px';
+		table.style.borderColor = normal_style;
+		table.style.backgroundColor = background_style;
+	    }
+
+	    // add tools to DOM
+	    if (this.toolbar.length > 0) {
+		tr = document.createElement('tr');
+		table.appendChild(tr);
+		td = document.createElement('td');
+		td.style.verticalAlign = 'top';
+		td.colSpan = 2;
+		tr.appendChild(td);
+		for (var i = 0; i < this.toolbar.length; ++i) {
+		    var tool = this.toolbar[i];
+		    if (tool != null) td.appendChild(tool);
+		}
+	    }
+	    
+	    // add canvas and parts bin to DOM
+	    tr = document.createElement('tr');
+	    table.appendChild(tr);
+
+	    td = document.createElement('td');
+	    tr.appendChild(td);
+	    var wrapper = document.createElement('div'); // for inserting pop-up windows
+	    td.appendChild(wrapper);
+	    wrapper.style.position = 'relative';  // so we can position subwindows
+	    wrapper.appendChild(this.canvas);
+
+	    td = document.createElement('td');
+	    td.style.verticalAlign = 'top';
+	    tr.appendChild(td);
+	    var parts_table = document.createElement('table');
+	    td.appendChild(parts_table);
+	    parts_table.rules = 'none';
+	    parts_table.frame = 'void';
+	    parts_table.cellPadding = '0';
+	    parts_table.cellSpacing = '0';
+
+	    // fill in parts_table
+	    var parts_per_column = Math.floor(this.height / (part_h + 5));  // mysterious extra padding
+	    for (var i = 0; i < parts_per_column; ++i) {
+		tr = document.createElement('tr');
+		parts_table.appendChild(tr);
+		for (var j = i; j < this.parts_bin.length; j += parts_per_column) {
+		    td = document.createElement('td');
+		    tr.appendChild(td);
+		    td.appendChild(this.parts_bin[j].canvas);
+		}
+	    }
+
+	    if (this.status_div != undefined) {
+		tr = document.createElement('tr');
+		table.appendChild(tr);
+		td = document.createElement('td');
+		tr.appendChild(td);
+		td.colSpan = 2;
+		td.appendChild(this.status_div);
+	    }
+
+	    // add to dom
+	    // avoid Chrome bug that changes to text cursor whenever
+	    // drag starts.  Just do this in schematic tool...
+	    var toplevel = document.createElement('div');
+	    toplevel.onselectstart = function(){ return false; };
+	    toplevel.appendChild(table);
+	    this.input.parentNode.insertBefore(toplevel,this.input.nextSibling);
+
+	    // process initial contents of diagram
+	    this.load_schematic(this.input.getAttribute('value'),
+				this.input.getAttribute('initial_value'));
+	}
+
+	part_w = 42;   // size of a parts bin compartment
+	part_h = 42;
+	status_height = 18;
+
+	Schematic.prototype.add_component = function(new_c) {
+	    this.components.push(new_c);
+
+	    // create undoable edit record here
+	}
+
+	Schematic.prototype.remove_component = function(c) {
+	    var index = this.components.indexOf(c);
+	    if (index != -1) this.components.splice(index,1);
+	}
+
+	Schematic.prototype.find_connections = function(cp) {
+	    return this.connection_points[cp.location];
+	}
+
+	// add connection point to list of connection points at that location
+	Schematic.prototype.add_connection_point = function(cp) {
+	    var cplist = this.connection_points[cp.location];
+	    if (cplist) cplist.push(cp);
+	    else {
+		cplist = [cp];
+		this.connection_points[cp.location] = cplist;
+	    }
+
+	    // return list of conincident connection points
+	    return cplist;
+	}
+
+	// remove connection point from the list points at the old location
+	Schematic.prototype.remove_connection_point = function(cp,old_location) {
+	    // remove cp from list at old location
+	    var cplist = this.connection_points[old_location];
+	    if (cplist) {
+		var index = cplist.indexOf(cp);
+		if (index != -1) {
+		    cplist.splice(index,1);
+		    // if no more connections at this location, remove
+		    // entry from array to keep our search time short
+		    if (cplist.length == 0)
+			delete this.connection_points[old_location];
+		}
+	    }
+	}
+
+	// connection point has changed location: remove, then add
+	Schematic.prototype.update_connection_point = function(cp,old_location) {
+	    this.remove_connection_point(cp,old_location);
+	    return this.add_connection_point(cp);
+	}
+
+	// add a wire to the schematic
+	Schematic.prototype.add_wire = function(x1,y1,x2,y2) {
+	    var new_wire = new Wire(x1,y1,x2,y2);
+	    new_wire.add(this);
+	    new_wire.move_end();
+	    return new_wire;
+	}
+
+	Schematic.prototype.split_wire = function(w,cp) {
+	    // remove bisected wire
+	    w.remove();
+
+	    // add two new wires with connection point cp in the middle
+	    this.add_wire(w.x,w.y,cp.x,cp.y);
+	    this.add_wire(w.x+w.dx,w.y+w.dy,cp.x,cp.y);
+	}
+
+	// see if connection points of component c split any wires
+	Schematic.prototype.check_wires = function(c) {
+	    for (var i = 0; i < this.components.length; i++) {
+		var cc = this.components[i];
+		if (cc != c) {  // don't check a component against itself
+		    // only wires will return non-null from a bisect call
+		    var cp = cc.bisect(c);
+		    if (cp) {
+			// cc is a wire bisected by connection point cp
+			this.split_wire(cc,cp);
+			this.redraw_background();
+		    }
+		}
+	    }
+	}
+
+	// see if there are any existing connection points that bisect wire w
+	Schematic.prototype.check_connection_points = function(w) {
+	    for (var locn in this.connection_points) {
+		var cplist = this.connection_points[locn];
+		if (cplist && w.bisect_cp(cplist[0])) {
+		    this.split_wire(w,cplist[0]);
+		    this.redraw_background();
+
+		    // stop here, new wires introduced by split will do their own checks
+		    return;
+		}
+	    }
+	}
+
+	// merge collinear wires sharing an end point
+	Schematic.prototype.clean_up_wires = function() {
+	    for (var locn in this.connection_points) {
+		var cplist = this.connection_points[locn];
+		if (cplist && cplist.length == 2) {
+		    // found a connection with just two connections, see if they're wires
+		    var c1 = cplist[0].parent;
+		    var c2 = cplist[1].parent;
+		    if (c1.type == 'w' && c2.type == 'w') {
+			var e1 = c1.other_end(cplist[0]);
+			var e2 = c2.other_end(cplist[1]);
+			var e3 = cplist[0];  // point shared by the two wires
+			if (collinear(e1,e2,e3)) {
+			    c1.remove();
+			    c2.remove();
+			    this.add_wire(e1.x,e1.y,e2.x,e2.y);
+			}
+		    }
+		}
+	    }
+	}
+
+	Schematic.prototype.unselect_all = function(which) {
+	    this.operating_point = undefined;  // remove annotations
+
+	    for (var i = this.components.length - 1; i >= 0; --i)
+		if (i != which) this.components[i].set_select(false);
+	}
+
+	Schematic.prototype.drag_begin = function() {
+	    // let components know they're about to move
+	    for (var i = this.components.length - 1; i >= 0; --i) {
+		var component = this.components[i];
+		if (component.selected) component.move_begin();
+	    }
+
+	    // remember where drag started
+	    this.drag_x = this.cursor_x;
+	    this.drag_y = this.cursor_y;
+	    this.dragging = true;
+	}
+
+	Schematic.prototype.drag_end = function() {
+	    // let components know they're done moving
+	    for (var i = this.components.length - 1; i >= 0; --i) {
+		var component = this.components[i];
+		if (component.selected) component.move_end();
+	    }
+	    this.dragging = false;
+
+	    this.clean_up_wires();
+	    this.redraw_background();
+	}
+
+	Schematic.prototype.help = function() {
+	    window.open('/static/handouts/schematic_tutorial.pdf');
+	}
+
+	// zoom diagram around current center point
+	Schematic.prototype.rescale = function(nscale) {
+	    var cx = this.origin_x + this.width/(2*this.scale);
+	    var cy = this.origin_y + this.height/(2*this.scale);
+
+	    this.scale = nscale;
+
+	    this.origin_x = cx - this.width/(2*this.scale);
+	    this.origin_y = cy - this.height/(2*this.scale);
+
+	    this.redraw_background();
+	}
+
+	Schematic.prototype.zoomin = function() {
+	    this.rescale(this.scale * 1.5);
+	}
+
+	Schematic.prototype.zoomout = function() {
+	    this.rescale(this.scale / 1.5);
+	}
+
+	Schematic.prototype.zoomall = function() {
+	    // w,h for schematic
+	    var sch_w = this.bbox[2] - this.bbox[0];
+	    var sch_h = this.bbox[3] - this.bbox[1];
+
+	    // compute scales that would make schematic fit, choose smallest
+	    var scale_x = this.width/sch_w;
+	    var scale_y = this.height/sch_h;
+	    this.scale = Math.min(scale_x,scale_y);
+
+	    // center the schematic
+	    var cx = (this.bbox[2] + this.bbox[0])/2;
+	    var cy = (this.bbox[3] + this.bbox[1])/2;
+	    this.origin_x = cx - this.width/(2*this.scale);
+	    this.origin_y = cy - this.height/(2*this.scale);
+
+	    this.redraw_background();
+	}
+
+	Schematic.prototype.cut = function() {
+	    // clear previous contents
+	    sch_clipboard = [];
+
+	    // look for selected components, move them to clipboard.
+	    for (var i = this.components.length - 1; i >=0; --i) {
+		var c = this.components[i];
+		if (c.selected) {
+		    c.remove();
+		    sch_clipboard.push(c);
+		}
+	    }
+
+	    // update diagram view
+	    this.redraw();
+	}
+
+	Schematic.prototype.copy = function() {
+	    // clear previous contents
+	    sch_clipboard = [];
+
+	    // look for selected components, copy them to clipboard.
+	    for (var i = this.components.length - 1; i >=0; --i) {
+		var c = this.components[i];
+		if (c.selected)
+		    sch_clipboard.push(c.clone(c.x,c.y));
+	    }
+	}
+
+	Schematic.prototype.paste = function() {
+	    // compute left,top of bounding box for origins of
+	    // components in the clipboard
+	    var left = undefined;
+	    var top = undefined;
+	    for (var i = sch_clipboard.length - 1; i >= 0; --i) {
+		var c = sch_clipboard[i];
+		left = left ? Math.min(left,c.x) : c.x;
+		top = top ? Math.min(top,c.y) : c.y;
+	    }
+
+	    this.message('cursor '+this.cursor_x+','+this.cursor_y);
+
+	    // clear current selections
+	    this.unselect_all(-1);
+	    this.redraw_background();  // so we see any components that got unselected
+
+	    // make clones of components on the clipboard, positioning
+	    // them relative to the cursor
+	    for (var i = sch_clipboard.length - 1; i >= 0; --i) {
+		var c = sch_clipboard[i];
+		var new_c = c.clone(this.cursor_x + (c.x - left),this.cursor_y + (c.y - top));
+		new_c.set_select(true);
+		new_c.add(this);
+	    }
+
+	    // see what we've wrought
+	    this.redraw();
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Netlist and Simulation interface
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	// load diagram from JSON representation
+	Schematic.prototype.load_schematic = function(value,initial_value) {
+	    // use default value if no schematic info in value
+	    if (value == undefined || value.indexOf('[') == -1)
+		value = initial_value;
+	    
+	    if (value && value.indexOf('[') != -1) {
+		// convert string value into data structure
+		var json = JSON.parse(value);
+
+		// top level is a list of components
+		for (var i = json.length - 1; i >= 0; --i) {
+		    var c = json[i];
+		    if (c[0] == 'view') {
+			// special hack: view component lets us recreate view
+			this.origin_x = c[1];
+			this.origin_y = c[2];
+			this.scale = c[3];
+			//this.ac_npts = c[4];
+			this.ac_fstart = c[5];
+			this.ac_fstop = c[6];
+			this.ac_source_name = c[7];
+			this.tran_npts = c[8];
+			this.tran_tstop = c[9];
+			this.dc_max_iters = c[10];
+		    } else if (c[0] == 'w') {
+			// wire
+			this.add_wire(c[1][0],c[1][1],c[1][2],c[1][3]);
+		    } else if (c[0] == 'dc') {
+			this.dc_results = c[1];
+		    } else if (c[0] == 'transient') {
+			this.transient_results = c[1];
+		    } else if (c[0] == 'ac') {
+			this.ac_results = c[1];
+		    } else {
+			// ordinary component
+			//  c := [type, coords, properties, connections]
+			var type = c[0];
+			var coords = c[1];
+			var properties = c[2];
+
+			// make the part
+			var part = new parts_map[type][0](coords[0],coords[1],coords[2]);
+
+			// give it its properties
+			for (var name in properties)
+			    part.properties[name] = properties[name];
+
+			// add component to the diagram
+			part.add(this);
+		    }
+		}
+	    }
+
+	    // see what we've got!
+	    this.redraw_background();
+	}
+
+	// label all the nodes in the circuit
+	Schematic.prototype.label_connection_points = function() {
+	    // start by clearing all the connection point labels
+	    for (var i = this.components.length - 1; i >=0; --i)
+		this.components[i].clear_labels();
+
+	    // components are in charge of labeling their unlabeled connections.
+	    // labels given to connection points will propagate to coincident connection
+	    // points and across Wires.
+
+	    // let special components like GND label their connection(s)
+	    for (var i = this.components.length - 1; i >=0; --i)
+		this.components[i].add_default_labels();
+
+	    // now have components generate labels for unlabeled connections
+	    this.next_label = 0;
+	    for (var i = this.components.length - 1; i >=0; --i)
+		this.components[i].label_connections();
+	}
+
+	// generate a new label
+	Schematic.prototype.get_next_label = function() {
+	    // generate next label in sequence
+	    this.next_label += 1;
+	    return this.next_label.toString();
+	}
+
+	// propagate label to coincident connection points
+	Schematic.prototype.propagate_label = function(label,location) {
+	    var cplist = this.connection_points[location];
+	    for (var i = cplist.length - 1; i >= 0; --i)
+		cplist[i].propagate_label(label);
+	}
+
+	// update the value field of our corresponding input field with JSON
+	// representation of schematic
+	Schematic.prototype.update_value = function() {
+	    // label connection points
+	    this.label_connection_points();
+
+	    // build JSON data structure, convert to string value for
+	    // input field
+	    this.input.value = JSON.stringify(this.json_with_analyses());
+	}
+
+	// produce a JSON representation of the diagram
+	Schematic.prototype.json = function() {
+	    var json = [];
+
+	    // output all the components/wires in the diagram
+	    var n = this.components.length;
+	    for (var i = 0; i < n; i++)
+		json.push(this.components[i].json(i));
+
+	    // capture the current view parameters
+	    json.push(['view',this.origin_x,this.origin_y,this.scale,
+		       this.ac_npts,this.ac_fstart,this.ac_fstop,
+		       this.ac_source_name,this.tran_npts,this.tran_tstop,
+		       this.dc_max_iters]);
+
+	    return json;
+	}
+
+	// produce a JSON representation of the diagram
+	Schematic.prototype.json_with_analyses = function() {
+	    var json = this.json();
+
+	    if (this.dc_results != undefined) json.push(['dc',this.dc_results]);
+	    if (this.ac_results != undefined) json.push(['ac',this.ac_results]);
+	    if (this.transient_results != undefined) json.push(['transient',this.transient_results]);
+
+	    return json;
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Simulation interface
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	Schematic.prototype.extract_circuit = function() {
+	    // give all the circuit nodes a name, extract netlist
+	    this.label_connection_points();
+	    var netlist = this.json();
+
+	    // since we've done the heavy lifting, update input field value
+	    // so user can grab diagram if they want
+	    this.input.value = JSON.stringify(netlist);
+
+	    // create a circuit from the netlist
+	    var ckt = new cktsim.Circuit();
+	    if (ckt.load_netlist(netlist))
+		return ckt;
+	    else
+		return null;
+	}
+
+	Schematic.prototype.dc_analysis = function() {
+	    // remove any previous annotations
+	    this.unselect_all(-1);
+	    this.redraw_background();
+
+	    var ckt = this.extract_circuit();
+	    if (ckt === null) return;
+
+	    // run the analysis
+	    this.operating_point = ckt.dc();
+
+	    if (this.operating_point != undefined) {
+		// save a copy of the results for submission
+		this.dc_results = {};
+		for (var i in this.operating_point) this.dc_results[i] = this.operating_point[i];
+
+		// display results on diagram
+		this.redraw();
+	    }
+	}
+
+	// return a list of [color,node_label,offset,type] for each probe in the diagram
+	// type == 'voltage' or 'current'
+	Schematic.prototype.find_probes = function() {
+	    var result = [];
+	    var result = [];
+	    for (var i = this.components.length - 1; i >= 0; --i) {
+		var c = this.components[i];
+		var info = c.probe_info();
+		if (info != undefined) result.push(c.probe_info());
+	    }
+	    return result;
+	}
+
+	// use a dialog to get AC analysis parameters
+	Schematic.prototype.setup_ac_analysis = function() {
+	    this.unselect_all(-1);
+	    this.redraw_background();
+
+	    var npts_lbl = 'Number of points/decade';
+	    var fstart_lbl = 'Starting frequency (Hz)';
+	    var fstop_lbl = 'Ending frequency (Hz)';
+	    var source_name_lbl = 'Name of V or I source for ac'
+    
+	    if (this.find_probes().length == 0) {
+		alert("AC Analysis: there are no voltage probes in the diagram!");
+		return;
+	    }
+
+	    var fields = new Array();
+	    //fields[npts_lbl] = build_input('text',10,this.ac_npts);
+	    fields[fstart_lbl] = build_input('text',10,this.ac_fstart);
+	    fields[fstop_lbl] = build_input('text',10,this.ac_fstop);
+	    fields[source_name_lbl] = build_input('text',10,this.ac_source_name);
+
+	    var content = build_table(fields);
+	    content.fields = fields;
+	    content.sch = this;
+
+	    this.dialog('AC Analysis',content,function(content) {
+		    var sch = content.sch;
+
+		    // retrieve parameters, remember for next time
+		    //sch.ac_npts = content.fields[npts_lbl].value;
+		    sch.ac_fstart = content.fields[fstart_lbl].value;
+		    sch.ac_fstop = content.fields[fstop_lbl].value;
+		    sch.ac_source_name = content.fields[source_name_lbl].value;
+
+		    sch.ac_analysis(cktsim.parse_number(sch.ac_npts),
+				    cktsim.parse_number(sch.ac_fstart),
+				    cktsim.parse_number(sch.ac_fstop),
+				    sch.ac_source_name);
+		});
+	}
+
+	// perform ac analysis
+	Schematic.prototype.ac_analysis = function(npts,fstart,fstop,ac_source_name) {
+	    // run the analysis
+	    var ckt = this.extract_circuit();
+	    if (ckt === null) return;
+	    var results = ckt.ac(npts,fstart,fstop,ac_source_name);
+
+	    if (typeof results == 'string') 
+		this.message(results);
+	    else {
+		var x_values = results['_frequencies_'];
+
+		// x axis will be a log scale
+		for (var i = x_values.length - 1; i >= 0; --i)
+		    x_values[i] = Math.log(x_values[i])/Math.LN10;
+
+
+		if (this.submit_analyses != undefined) {
+		    var submit = this.submit_analyses['ac'];
+		    if (submit != undefined) {
+			// save a copy of the results for submission
+			this.ac_results = {};
+
+			// save requested values for each requested node
+			for (var j = 0; j < submit.length; j++) {
+			    var flist = submit[j];    // [node_name,f1,f2,...]
+			    var node = flist[0];
+			    var values = results[node];
+			    var fvlist = [];
+			    // for each requested freq, interpolate response value
+			    for (var k = 1; k < flist.length; k++) {
+				var f = flist[k];
+				var v = interpolate(f,x_values,values);
+				// convert to dB
+				fvlist.push([f,v == undefined ? 'undefined' : 20.0 * Math.log(v)/Math.LN10]);
+			    }
+			    // save results as list of [f,response] paris
+			    this.ac_results[node] = fvlist;
+			}
+		    }
+		}
+
+		// set up plot values for each node with a probe
+		var y_values = [];  // list of [color, result_array]
+		var z_values = [];  // list of [color, result_array]
+		var probes = this.find_probes();
+
+		var probe_maxv = [];
+		var probe_color = [];
+
+		// Check for probe with near zero transfer function and warn
+		for (var i = probes.length - 1; i >= 0; --i) {
+		    if (probes[i][3] != 'voltage') continue;
+		    probe_color[i] = probes[i][0];
+		    var label = probes[i][1];
+		    var v = results[label];
+		    probe_maxv[i] = array_max(v); // magnitudes always > 0
+		}
+		var all_max = array_max(probe_maxv);
+
+		if (all_max < 1.0e-16) {
+		    alert('Zero ac response, -infinity on DB scale.');
+		} else {
+		    for (var i = probes.length - 1; i >= 0; --i) {
+			if (probes[i][3] != 'voltage') continue;
+			if ((probe_maxv[i] / all_max) < 1.0e-10) {
+			    alert('Near zero ac response, remove ' + probe_color[i] + ' probe');
+			    return;
+			}
+		    }
+		}
+
+		for (var i = probes.length - 1; i >= 0; --i) {
+		    if (probes[i][3] != 'voltage') continue;
+		    var color = probes[i][0];
+		    var label = probes[i][1];
+		    var offset = cktsim.parse_number(probes[i][2]);
+
+		    var v = results[label];
+		    // convert values into dB relative to source amplitude
+		    var v_max = 1;
+		    for (var j = v.length - 1; j >= 0; --j)
+			// convert each value to dB relative to max
+			v[j] = 20.0 * Math.log(v[j]/v_max)/Math.LN10;
+		    y_values.push([color,offset,v]);
+
+		    var v = results[label+'_phase'];
+		    z_values.push([color,0,v]);
+		}
+
+		// graph the result and display in a window
+		var graph2 = this.graph(x_values,'log(Frequency in Hz)',z_values,'degrees');
+		this.window('AC Analysis - Phase',graph2);
+		var graph1 = this.graph(x_values,'log(Frequency in Hz)',y_values,'dB');
+		this.window('AC Analysis - Magnitude',graph1,50);
+	    }
+	}
+
+	Schematic.prototype.transient_analysis = function() {
+	    this.unselect_all(-1);
+	    this.redraw_background();
+
+	    var npts_lbl = 'Minimum number of timepoints';
+	    var tstop_lbl = 'Stop Time (seconds)';
+    
+	    var probes = this.find_probes();
+	    if (probes.length == 0) {
+		alert("Transient Analysis: there are no probes in the diagram!");
+		return;
+	    }
+
+	    var fields = new Array();
+	    //fields[npts_lbl] = build_input('text',10,this.tran_npts);
+	    fields[tstop_lbl] = build_input('text',10,this.tran_tstop);
+
+	    var content = build_table(fields);
+	    content.fields = fields;
+	    content.sch = this;
+
+	    this.dialog('Transient Analysis',content,function(content) {
+		    var sch = content.sch;
+		    var ckt = sch.extract_circuit();
+		    if (ckt === null) return;
+
+		    // retrieve parameters, remember for next time
+		    //sch.tran_npts = content.fields[npts_lbl].value;
+		    sch.tran_tstop = content.fields[tstop_lbl].value;
+
+		    // gather a list of nodes that are being probed.  These
+		    // will be added to the list of nodes checked during the
+		    // LTE calculations in transient analysis
+		    var probe_list = sch.find_probes();
+		    var probe_names = new Array(probe_list.length);
+		    for (var i = probe_list.length - 1; i >= 0; --i)
+			probe_names[i] = probe_list[i][1];
+
+		    // run the analysis
+		    var results = ckt.tran(ckt.parse_number(sch.tran_npts), 0,
+					   ckt.parse_number(sch.tran_tstop), probe_names, false);
+
+		    if (typeof results == 'string') 
+			sch.message(results);
+		    else {
+			if (sch.submit_analyses != undefined) {
+			    var submit = sch.submit_analyses['tran'];
+			    if (submit != undefined) {
+				// save a copy of the results for submission
+				sch.transient_results = {};
+				var times = results['_time_'];
+
+				// save requested values for each requested node
+				for (var j = 0; j < submit.length; j++) {
+				    var tlist = submit[j];    // [node_name,t1,t2,...]
+				    var node = tlist[0];
+				    var values = results[node];
+				    var tvlist = [];
+				    // for each requested time, interpolate waveform value
+				    for (var k = 1; k < tlist.length; k++) {
+					var t = tlist[k];
+					var v = interpolate(t,times,values);
+					tvlist.push([t,v == undefined ? 'undefined' : v]);
+				    }
+				    // save results as list of [t,value] pairs
+				    sch.transient_results[node] = tvlist;
+				}
+			    }
+			}
+
+			var x_values = results['_time_'];
+			var x_legend = 'Time';
+
+			// set up plot values for each node with a probe
+			var v_values = [];  // voltage values: list of [color, result_array]
+			var i_values = [];  // current values: list of [color, result_array]
+			var probes = sch.find_probes();
+
+			for (var i = probes.length - 1; i >= 0; --i) {
+			    var color = probes[i][0];
+			    var label = probes[i][1];
+			    var offset = cktsim.parse_number(probes[i][2]);
+			    var v = results[label];
+			    if (v == undefined) {
+				alert('The ' + color + ' probe is connected to node ' + '"' + label + '"' + ' which is not an actual circuit node');
+			    } else if (probes[i][3] == 'voltage') {
+				if (color == 'x-axis') {
+				    x_values = v;
+				    x_legend = 'Voltage';
+				} else v_values.push([color,offset,v]);
+			    } else {
+				if (color == 'x-axis') {
+				    x_values = v;
+				    x_legend = 'Current';
+				} else i_values.push([color,offset,v]);
+			    }
+			}
+
+			// graph the result and display in a window
+			var graph = sch.graph(x_values,x_legend,v_values,'Voltage',i_values,'Current');
+			sch.window('Results of Transient Analysis',graph);
+		    }
+	    })
+	}
+
+	// t is the time at which we want a value
+	// times is a list of timepoints from the simulation
+	function interpolate(t,times,values) {
+	    if (values == undefined) return undefined;
+
+	    for (var i = 0; i < times.length; i++)
+		if (t < times[i]) {
+		    // t falls between times[i-1] and times[i]
+		    var t1 = (i == 0) ? times[0] : times[i-1];
+		    var t2 = times[i];
+
+		    if (t2 == undefined) return undefined;
+
+		    var v1 = (i == 0) ? values[0] : values[i-1];
+		    var v2 = values[i];
+		    var v = v1;
+		    if (t != t1) v += (t - t1)*(v2 - v1)/(t2 - t1);
+		    return v;
+		}
+	}
+
+	// external interface for setting the property value of a named component
+	Schematic.prototype.set_property = function(component_name,property,value) {
+	    this.unselect_all(-1);
+
+	    for (var i = this.components.length - 1; i >= 0; --i) {
+		var component = this.components[i];
+		if (component.properties['name'] == component_name) {
+		    component.properties[property] = value.toString();
+		    break;
+		}
+	    }
+
+	    // update diagram
+	    this.redraw_background();
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Drawing support -- deals with scaling and scrolling of diagrama
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	// here to redraw background image containing static portions of the schematic.
+	// Also redraws dynamic portion.
+	Schematic.prototype.redraw_background = function() {
+	    var c = this.bg_image.getContext('2d');
+
+	    c.lineCap = 'round';
+
+	    // paint background color
+	    c.fillStyle = element_style;
+	    c.fillRect(0,0,this.width,this.height);
+
+	    if (!this.diagram_only) {
+		// grid
+		c.strokeStyle = grid_style;
+		var first_x = this.origin_x;
+		var last_x = first_x + this.width/this.scale;
+		var first_y = this.origin_y;
+		var last_y = first_y + this.height/this.scale;
+
+		for (var i = this.grid*Math.ceil(first_x/this.grid); i < last_x; i += this.grid)
+		    this.draw_line(c,i,first_y,i,last_y,0.1);
+
+		for (var i = this.grid*Math.ceil(first_y/this.grid); i < last_y; i += this.grid)
+		    this.draw_line(c,first_x,i,last_x,i,0.1);
+	    }
+
+	    // unselected components
+	    var min_x = Infinity;  // compute bounding box for diagram
+	    var max_x = -Infinity;
+	    var min_y = Infinity;
+	    var max_y = -Infinity;
+	    for (var i = this.components.length - 1; i >= 0; --i) {
+		var component = this.components[i];
+		if (!component.selected) {
+		    component.draw(c);
+		    min_x = Math.min(component.bbox[0],min_x);
+		    max_x = Math.max(component.bbox[2],max_x);
+		    min_y = Math.min(component.bbox[1],min_y);
+		    max_y = Math.max(component.bbox[3],max_y);
+		}
+	    }
+	    this.unsel_bbox = [min_x,min_y,max_x,max_y];
+
+	    this.redraw();   // background changed, redraw on screen
+	}
+
+	// redraw what user sees = static image + dynamic parts
+	Schematic.prototype.redraw = function() {
+	    var c = this.canvas.getContext('2d');
+
+	    // put static image in the background
+	    c.drawImage(this.bg_image, 0, 0);
+
+	    // selected components
+	    var min_x = this.unsel_bbox[0];   // compute bounding box for diagram
+	    var max_x = this.unsel_bbox[2];
+	    var min_y = this.unsel_bbox[1];
+	    var max_y = this.unsel_bbox[3];
+	    var selections = false;
+	    for (var i = this.components.length - 1; i >= 0; --i) {
+		var component = this.components[i];
+		if (component.selected) {
+		    component.draw(c);
+		    selections = true;
+		    min_x = Math.min(component.bbox[0],min_x);
+		    max_x = Math.max(component.bbox[2],max_x);
+		    min_y = Math.min(component.bbox[1],min_y);
+		    max_y = Math.max(component.bbox[3],max_y);
+		}
+	    }
+	    this.enable_tool('cut',selections);
+	    this.enable_tool('copy',selections);
+	    this.enable_tool('paste',sch_clipboard.length > 0);
+
+	    // include a margin for diagram bounding box
+	    var dx = (max_x - min_x)/4;
+	    var dy = (max_y - min_y)/4;
+	    this.bbox = [min_x - dx,min_y - dy,max_x + dx,max_y + dy];
+
+	    // connection points: draw one at each location
+	    for (var location in this.connection_points) {
+		var cplist = this.connection_points[location];
+		cplist[0].draw(c,cplist.length);
+	    }
+    
+	    // draw new wire
+	    if (this.wire) {
+		var r = this.wire;
+		c.strokeStyle = selected_style;
+		this.draw_line(c,r[0],r[1],r[2],r[3],1);
+	    }
+
+	    // draw selection rectangle
+	    if (this.select_rect) {
+		var r = this.select_rect;
+		c.lineWidth = 1;
+		c.strokeStyle = selected_style;
+		c.beginPath();
+		c.moveTo(r[0],r[1]);
+		c.lineTo(r[0],r[3]);
+		c.lineTo(r[2],r[3]);
+		c.lineTo(r[2],r[1]);
+		c.lineTo(r[0],r[1]);
+		c.stroke();
+	    }
+    
+	    // display operating point results
+	    if (this.operating_point) {
+		if (typeof this.operating_point == 'string')
+		    this.message(this.operating_point);
+		else {
+		    // make a copy of the operating_point info so we can mess with it
+		    var temp = new Array();
+		    for (var i in this.operating_point) temp[i] = this.operating_point[i];
+
+		    // run through connection points displaying (once) the voltage
+		    // for each electrical node
+		    for (var location in this.connection_points)
+			(this.connection_points[location])[0].display_voltage(c,temp);
+
+		    // let components display branch current info if available
+		    for (var i = this.components.length - 1; i >= 0; --i)
+			this.components[i].display_current(c,temp)
+		}
+	    }
+	    
+	    // finally overlay cursor
+	    if (this.drawCursor && this.draw_cursor) {
+		//var x = this.cursor_x;
+		//var y = this.cursor_y;
+		//this.draw_text(c,'('+x+','+y+')',x+this.grid,y-this.grid,10);
+		this.draw_cursor(c,this.cursor_x,this.cursor_y);
+	    }
+	}
+
+	// draws a cross cursor
+	Schematic.prototype.cross_cursor = function(c,x,y) {
+	    this.draw_line(c,x-this.grid,y,x+this.grid,y,1);
+	    this.draw_line(c,x,y-this.grid,x,y+this.grid,1);
+	}
+
+	Schematic.prototype.moveTo = function(c,x,y) {
+	    c.moveTo((x - this.origin_x) * this.scale,(y - this.origin_y) * this.scale);
+	}
+
+	Schematic.prototype.lineTo = function(c,x,y) {
+	    c.lineTo((x - this.origin_x) * this.scale,(y - this.origin_y) * this.scale);
+	}
+
+	Schematic.prototype.draw_line = function(c,x1,y1,x2,y2,width) {
+	    c.lineWidth = width*this.scale;
+	    c.beginPath();
+	    c.moveTo((x1 - this.origin_x) * this.scale,(y1 - this.origin_y) * this.scale);
+	    c.lineTo((x2 - this.origin_x) * this.scale,(y2 - this.origin_y) * this.scale);
+	    c.stroke();
+	}
+
+	Schematic.prototype.draw_arc = function(c,x,y,radius,start_radians,end_radians,anticlockwise,width,filled) {
+	    c.lineWidth = width*this.scale;
+	    c.beginPath();
+	    c.arc((x - this.origin_x)*this.scale,(y - this.origin_y)*this.scale,radius*this.scale,
+		  start_radians,end_radians,anticlockwise);
+	    if (filled) c.fill();
+	    else c.stroke();
+	}
+
+	Schematic.prototype.draw_text = function(c,text,x,y,size) {
+	    c.font = size*this.scale+'pt sans-serif'
+	    c.fillText(text,(x - this.origin_x) * this.scale,(y - this.origin_y) * this.scale);
+	}
+
+	// add method to canvas to compute relative coords for event
+	HTMLCanvasElement.prototype.relMouseCoords = function(event){
+	    // run up the DOM tree to figure out coords for top,left of canvas
+	    var totalOffsetX = 0;
+	    var totalOffsetY = 0;
+	    var currentElement = this;
+	    do {
+		totalOffsetX += currentElement.offsetLeft;
+		totalOffsetY += currentElement.offsetTop;
+	    }
+	    while (currentElement = currentElement.offsetParent);
+
+	    // now compute relative position of click within the canvas
+	    this.mouse_x = event.pageX - totalOffsetX;
+	    this.mouse_y = event.pageY - totalOffsetY;
+
+	    this.page_x = event.pageX;
+	    this.page_y = event.pageY;
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Event handling
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	// process keystrokes, consuming those that are meaningful to us
+	function schematic_key_down(event) {
+	    if (!event) event = window.event;
+	    var sch = (window.event) ? event.srcElement.schematic : event.target.schematic;
+	    var code = event.keyCode;
+
+	    // keep track of modifier key state
+	    if (code == 16) sch.shiftKey = true;
+	    else if (code == 17) sch.ctrlKey = true;
+	    else if (code == 18) sch.altKey = true;
+	    else if (code == 91) sch.cmdKey = true;
+
+	    // backspace or delete: delete selected components
+	    else if (code == 8 || code == 46) {
+		// delete selected components
+		for (var i = sch.components.length - 1; i >= 0; --i) {
+		    var component = sch.components[i];
+		    if (component.selected) component.remove();
+		}
+		sch.clean_up_wires();
+		sch.redraw_background();
+		event.preventDefault();
+		return false;
+	    }
+
+	    // cmd/ctrl x: cut
+	    else if ((sch.ctrlKey || sch.cmdKey) && code == 88) {
+		sch.cut();
+		event.preventDefault();
+		return false;
+	    }
+
+	    // cmd/ctrl c: copy
+	    else if ((sch.ctrlKey || sch.cmdKey) && code == 67) {
+		sch.copy();
+		event.preventDefault();
+		return false;
+	    }
+
+	    // cmd/ctrl v: paste
+	    else if ((sch.ctrlKey || sch.cmdKey) && code == 86) {
+		sch.paste();
+		event.preventDefault();
+		return false;
+	    }
+
+	    // 'r': rotate component
+	    else if (!sch.ctrlKey && !sch.altKey && !sch.cmdKey && code == 82) {
+		// rotate
+		for (var i = sch.components.length - 1; i >= 0; --i) {
+		    var component = sch.components[i];
+		    if (component.selected) {
+			component.rotate(1);
+			sch.check_wires(component);
+		    }
+		}
+		sch.clean_up_wires();
+		sch.redraw_background();
+		event.preventDefault();
+		return false;
+	    }
+
+	    else return true;
+
+	    // consume keystroke
+	    sch.redraw();
+	    event.preventDefault();
+	    return false;
+	}
+
+	function schematic_key_up(event) {
+	    if (!event) event = window.event;
+	    var sch = (window.event) ? event.srcElement.schematic : event.target.schematic;
+	    var code = event.keyCode;
+
+	    if (code == 16) sch.shiftKey = false;
+	    else if (code == 17) sch.ctrlKey = false;
+	    else if (code == 18) sch.altKey = false;
+	    else if (code == 91) sch.cmdKey = false;
+	}
+
+	function schematic_mouse_enter(event) {
+	    if (!event) event = window.event;
+	    var sch = (window.event) ? event.srcElement.schematic : event.target.schematic;
+
+	    // see if user has selected a new part
+	    if (sch.new_part) {
+		// grab incoming part, turn off selection of parts bin
+		var part = sch.new_part;
+		sch.new_part = undefined;
+		part.select(false);
+
+		// unselect everything else in the schematic, add part and select it
+		sch.unselect_all(-1);
+		sch.redraw_background();  // so we see any components that got unselected
+
+		// make a clone of the component in the parts bin
+		part = part.component.clone(sch.cursor_x,sch.cursor_y);
+		part.add(sch);  // add it to schematic
+		part.set_select(true);
+
+		// and start dragging it
+		sch.drag_begin();
+	    }
+
+	    sch.drawCursor = true;
+	    sch.redraw();
+	    sch.canvas.focus();  // capture key strokes
+	    return false;
+	}
+
+	function schematic_mouse_leave(event) {
+	    if (!event) event = window.event;
+	    var sch = (window.event) ? event.srcElement.schematic : event.target.schematic;
+	    sch.drawCursor = false;
+	    sch.redraw();
+	    return false;
+	}
+
+	function schematic_mouse_down(event) {
+	    if (!event) event = window.event;
+	    else event.preventDefault();
+	    var sch = (window.event) ? event.srcElement.schematic : event.target.schematic;
+
+	    // determine where event happened in schematic coordinates
+	    sch.canvas.relMouseCoords(event);
+	    var x = sch.canvas.mouse_x/sch.scale + sch.origin_x;
+	    var y = sch.canvas.mouse_y/sch.scale + sch.origin_y;
+	    sch.cursor_x = Math.round(x/sch.grid) * sch.grid;
+	    sch.cursor_y = Math.round(y/sch.grid) * sch.grid;
+
+	    // is mouse over a connection point?  If so, start dragging a wire
+	    var cplist = sch.connection_points[sch.cursor_x + ',' + sch.cursor_y];
+	    if (cplist && !event.shiftKey) {
+		sch.unselect_all(-1);
+		sch.wire = [sch.cursor_x,sch.cursor_y,sch.cursor_x,sch.cursor_y];
+	    } else {
+		// give all components a shot at processing the selection event
+		var which = -1;
+		for (var i = sch.components.length - 1; i >= 0; --i)
+		    if (sch.components[i].select(x,y,event.shiftKey)) {
+			if (sch.components[i].selected) {
+			    sch.drag_begin();
+			    which = i;  // keep track of component we found
+			}
+			break;
+		    }
+		// did we just click on a previously selected component?
+		var reselect = which!=-1 && sch.components[which].was_previously_selected;
+
+		if (!event.shiftKey) {
+		    // if shift key isn't pressed and we didn't click on component
+		    // that was already selected, unselect everyone except component
+		    // we just clicked on
+		    if (!reselect) sch.unselect_all(which);
+
+		    // if there's nothing to drag, set up a selection rectangle
+		    if (!sch.dragging) sch.select_rect = [sch.canvas.mouse_x,sch.canvas.mouse_y,
+							  sch.canvas.mouse_x,sch.canvas.mouse_y];
+		}
+	    }
+
+	    sch.redraw_background();
+	    return false;
+	}
+
+	function schematic_mouse_move(event) {
+	    if (!event) event = window.event;
+	    var sch = (window.event) ? event.srcElement.schematic : event.target.schematic;
+
+	    sch.canvas.relMouseCoords(event);
+	    var x = sch.canvas.mouse_x/sch.scale + sch.origin_x;
+	    var y = sch.canvas.mouse_y/sch.scale + sch.origin_y;
+	    sch.cursor_x = Math.round(x/sch.grid) * sch.grid;
+	    sch.cursor_y = Math.round(y/sch.grid) * sch.grid;
+
+	    if (sch.wire) {
+		// update new wire end point
+		sch.wire[2] = sch.cursor_x;
+		sch.wire[3] = sch.cursor_y;
+	    } else if (sch.dragging) {
+		// see how far we moved
+		var dx = sch.cursor_x - sch.drag_x;
+		var dy = sch.cursor_y - sch.drag_y;
+		if (dx != 0 || dy != 0) {
+		    // update position for next time
+		    sch.drag_x = sch.cursor_x;
+		    sch.drag_y = sch.cursor_y;
+
+		    // give all components a shot at processing the event
+		    for (var i = sch.components.length - 1; i >= 0; --i) {
+			var component = sch.components[i];
+			if (component.selected) component.move(dx,dy);
+		    }
+		}
+	    } else if (sch.select_rect) {
+		// update moving corner of selection rectangle
+		sch.select_rect[2] = sch.canvas.mouse_x;
+		sch.select_rect[3] = sch.canvas.mouse_y;
+		//sch.message(sch.select_rect.toString());
+	    }
+    
+	    // just redraw dynamic components
+	    sch.redraw();
+	    //sch.message(sch.canvas.page_x + ',' + sch.canvas.page_y + ';' + sch.canvas.mouse_x + ',' + sch.canvas.mouse_y + ';' + sch.cursor_x + ',' + sch.cursor_y);
+
+	    return false;
+	}
+
+	function schematic_mouse_up(event) {
+	    if (!event) event = window.event;
+	    else event.preventDefault();
+	    var sch = (window.event) ? event.srcElement.schematic : event.target.schematic;
+
+	    // drawing a new wire
+	    if (sch.wire) {
+		var r = sch.wire;
+		sch.wire = undefined;
+
+		if (r[0]!=r[2] || r[1]!=r[3]) {
+		    // insert wire component
+		    sch.add_wire(r[0],r[1],r[2],r[3]);
+		    sch.clean_up_wires();
+		    sch.redraw_background();
+		} else sch.redraw();
+	    }
+
+	    // dragging
+	    if (sch.dragging) sch.drag_end();
+
+	    // selection rectangle
+	    if (sch.select_rect) {
+		var r = sch.select_rect;
+
+		// if select_rect is a point, we've already dealt with selection
+		// in mouse_down handler
+		if (r[0]!=r[2] || r[1]!=r[3]) {
+		    // convert to schematic coordinates
+		    var s = [r[0]/sch.scale + sch.origin_x, r[1]/sch.scale + sch.origin_y,
+			     r[2]/sch.scale + sch.origin_x, r[3]/sch.scale + sch.origin_y];
+		    canonicalize(s);
+	    
+		    if (!event.shiftKey) sch.unselect_all();
+
+		    // select components that intersect selection rectangle
+		    for (var i = sch.components.length - 1; i >= 0; --i)
+			sch.components[i].select_rect(s,event.shiftKey);
+		}
+
+		sch.select_rect = undefined;
+		sch.redraw_background();
+	    }
+	    return false;
+	}
+
+	function schematic_double_click(event) {
+	    if (!event) event = window.event;
+	    else event.preventDefault();
+	    var sch = (window.event) ? event.srcElement.schematic : event.target.schematic;
+
+	    // determine where event happened in schematic coordinates
+	    sch.canvas.relMouseCoords(event);
+	    var x = sch.canvas.mouse_x/sch.scale + sch.origin_x;
+	    var y = sch.canvas.mouse_y/sch.scale + sch.origin_y;
+	    sch.cursor_x = Math.round(x/sch.grid) * sch.grid;
+	    sch.cursor_y = Math.round(y/sch.grid) * sch.grid;
+
+	    // see if we double-clicked a component.  If so, edit it's properties
+	    for (var i = sch.components.length - 1; i >= 0; --i)
+		if (sch.components[i].edit_properties(x,y))
+		    break;
+
+	    return false;
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Status message and dialogs
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	Schematic.prototype.message = function(message) {
+	    this.status.nodeValue = message;
+	}
+
+	Schematic.prototype.append_message = function(message) {
+	    this.status.nodeValue += ' / '+message;
+	}
+    
+	// set up a dialog with specified title, content and two buttons at
+	// the bottom: OK and Cancel.  If Cancel is clicked, dialog goes away
+	// and we're done.  If OK is clicked, dialog goes away and the
+	// callback function is called with the content as an argument (so
+	// that the values of any fields can be captured).
+	Schematic.prototype.dialog = function(title,content,callback) {
+	    // create the div for the top level of the dialog, add to DOM
+	    var dialog = document.createElement('div');
+	    dialog.sch = this;
+	    dialog.content = content;
+	    dialog.callback = callback;
+
+	    // look for property input fields in the content and give
+	    // them a keypress listener that interprets ENTER as
+	    // clicking OK.
+	    var plist = content.getElementsByClassName('property');
+	    for (var i = plist.length - 1; i >= 0; --i) {
+		var field = plist[i];
+		field.dialog = dialog;  // help event handler find us...
+		field.addEventListener('keypress',dialog_check_for_ENTER,false);
+	    }
+
+	    // div to hold the content
+	    var body = document.createElement('div');
+	    content.style.marginBotton = '5px';
+	    body.appendChild(content);
+	    body.style.padding = '5px';
+	    dialog.appendChild(body);
+
+	    // OK button
+	    var ok_button = document.createElement('span');
+	    ok_button.appendChild(document.createTextNode('OK'));
+	    ok_button.dialog = dialog;   // for the handler to use
+	    ok_button.addEventListener('click',dialog_okay,false);
+	    ok_button.style.display = 'inline';
+	    ok_button.style.border = '1px solid';
+	    ok_button.style.padding = '5px';
+	    ok_button.style.margin = '10px';
+
+	    // cancel button
+	    var cancel_button = document.createElement('span');
+	    cancel_button.appendChild(document.createTextNode('Cancel'));
+	    cancel_button.dialog = dialog;   // for the handler to use
+	    cancel_button.addEventListener('click',dialog_cancel,false);
+	    cancel_button.style.display = 'inline';
+	    cancel_button.style.border = '1px solid';
+	    cancel_button.style.padding = '5px';
+	    cancel_button.style.margin = '10px';
+
+	    // div to hold the two buttons
+	    var buttons = document.createElement('div');
+	    buttons.style.textAlign = 'center';
+	    buttons.appendChild(ok_button);
+	    buttons.appendChild(cancel_button);
+	    buttons.style.padding = '5px';
+	    buttons.style.margin = '10px';
+	    dialog.appendChild(buttons);
+
+	    // put into an overlay window
+	    this.window(title,dialog);
+	}
+
+	// callback when user click "Cancel" in a dialog
+	function dialog_cancel(event) {
+	    if (!event) event = window.event;
+	    var dialog = (window.event) ? event.srcElement.dialog : event.target.dialog;
+
+	    window_close(dialog.win);
+	}
+
+	// callback when user click "OK" in a dialog
+	function dialog_okay(event) {
+	    if (!event) event = window.event;
+	    var dialog = (window.event) ? event.srcElement.dialog : event.target.dialog;
+
+	    window_close(dialog.win);
+
+	    // invoke the callback with the dialog contents as the argument
+	    if (dialog.callback) dialog.callback(dialog.content);
+	}
+
+	// callback for keypress in input fields: if user typed ENTER, act
+	// like they clicked OK button.
+	function dialog_check_for_ENTER(event) {
+	    var key = (window.event) ? window.event.keyCode : event.keyCode;
+	    if (key == 13) dialog_okay(event);
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Draggable, resizeable, closeable window
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	// build a 2-column HTML table from an associative array (keys as text in
+	// column 1, values in column 2).
+	function build_table(a) {
+	    var tbl = document.createElement('table');
+
+	    // build a row for each element in associative array
+	    for (var i in a) {
+		var label = document.createTextNode(i + ': ');
+		var col1 = document.createElement('td');
+		col1.appendChild(label);
+		var col2 = document.createElement('td');
+		col2.appendChild(a[i]);
+		var row = document.createElement('tr');
+		row.appendChild(col1);
+		row.appendChild(col2);
+		row.style.verticalAlign = 'center';
+		tbl.appendChild(row);
+	    }
+
+	    return tbl;
+	}
+
+	// build an input field
+	function build_input(type,size,value) {
+	    var input = document.createElement('input');
+	    input.type = type;
+	    input.size = size;
+	    input.className = 'property';  // make this easier to find later
+	    if (value == undefined) input.value = '';
+	    else input.value = value.toString();
+	    return input;
+	}
+
+	// build a select widget using the strings found in the options array
+	function build_select(options,selected) {
+	    var select = document.createElement('select');
+	    for (var i = 0; i < options.length; i++) {
+		var option = document.createElement('option');
+		option.text = options[i];
+		select.add(option);
+		if (options[i] == selected) select.selectedIndex = i;
+	    }
+	    return select;
+	}
+
+	Schematic.prototype.window = function(title,content,offset) {
+	    // create the div for the top level of the window
+	    var win = document.createElement('div');
+	    win.sch = this;
+	    win.content = content;
+	    win.drag_x = undefined;
+	    win.draw_y = undefined;
+
+	    // div to hold the title
+	    var head = document.createElement('div');
+	    head.style.backgroundColor = 'black';
+	    head.style.color = 'white';
+	    head.style.textAlign = 'center';
+	    head.style.padding = '5px';
+	    head.appendChild(document.createTextNode(title));
+	    head.win = win;
+	    win.head = head;
+
+	    var close_button = new Image();
+	    close_button.src = close_icon;
+	    close_button.style.cssFloat = 'right';
+	    close_button.addEventListener('click',window_close_button,false);
+	    close_button.win = win;
+	    head.appendChild(close_button);
+
+	    win.appendChild(head);
+
+	    // capture mouse events in title bar
+	    head.addEventListener('mousedown',window_mouse_down,false);
+
+	    // div to hold the content
+	    //var body = document.createElement('div');
+	    //body.appendChild(content);
+	    win.appendChild(content);
+	    content.win = win;   // so content can contact us
+
+	    // compute location relative to canvas
+	    if (offset == undefined) offset = 0;
+	    win.left = this.canvas.mouse_x + offset;
+	    win.top = this.canvas.mouse_y + offset;
+
+	    // add to DOM
+	    win.style.background = 'white';
+	    //win.style.zIndex = '1000';
+	    win.style.position = 'absolute';
+	    win.style.left = win.left + 'px';
+	    win.style.top = win.top + 'px';
+	    win.style.border = '2px solid';
+
+	    this.canvas.parentNode.insertBefore(win,this.canvas);
+	    bring_to_front(win,true);
+	}
+
+	// adjust zIndex of pop-up window so that it is in front
+	function bring_to_front(win,insert) {
+	    var wlist = win.sch.window_list;
+	    var i = wlist.indexOf(win);
+
+	    // remove from current position (if any) in window list
+	    if (i != -1) wlist.splice(i,1);
+
+	    // if requested, add to end of window list
+	    if (insert) wlist.push(win);
+
+	    // adjust all zIndex values
+	    for (i = 0; i < wlist.length; i += 1)
+		wlist[i].style.zIndex = 1000 + i;
+	}
+
+	// close the window
+	function window_close(win) {
+	    // remove the window from the top-level div of the schematic
+	    win.parentNode.removeChild(win);
+
+	    // remove from list of pop-up windows
+	    bring_to_front(win,false);
+	}
+
+	function window_close_button(event) {
+	    if (!event) event = window.event;
+	    var src = (window.event) ? event.srcElement : event.target;
+	    window_close(src.win);
+	}
+
+	// capture mouse events in title bar of window
+	function window_mouse_down(event) {
+	    if (!event) event = window.event;
+	    var src = (window.event) ? event.srcElement : event.target;
+	    var win = src.win;
+
+	    bring_to_front(win,true);
+
+	    // add handlers to document so we capture them no matter what
+	    document.addEventListener('mousemove',window_mouse_move,false);
+	    document.addEventListener('mouseup',window_mouse_up,false);
+	    document.tracking_window = win;
+    
+	    // remember where mouse is so we can compute dx,dy during drag
+	    win.drag_x = event.pageX;
+	    win.drag_y = event.pageY;
+
+	    return false;
+	}
+
+	function window_mouse_up(event) {
+	    var win = document.tracking_window;
+    
+	    // show's over folks...
+	    document.removeEventListener('mousemove',window_mouse_move,false);
+	    document.removeEventListener('mouseup',window_mouse_up,false);
+	    document.tracking_window = undefined;
+	    win.drag_x = undefined;
+	    win.drag_y = undefined;
+	    return true;  // consume event
+	}
+
+	function window_mouse_move(event) {
+	    var win = document.tracking_window;
+    
+	    if (win.drag_x) {
+		var dx = event.pageX - win.drag_x;
+		var dy = event.pageY - win.drag_y;
+
+		// move the window
+		win.left += dx;
+		win.top += dy;
+		win.style.left = win.left + 'px';
+		win.style.top = win.top + 'px';
+	
+		// update reference point
+		win.drag_x += dx;
+		win.drag_y += dy;
+
+		return true;  // consume event
+	    }
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Toolbar
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	Schematic.prototype.add_tool = function(icon,tip,callback) {
+	    var tool;
+	    if (icon.search('data:image') != -1) {
+		tool = document.createElement('img');
+		tool.src = icon;
+	    } else {
+		tool = document.createElement('span');
+		tool.style.font = 'small-caps small sans-serif';
+		var label = document.createTextNode(icon);
+		tool.appendChild(label);
+	    }
+
+	    // decorate tool
+	    tool.style.borderWidth = '1px';
+	    tool.style.borderStyle = 'solid';
+	    tool.style.borderColor = background_style;
+	    tool.style.padding = '2px';
+
+	    // set up event processing
+	    tool.addEventListener('mouseover',tool_enter,false);
+	    tool.addEventListener('mouseout',tool_leave,false);
+	    tool.addEventListener('click',tool_click,false);
+
+	    // add to toolbar
+	    tool.sch = this;
+	    tool.tip = tip;
+	    tool.callback = callback;
+	    this.toolbar.push(tool);
+
+	    tool.enabled = false;
+	    tool.style.opacity = 0.2;
+
+	    return tool;
+	}
+
+	Schematic.prototype.enable_tool = function(tname,which) {
+	    var tool = this.tools[tname];
+
+	    if (tool != undefined) {
+		tool.style.opacity = which ? 1.0 : 0.2;
+		tool.enabled = which;
+
+		// if disabling tool, remove border and tip
+		if (!which) {
+		    tool.style.borderColor = background_style;
+		    tool.sch.message('');
+		}
+	    }
+	}
+
+	// highlight tool button by turning on border, changing background
+	function tool_enter(event) {
+	    if (!event) event = window.event;
+	    var tool = (window.event) ? event.srcElement : event.target;
+
+	    if (tool.enabled) {
+		tool.style.borderColor = normal_style;
+		tool.sch.message(tool.tip);
+		tool.opacity = 1.0;
+	    }
+	}
+
+	// unhighlight tool button by turning off border, reverting to normal background
+	function tool_leave(event) {
+	    if (!event) event = window.event;
+	    var tool = (window.event) ? event.srcElement : event.target;
+
+	    if (tool.enabled) {
+		tool.style.borderColor = background_style;
+		tool.sch.message('');
+	    }
+	}
+
+	// handle click on a tool
+	function tool_click(event) {
+	    if (!event) event = window.event;
+	    var tool = (window.event) ? event.srcElement : event.target;
+
+	    if (tool.enabled) {
+		tool.sch.canvas.relMouseCoords(event);  // so we can position pop-up window correctly
+		tool.callback.call(tool.sch);
+	    }
+	}
+
+	help_icon = 'data:image/gif;base64,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';
+
+	cut_icon = 'data:image/gif;base64,R0lGODlhEAAQALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//////yH5BAEAAAcALAAAAAAQABAAAAQu8MhJqz1g5qs7lxv2gRkQfuWomarXEgDRHjJhf3YtyRav0xcfcFgR0nhB5OwTAQA7';
+
+	copy_icon = 'data:image/gif;base64,R0lGODlhEAAQALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//////yH5BAEAAAcALAAAAAAQABAAAAQ+8MhJ6wE4Wwqef9gmdV8HiKZJrCz3ecS7TikWfzExvk+M9a0a4MbTkXCgTMeoHPJgG5+yF31SLazsTMTtViIAOw==';
+
+	paste_icon = 'data:image/gif;base64,R0lGODlhEAAQALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//////yH5BAEAAAcALAAAAAAQABAAAARL8MhJqwUYWJnxWp3GDcgAgCdQIqLKXmVLhhnyHiqpr7rME8AgocVDEB5IJHD0SyofBFzxGIQGAbvB0ZkcTq1CKK6z5YorwnR0w44AADs=';
+
+	close_icon = 'data:image/gif;base64,R0lGODlhEAAQAMQAAGtra/f3/62tre/v9+bm787O1pycnHNzc6WlpcXFxd7e3tbW1nt7e7W1te/v74SEhMXFzmNjY+bm5v///87OzgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAVt4DRMZGmSwRQQBUS9MAwRIyQ5Uq7neEFSDtxOF4T8cobIQaE4RAQ5yjHHiCCSD510QtFGvoCFdppDfBu7bYzy+D7WP5ggAgA8Y3FKwi5IAhIweW1vbBGEWy5rilsFi2tGAwSJixAFBCkpJ5ojIQA7';
+
+	zoomall_icon = 'data:image/gif;base64,R0lGODlhEAAQAMT/AAAAAP///zAwYT09bpGRqZ6et5iYsKWlvbi40MzM5cXF3czM5OHh5tTU2fDw84uMom49DbWKcfLy8g0NDcDAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABQALAAAAAAQABAAAAVZICWOZFlOwCQF5pg2TDMJbDs1DqI8g2TjOsSC0DMBGEGF4UAz3RQ6wiFRLEkmj8WyUC0FBAMpNdWiBCQD8DWCKq98lEkEAiiTAJB53S7Cz/kuECuAIzWEJCEAIf5PQ29weXJpZ2h0IDIwMDAgYnkgU3VuIE1pY3Jvc3lzdGVtcywgSW5jLiBBbGwgUmlnaHRzIFJlc2VydmVkLg0KSkxGIEdSIFZlciAxLjANCgA7';
+
+	zoomin_icon = 'data:image/gif;base64,R0lGODlhEAAQAMT/AAAAAP///zAwYT09boSEnIqKopiYsJ6etqurxL+/18XF3dnZ8sXF0OHh5tTU2ePj5piZr2EwAMKXfg0NDcDAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABQALAAAAAAQABAAAAVXICWOZFkCE2CWaeMwwLCKQPNMBCQEa/0UAEXiIFhNHKmkYcA7MQgKwMGw2PUgiYkBsWuWBoJpNTWjBATgAECCKgfelHVkUh5NIpJ5XXTP7/kRcH9mgyUhADshACH+T0NvcHlyaWdodCAyMDAwIGJ5IFN1biBNaWNyb3N5c3RlbXMsIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4NCkpMRiBHUiBWZXIgMS4wDQoAOw==';
+
+	zoomout_icon = 'data:image/gif;base64,R0lGODlhEAAQAMT/AAAAAP///zAwYT09bn19lYSEnJGRqZ6et5iYsJ6etqWlvbi40MzM5cXF3czM5Li4w+Hh5tTU2fDw84uMom49DbWKcQ0NDcDAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABcALAAAAAAQABAAAAVX4CWOZFlagGWWaQQ9lrCKViQVxjQEay0RjYXDMFgBIKmkQsA7PQyLhEHB2PUmDoTisGuWBINpNTW7BAbggKWCKgfelzUFUB4BKJV5XXTP7/kUcH9mgyUhADshACH+T0NvcHlyaWdodCAyMDAwIGJ5IFN1biBNaWNyb3N5c3RlbXMsIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4NCkpMRiBHUiBWZXIgMS4wDQoAOw==';
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Graphing
+	//
+	///////////////////////////////////////////////////////////////////////////////
+
+	// add dashed lines!
+	// from http://davidowens.wordpress.com/2010/09/07/html-5-canvas-and-dashed-lines/
+	CanvasRenderingContext2D.prototype.dashedLineTo = function(fromX, fromY, toX, toY, pattern) {
+	    // Our growth rate for our line can be one of the following:
+	    //   (+,+), (+,-), (-,+), (-,-)
+	    // Because of this, our algorithm needs to understand if the x-coord and
+	    // y-coord should be getting smaller or larger and properly cap the values
+	    // based on (x,y).
+	    var lt = function (a, b) { return a <= b; };
+	    var gt = function (a, b) { return a >= b; };
+	    var capmin = function (a, b) { return Math.min(a, b); };
+	    var capmax = function (a, b) { return Math.max(a, b); };
+
+	    var checkX = { thereYet: gt, cap: capmin };
+	    var checkY = { thereYet: gt, cap: capmin };
+
+	    if (fromY - toY > 0) {
+		checkY.thereYet = lt;
+		checkY.cap = capmax;
+	    }
+	    if (fromX - toX > 0) {
+		checkX.thereYet = lt;
+		checkX.cap = capmax;
+	    }
+
+	    this.moveTo(fromX, fromY);
+	    var offsetX = fromX;
+	    var offsetY = fromY;
+	    var idx = 0, dash = true;
+	    while (!(checkX.thereYet(offsetX, toX) && checkY.thereYet(offsetY, toY))) {
+		var ang = Math.atan2(toY - fromY, toX - fromX);
+		var len = pattern[idx];
+
+		offsetX = checkX.cap(toX, offsetX + (Math.cos(ang) * len));
+		offsetY = checkY.cap(toY, offsetY + (Math.sin(ang) * len));
+
+		if (dash) this.lineTo(offsetX, offsetY);
+		else this.moveTo(offsetX, offsetY);
+
+		idx = (idx + 1) % pattern.length;
+		dash = !dash;
+	    }
+	};
+
+	// given a range of values, return a new range [vmin',vmax'] where the limits
+	// have been chosen "nicely".  Taken from matplotlib.ticker.LinearLocator
+	function view_limits(vmin,vmax) {
+	    // deal with degenerate case...
+	    if (vmin == vmax) {
+		if (vmin == 0) { vmin = -0.5; vmax = 0.5; }
+		else {
+		    vmin = vmin > 0 ? 0.9*vmin : 1.1*vmin;
+		    vmax = vmax > 0 ? 1.1*vmax : 0.9*vmax;
+		}
+	    }
+
+	    var log_range = Math.log(vmax - vmin)/Math.LN10;
+	    var exponent = Math.floor(log_range);
+	    //if (log_range - exponent < 0.5) exponent -= 1;
+	    var scale = Math.pow(10,-exponent);
+	    vmin = Math.floor(scale*vmin)/scale;
+	    vmax = Math.ceil(scale*vmax)/scale;
+
+	    return [vmin,vmax,1.0/scale];
+	}
+
+	function engineering_notation(n,nplaces,trim) {
+	    if (n == 0) return '0';
+	    if (n == undefined) return 'undefined';
+	    if (trim == undefined) trim = true;
+
+	    var sign = n < 0 ? -1 : 1;
+	    var log10 = Math.log(sign*n)/Math.LN10;
+	    var exp = Math.floor(log10/3);   // powers of 1000
+	    var mantissa = sign*Math.pow(10,log10 - 3*exp);
+
+	    // keep specified number of places following decimal point
+	    var mstring = (mantissa + sign*0.5*Math.pow(10,-nplaces)).toString();
+	    var mlen = mstring.length;
+	    var endindex = mstring.indexOf('.');
+	    if (endindex != -1) {
+		if (nplaces > 0) {
+		    endindex += nplaces + 1;
+		    if (endindex > mlen) endindex = mlen;
+		    if (trim) {
+			while (mstring.charAt(endindex-1) == '0') endindex -= 1;
+			if (mstring.charAt(endindex-1) == '.') endindex -= 1;
+		    }
+		}
+		if (endindex < mlen)
+		    mstring = mstring.substring(0,endindex);
+	    }
+
+	    switch(exp) {
+	    case -5:	return mstring+"f";
+	    case -4:	return mstring+"p";
+	    case -3:	return mstring+"n";
+	    case -2:	return mstring+"u";
+	    case -1:	return mstring+"m";
+	    case 0:	return mstring;
+	    case 1:	return mstring+"K";
+	    case 2:	return mstring+"M";
+	    case 3:	return mstring+"G";
+	    }
+
+	    // don't have a good suffix, so just print the number
+	    return n.toString();
+	}
+
+	var grid_pattern = [1,2];
+	var cursor_pattern = [5,5];
+
+	// x_values is an array of x coordinates for each of the plots
+	// y_values is an array of [color, value_array], one entry for each plot on left vertical axis
+	// z_values is an array of [color, value_array], one entry for each plot on right vertical axis
+	Schematic.prototype.graph = function(x_values,x_legend,y_values,y_legend,z_values,z_legend) {
+	    var pwidth = 400;	// dimensions of actual plot
+	    var pheight = 300;	// dimensions of actual plot
+	    var left_margin = (y_values != undefined && y_values.length > 0) ? 55 : 25;
+	    var top_margin = 25;
+	    var right_margin = (z_values != undefined && z_values.length > 0) ? 55 : 25;
+	    var bottom_margin = 45;
+	    var tick_length = 5;
+
+	    var w = pwidth + left_margin + right_margin;
+	    var h = pheight + top_margin + bottom_margin;
+
+	    var canvas = document.createElement('canvas');
+	    canvas.width = w;
+	    canvas.height = h;
+
+	    // the graph itself will be drawn here and this image will be copied
+	    // onto canvas, where it can be overlayed with mouse cursors, etc.
+	    var bg_image = document.createElement('canvas');
+	    bg_image.width = w;
+	    bg_image.height = h;
+	    canvas.bg_image = bg_image;	// so we can find it during event handling
+
+	    // start by painting an opaque background
+	    var c = bg_image.getContext('2d');
+	    c.fillStyle = background_style;
+	    c.fillRect(0,0,w,h);
+	    c.fillStyle = element_style;
+	    c.fillRect(left_margin,top_margin,pwidth,pheight);
+
+	    // figure out scaling for plots
+	    var x_min = array_min(x_values);
+	    var x_max = array_max(x_values);
+	    var x_limits = view_limits(x_min,x_max);
+	    x_min = x_limits[0];
+	    x_max = x_limits[1];
+	    var x_scale = pwidth/(x_max - x_min);
+
+	    function plot_x(x) {
+		return (x - x_min)*x_scale + left_margin;
+	    }
+
+	    // draw x grid
+	    c.strokeStyle = grid_style;
+	    c.lineWidth = 1;
+	    c.fillStyle = normal_style;
+	    c.font = '10pt sans-serif';
+	    c.textAlign = 'center';
+	    c.textBaseline = 'top';
+	    var end = top_margin + pheight;
+	    for (var x = x_min; x <= x_max; x += x_limits[2]) {
+		var temp = plot_x(x) + 0.5;  // keep lines crisp!
+
+		// grid line
+		c.beginPath();
+		if (x == x_min) {
+		    c.moveTo(temp,top_margin);
+		    c.lineTo(temp,end);
+		} else 
+		    c.dashedLineTo(temp,top_margin,temp,end,grid_pattern);
+		c.stroke();
+
+		// tick mark
+		c.beginPath();
+		c.moveTo(temp,end);
+		c.lineTo(temp,end + tick_length);
+		c.stroke();
+		c.fillText(engineering_notation(x,2),temp,end + tick_length);
+	    }
+
+	    if (y_values != undefined && y_values.length > 0) {
+		var y_min = Infinity;
+		var y_max = -Infinity;
+		var plot;
+		for (plot = y_values.length - 1; plot >= 0; --plot) {
+		    var values = y_values[plot][2];
+		    if (values == undefined) continue;  // no data points
+		    var offset = y_values[plot][1];
+		    var temp = array_min(values) + offset;
+		    if (temp < y_min) y_min = temp;
+		    temp = array_max(values) + offset;
+		    if (temp > y_max) y_max = temp;
+		}
+		var y_limits = view_limits(y_min,y_max);
+		y_min = y_limits[0];
+		y_max = y_limits[1];
+		var y_scale = pheight/(y_max - y_min);
+
+		function plot_y(y) {
+		    return (y_max - y)*y_scale + top_margin;
+		}
+
+		// draw y grid
+		c.textAlign = 'right';
+		c.textBaseline = 'middle';
+		for (var y = y_min; y <= y_max; y += y_limits[2]) {
+		    if (Math.abs(y/y_max) < 0.001) y = 0.0; // Just 3 digits
+		    var temp = plot_y(y) + 0.5;  // keep lines crisp!
+
+		    // grid line
+		    c.beginPath();
+		    if (y == y_min) {
+			c.moveTo(left_margin,temp);
+			c.lineTo(left_margin + pwidth,temp);
+		    } else 
+			c.dashedLineTo(left_margin,temp,left_margin + pwidth,temp,grid_pattern);
+		    c.stroke();
+
+		    // tick mark
+		    c.beginPath();
+		    c.moveTo(left_margin - tick_length,temp);
+		    c.lineTo(left_margin,temp);
+		    c.stroke();
+		    c.fillText(engineering_notation(y,2),left_margin - tick_length -2,temp);
+		}
+
+		// now draw each plot
+		var x,y;
+		var nx,ny;
+		c.lineWidth = 3;
+		c.lineCap = 'round';
+		for (plot = y_values.length - 1; plot >= 0; --plot) {
+		    var color = probe_colors_rgb[y_values[plot][0]];
+		    if (color == undefined) continue;  // no plot color (== x-axis)
+		    c.strokeStyle = color;
+		    var values = y_values[plot][2];
+		    if (values == undefined) continue;  // no data points
+		    var offset = y_values[plot][1];
+
+		    x = plot_x(x_values[0]);
+		    y = plot_y(values[0] + offset);
+		    c.beginPath();
+		    c.moveTo(x,y);
+		    for (var i = 1; i < x_values.length; i++) {
+			nx = plot_x(x_values[i]);
+			ny = plot_y(values[i] + offset);
+			c.lineTo(nx,ny);
+			x = nx;
+			y = ny;
+			if (i % 100 == 99) {
+			    // too many lineTo's cause canvas to break
+			    c.stroke();
+			    c.beginPath();
+			    c.moveTo(x,y);
+			}
+		    }
+		    c.stroke();
+		}
+	    }
+
+	    if (z_values != undefined && z_values.length > 0) {
+		var z_min = Infinity;
+		var z_max = -Infinity;
+		for (plot = z_values.length - 1; plot >= 0; --plot) {
+		    var values = z_values[plot][2];
+		    if (values == undefined) continue;  // no data points
+		    var offset = z_values[plot][1];
+		    var temp = array_min(values) + offset;
+		    if (temp < z_min) z_min = temp;
+		    temp = array_max(values) + offset;
+		    if (temp > z_max) z_max = temp;
+		}
+		var z_limits = view_limits(z_min,z_max);
+		z_min = z_limits[0];
+		z_max = z_limits[1];
+		var z_scale = pheight/(z_max - z_min);
+
+		function plot_z(z) {
+		    return (z_max - z)*z_scale + top_margin;
+		}
+
+		// draw z ticks
+		c.textAlign = 'left';
+		c.textBaseline = 'middle';
+		c.lineWidth = 1;
+		c.strokeStyle = normal_style;
+		var tick_length_half = Math.floor(tick_length/2);
+		var tick_delta = tick_length - tick_length_half;
+		for (var z = z_min; z <= z_max; z += z_limits[2]) {
+		    if (Math.abs(z/z_max) < 0.001) z = 0.0; // Just 3 digits
+		    var temp = plot_z(z) + 0.5;  // keep lines crisp!
+
+		    // tick mark
+		    c.beginPath();
+		    c.moveTo(left_margin + pwidth - tick_length_half,temp);
+		    c.lineTo(left_margin + pwidth + tick_delta,temp);
+		    c.stroke();
+		    c.fillText(engineering_notation(z,2),left_margin + pwidth + tick_length + 2,temp);
+		}
+
+		var z;
+		var nz;
+		c.lineWidth = 3;
+		for (plot = z_values.length - 1; plot >= 0; --plot) {
+		    var color = probe_colors_rgb[z_values[plot][0]];
+		    if (color == undefined) continue;  // no plot color (== x-axis)
+		    c.strokeStyle = color;
+		    var values = z_values[plot][2];
+		    if (values == undefined) continue;  // no data points
+		    var offset = z_values[plot][1];
+		    
+		    x = plot_x(x_values[0]);
+		    z = plot_z(values[0] + offset);
+		    c.beginPath();
+		    c.moveTo(x,z);
+		    for (var i = 1; i < x_values.length; i++) {
+			nx = plot_x(x_values[i]);
+			nz = plot_z(values[i] + offset);
+			c.lineTo(nx,nz);
+			x = nx;
+			z = nz;
+			if (i % 100 == 99) {
+			    // too many lineTo's cause canvas to break
+			    c.stroke();
+			    c.beginPath();
+			    c.moveTo(x,z);
+			}
+		    }
+		    c.stroke();
+		}
+	    }
+
+	    // draw legends
+	    c.font = '12pt sans-serif';
+	    c.textAlign = 'center';
+	    c.textBaseline = 'bottom';
+	    c.fillText(x_legend,left_margin + pwidth/2,h - 5);
+
+	    if (y_values != undefined && y_values.length > 0) {
+		c.textBaseline = 'top';
+		c.save();
+		c.translate(5 ,top_margin + pheight/2);
+		c.rotate(-Math.PI/2);
+		c.fillText(y_legend,0,0);
+		c.restore();
+	    }
+
+	    if (z_values != undefined && z_values.length > 0) {
+		c.textBaseline = 'bottom';
+		c.save();
+		c.translate(w-5 ,top_margin + pheight/2);
+		c.rotate(-Math.PI/2);
+		c.fillText(z_legend,0,0);
+		c.restore();
+	    }
+
+	    // save info need for interactions with the graph
+	    canvas.x_values = x_values;
+	    canvas.y_values = y_values;
+	    canvas.z_values = z_values;
+	    canvas.x_legend = x_legend;
+	    canvas.y_legend = y_legend;
+	    canvas.z_legend = y_legend;
+	    canvas.x_min = x_min;
+	    canvas.x_scale = x_scale;
+	    canvas.y_min = y_min;
+	    canvas.y_scale = y_scale;
+	    canvas.z_min = z_min;
+	    canvas.z_scale = z_scale;
+	    canvas.left_margin = left_margin;
+	    canvas.top_margin = top_margin;
+	    canvas.pwidth = pwidth;
+	    canvas.pheight = pheight;
+	    canvas.tick_length = tick_length;
+
+	    canvas.cursor1_x = undefined;
+	    canvas.cursor2_x = undefined;
+	    canvas.sch = this;
+
+	    // do something useful when user mouses over graph
+	    canvas.addEventListener('mousemove',graph_mouse_move,false);
+
+	    // return our masterpiece
+	    redraw_plot(canvas);
+	    return canvas;
+	}
+
+	function array_max(a) {
+	    max = -Infinity;
+	    for (var i = a.length - 1; i >= 0; --i)
+		if (a[i] > max) max = a[i];
+	    return max;
+	}
+
+	function array_min(a) {
+	    min = Infinity;
+	    for (var i = a.length - 1; i >= 0; --i)
+		if (a[i] < min) min = a[i];
+	    return min;
+	}
+
+	function plot_cursor(c,graph,cursor_x,left_margin) {
+	    // draw dashed vertical marker that follows mouse
+	    var x = graph.left_margin + cursor_x;
+	    var end_y = graph.top_margin + graph.pheight + graph.tick_length;
+	    c.strokeStyle = grid_style;
+	    c.lineWidth = 1;
+	    c.beginPath();
+	    c.dashedLineTo(x,graph.top_margin,x,end_y,cursor_pattern);
+	    c.stroke();
+
+	    // add x label at bottom of marker
+	    var graph_x = cursor_x/graph.x_scale + graph.x_min;
+	    c.font = '10pt sans-serif';
+	    c.textAlign = 'center';
+	    c.textBaseline = 'top';
+	    c.fillStyle = background_style;
+	    c.fillText('\u2588\u2588\u2588\u2588\u2588',x,end_y);
+	    c.fillStyle = normal_style;
+	    c.fillText(engineering_notation(graph_x,3,false),x,end_y);
+
+	    // compute which points marker is between
+	    var x_values = graph.x_values;
+	    var len = x_values.length;
+	    var index = 0;
+	    while (index < len && graph_x >= x_values[index]) index += 1;
+	    var x1 = (index == 0) ? x_values[0] : x_values[index-1];
+	    var x2 = x_values[index];
+
+	    if (x2 != undefined) {
+		// for each plot, interpolate and output value at intersection with marker
+		c.textAlign = 'left';
+		var tx = graph.left_margin + left_margin;
+		var ty = graph.top_margin;
+		if (graph.y_values != undefined) {
+		    for (var plot = 0; plot < graph.y_values.length; plot++) {
+			var values = graph.y_values[plot][2];
+			var color = probe_colors_rgb[graph.y_values[plot][0]];
+			if (values == undefined || color == undefined) continue;  // no data points or x-axis
+		    
+			// interpolate signal value at graph_x using values[index-1] and values[index]
+			var y1 = (index == 0) ? values[0] : values[index-1];
+			var y2 = values[index];
+			var y = y1;
+			if (graph_x != x1) y += (graph_x - x1)*(y2 - y1)/(x2 - x1);
+		    
+			// annotate plot with value of signal at marker
+			c.fillStyle = element_style;
+			c.fillText('\u2588\u2588\u2588\u2588\u2588',tx-3,ty);
+			c.fillStyle = color;
+			c.fillText(engineering_notation(y,3,false),tx,ty);
+			ty += 14;
+		    }
+		}
+
+		c.textAlign = 'right';
+		if (graph.z_values != undefined) {
+		    var tx = graph.left_margin + graph.pwidth - left_margin;
+		    var ty = graph.top_margin;
+		    for (var plot = 0; plot < graph.z_values.length; plot++) {
+			var values = graph.z_values[plot][2];
+			var color = probe_colors_rgb[graph.z_values[plot][0]];
+			if (values == undefined || color == undefined) continue;  // no data points or x-axis
+		    
+			// interpolate signal value at graph_x using values[index-1] and values[index]
+			var z1 = (index == 0) ? values[0]: values[index-1];
+			var z2 = values[index];
+			var z = z1;
+			if (graph_x != x1) z += (graph_x - x1)*(z2 - z1)/(x2 - x1);
+		    
+			// annotate plot with value of signal at marker
+			c.fillStyle = element_style;
+			c.fillText('\u2588\u2588\u2588\u2588\u2588',tx+3,ty);
+			c.fillStyle = color;
+			c.fillText(engineering_notation(z,3,false),tx,ty);
+			ty += 14;
+		    }
+		}
+	    }
+	}
+
+	function redraw_plot(graph) {
+	    var c = graph.getContext('2d');
+	    c.drawImage(graph.bg_image,0,0);
+
+	    if (graph.cursor1_x != undefined) plot_cursor(c,graph,graph.cursor1_x,4);
+	    if (graph.cursor2_x != undefined) plot_cursor(c,graph,graph.cursor2_x,30);
+
+	    /*
+	    if (graph.cursor1_x != undefined) {
+		// draw dashed vertical marker that follows mouse
+		var x = graph.left_margin + graph.cursor1_x;
+		var end_y = graph.top_margin + graph.pheight + graph.tick_length;
+		c.strokeStyle = grid_style;
+		c.lineWidth = 1;
+		c.beginPath();
+		c.dashedLineTo(x,graph.top_margin,x,end_y,cursor_pattern);
+		c.stroke();
+
+		// add x label at bottom of marker
+		var graph_x = graph.cursor1_x/graph.x_scale + graph.x_min;
+		c.font = '10pt sans-serif';
+		c.textAlign = 'center';
+		c.textBaseline = 'top';
+		c.fillStyle = background_style;
+		c.fillText('\u2588\u2588\u2588\u2588\u2588',x,end_y);
+		c.fillStyle = normal_style;
+		c.fillText(engineering_notation(graph_x,3,false),x,end_y);
+
+		// compute which points marker is between
+		var x_values = graph.x_values;
+		var len = x_values.length;
+		var index = 0;
+		while (index < len && graph_x >= x_values[index]) index += 1;
+		var x1 = (index == 0) ? x_values[0] : x_values[index-1];
+		var x2 = x_values[index];
+
+		if (x2 != undefined) {
+		    // for each plot, interpolate and output value at intersection with marker
+		    c.textAlign = 'left';
+		    var tx = graph.left_margin + 4;
+		    var ty = graph.top_margin;
+		    for (var plot = 0; plot < graph.y_values.length; plot++) {
+			var values = graph.y_values[plot][1];
+
+			// interpolate signal value at graph_x using values[index-1] and values[index]
+			var y1 = (index == 0) ? values[0] : values[index-1];
+			var y2 = values[index];
+			var y = y1;
+			if (graph_x != x1) y += (graph_x - x1)*(y2 - y1)/(x2 - x1);
+
+			// annotate plot with value of signal at marker
+			c.fillStyle = element_style;
+			c.fillText('\u2588\u2588\u2588\u2588\u2588',tx-3,ty);
+			c.fillStyle = probe_colors_rgb[graph.y_values[plot][0]];
+			c.fillText(engineering_notation(y,3,false),tx,ty);
+			ty += 14;
+		    }
+		}
+	    }
+	    */
+	}
+
+	function graph_mouse_move(event) {
+	    if (!event) event = window.event;
+	    var g = (window.event) ? event.srcElement : event.target;
+
+	    g.relMouseCoords(event);
+	    // not sure yet where the 3,-3 offset correction comes from (borders? padding?)
+	    var gx = g.mouse_x - g.left_margin - 3;
+	    var gy = g.pheight - (g.mouse_y - g.top_margin) + 3;
+	    if (gx >= 0 && gx <= g.pwidth && gy >=0 && gy <= g.pheight) {
+		//g.sch.message('button: '+event.button+', which: '+event.which);
+		g.cursor1_x = gx;
+	    } else {
+		g.cursor1_x = undefined;
+		g.cursor2_x = undefined;
+	    }
+
+	    redraw_plot(g);
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Parts bin
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	// one instance will be created for each part in the parts bin
+	function Part(sch) {
+	    this.sch = sch;
+	    this.component = undefined;
+	    this.selected = false;
+
+	    // set up canvas
+	    this.canvas = document.createElement('canvas');
+	    this.canvas.style.borderStyle = 'solid';
+	    this.canvas.style.borderWidth = '1px';
+	    this.canvas.style.borderColor = background_style;
+	    //this.canvas.style.position = 'absolute';
+	    this.canvas.style.cursor = 'default';
+	    this.canvas.height = part_w;
+	    this.canvas.width = part_h;
+	    this.canvas.part = this;
+
+	    this.canvas.addEventListener('mouseover',part_enter,false);
+	    this.canvas.addEventListener('mouseout',part_leave,false);
+	    this.canvas.addEventListener('mousedown',part_mouse_down,false);
+	    this.canvas.addEventListener('mouseup',part_mouse_up,false);
+
+	    // make the part "clickable" by registering a dummy click handler
+	    // this should make things work on the iPad
+	    this.canvas.addEventListener('click',function(){},false);
+	}
+
+	Part.prototype.set_location = function(left,top) {
+	    this.canvas.style.left = left + 'px';
+	    this.canvas.style.top = top + 'px';
+	}
+
+	Part.prototype.right = function() {
+	    return this.canvas.offsetLeft + this.canvas.offsetWidth;
+	}
+
+	Part.prototype.bottom = function() {
+	    return this.canvas.offsetTop + this.canvas.offsetHeight;
+	}
+
+	Part.prototype.set_component = function(component,tip) {
+	    component.sch = this;
+	    this.component = component;
+	    this.tip = tip;
+
+	    // figure out scaling and centering of parts icon
+	    var b = component.bounding_box;
+	    var dx = b[2] - b[0];
+	    var dy = b[3] - b[1];
+	    this.scale = 0.8; //Math.min(part_w/(1.2*dx),part_h/(1.2*dy));
+	    this.origin_x = b[0] + dx/2.0 - part_w/(2.0*this.scale);
+	    this.origin_y = b[1] + dy/2.0 - part_h/(2.0*this.scale);
+
+	    this.redraw();
+	}
+
+	Part.prototype.redraw = function(part) {
+	    var c = this.canvas.getContext('2d');
+
+	    // paint background color
+	    c.fillStyle = this.selected ? selected_style : background_style;
+	    c.fillRect(0,0,part_w,part_h);
+
+	    if (this.component) this.component.draw(c);
+	}
+
+	Part.prototype.select = function(which) {
+	    this.selected = which;
+	    this.redraw();
+	}
+
+	Part.prototype.update_connection_point = function(cp,old_location) {
+	    // no connection points in the parts bin
+	}
+
+	Part.prototype.moveTo = function(c,x,y) {
+	    c.moveTo((x - this.origin_x) * this.scale,(y - this.origin_y) * this.scale);
+	}
+
+	Part.prototype.lineTo = function(c,x,y) {
+	    c.lineTo((x - this.origin_x) * this.scale,(y - this.origin_y) * this.scale);
+	}
+
+	Part.prototype.draw_line = function(c,x1,y1,x2,y2,width) {
+	    c.lineWidth = width*this.scale;
+	    c.beginPath();
+	    c.moveTo((x1 - this.origin_x) * this.scale,(y1 - this.origin_y) * this.scale);
+	    c.lineTo((x2 - this.origin_x) * this.scale,(y2 - this.origin_y) * this.scale);
+	    c.stroke();
+	}
+
+	Part.prototype.draw_arc = function(c,x,y,radius,start_radians,end_radians,anticlockwise,width,filled) {
+	    c.lineWidth = width*this.scale;
+	    c.beginPath();
+	    c.arc((x - this.origin_x)*this.scale,(y - this.origin_y)*this.scale,radius*this.scale,
+		  start_radians,end_radians,anticlockwise);
+	    if (filled) c.fill();
+	    else c.stroke();
+	}
+
+	Part.prototype.draw_text = function(c,text,x,y,size) {
+	    // no text displayed for the parts icon
+	}
+
+	function part_enter(event) {
+	    if (!event) event = window.event;
+	    var canvas = (window.event) ? event.srcElement : event.target;
+	    var part = canvas.part;
+
+	    // avoid Chrome bug that changes to text cursor whenever
+	    // drag starts.  We'll restore the default handler at
+	    // the appropriate point so behavior in other parts of
+	    // the document are unaffected.
+	    //part.sch.saved_onselectstart = document.onselectstart;
+	    //document.onselectstart = function () { return false; };
+
+	    canvas.style.borderColor = normal_style;
+	    part.sch.message(part.tip+': drag onto diagram to insert');
+	    return false;
+	}
+
+	function part_leave(event) {
+	    if (!event) event = window.event;
+	    var canvas = (window.event) ? event.srcElement : event.target;
+	    var part = canvas.part;
+
+	    if (typeof part.sch.new_part == 'undefined') {
+		// leaving with no part selected?  revert handler
+		//document.onselectstart = part.sch.saved_onselectstart;
+	    }
+
+	    canvas.style.borderColor = background_style;
+	    part.sch.message('');
+	    return false;
+	}
+
+	function part_mouse_down(event) {
+	    if (!event) event = window.event;
+	    var part = (window.event) ? event.srcElement.part : event.target.part;
+
+	    part.select(true);
+	    part.sch.new_part = part;
+	    return false;
+	}
+
+	function part_mouse_up(event) {
+	    if (!event) event = window.event;
+	    var part = (window.event) ? event.srcElement.part : event.target.part;
+
+	    part.select(false);
+	    part.sch.new_part = undefined;
+	    return false;
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Rectangle helper functions
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	// rect is an array of the form [left,top,right,bottom]
+
+	// ensure left < right, top < bottom
+	function canonicalize(r) {
+	    var temp;
+
+	    // canonicalize bounding box
+	    if (r[0] > r[2]) {
+		temp = r[0];
+		r[0] = r[2];
+		r[2] = temp;
+	    }
+	    if (r[1] > r[3]) {
+		temp = r[1];
+		r[1] = r[3];
+		r[3] = temp;
+	    }
+	}
+    
+	function between(x,x1,x2) {
+	    return x1 <= x && x <= x2;
+	}
+
+	function inside(rect,x,y) {
+	    return between(x,rect[0],rect[2]) && between(y,rect[1],rect[3]);
+	}
+
+	// only works for manhattan rectangles
+	function intersect(r1,r2) {
+	    // look for non-intersection, negate result
+	    var result = !(r2[0] > r1[2] ||
+			   r2[2] < r1[0] ||
+			   r2[1] > r1[3] ||
+			   r2[3] < r1[1]);
+
+	    // if I try to return the above expression, javascript returns undefined!!!
+	    return result;
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Component base class
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	function Component(type,x,y,rotation) {
+	    this.sch = undefined;
+	    this.type = type;
+	    this.x = x;
+	    this.y = y;
+	    this.rotation = rotation;
+	    this.selected = false;
+	    this.properties = new Array();
+	    this.bounding_box = [0,0,0,0];   // in device coords [left,top,right,bottom]
+	    this.bbox = this.bounding_box;   // in absolute coords
+	    this.connections = [];
+	}
+
+	Component.prototype.json = function(index) {
+	    this.properties['_json_'] = index; // remember where we are in the JSON list
+
+	    var props = {};
+	    for (var p in this.properties) props[p] = this.properties[p];
+
+	    var conns = [];
+	    for (var i = 0; i < this.connections.length; i++)
+		conns.push(this.connections[i].json());
+
+	    var json = [this.type,[this.x, this.y, this.rotation],props,conns];
+	    return json;
+	}
+
+	Component.prototype.add_connection = function(offset_x,offset_y) {
+	    this.connections.push(new ConnectionPoint(this,offset_x,offset_y));
+	}
+
+	Component.prototype.update_coords = function() {
+	    var x = this.x;
+	    var y = this.y;
+
+	    // update bbox
+	    var b = this.bounding_box;
+	    this.bbox[0] = this.transform_x(b[0],b[1]) + x;
+	    this.bbox[1] = this.transform_y(b[0],b[1]) + y;
+	    this.bbox[2] = this.transform_x(b[2],b[3]) + x;
+	    this.bbox[3] = this.transform_y(b[2],b[3]) + y;
+	    canonicalize(this.bbox);
+
+	    // update connections
+	    for (var i = this.connections.length - 1; i >= 0; --i)
+		this.connections[i].update_location();
+	}
+
+	Component.prototype.rotate = function(amount) {
+	    var old_rotation = this.rotation;
+	    this.rotation = (this.rotation + amount) % 8;
+	    this.update_coords();
+
+	    // create an undoable edit record here
+	    // using old_rotation
+	}
+
+	Component.prototype.move_begin = function() {
+	    // remember where we started this move
+	    this.move_x = this.x;
+	    this.move_y = this.y;
+	}
+
+	Component.prototype.move = function(dx,dy) {
+	    // update coordinates
+	    this.x += dx;
+	    this.y += dy;
+	    this.update_coords();
+	}
+    
+	Component.prototype.move_end = function() {
+	    var dx = this.x - this.move_x;
+	    var dy = this.y - this.move_y;
+
+	    if (dx != 0 || dy != 0) {
+		// create an undoable edit record here
+
+		this.sch.check_wires(this);
+	    }
+	}
+
+	Component.prototype.add = function(sch) {
+	    this.sch = sch;   // we now belong to a schematic!
+	    sch.add_component(this);
+	    this.update_coords();
+	}
+
+	Component.prototype.remove = function() {
+	    // remove connection points from schematic
+	    for (var i = this.connections.length - 1; i >= 0; --i) {
+		var cp = this.connections[i];
+		this.sch.remove_connection_point(cp,cp.location);
+	    }
+
+	    // remove component from schematic
+	    this.sch.remove_component(this);
+	    this.sch = undefined;
+
+	    // create an undoable edit record here
+	}
+
+	Component.prototype.transform_x = function(x,y) {
+	    var rot = this.rotation;
+	    if (rot == 0 || rot == 6) return x;
+	    else if (rot == 1 || rot == 5) return -y;
+	    else if (rot == 2 || rot == 4) return -x;
+	    else return y;
+	}
+
+	Component.prototype.transform_y = function(x,y) {
+	    var rot = this.rotation;
+	    if (rot == 1 || rot == 7) return x;
+	    else if (rot == 2 || rot == 6) return -y;
+	    else if (rot == 3 || rot == 5) return -x;
+	    else return y;
+	}
+
+	Component.prototype.moveTo = function(c,x,y) {
+	    var nx = this.transform_x(x,y) + this.x;
+	    var ny = this.transform_y(x,y) + this.y;
+	    this.sch.moveTo(c,nx,ny);
+	}
+
+	Component.prototype.lineTo = function(c,x,y) {
+	    var nx = this.transform_x(x,y) + this.x;
+	    var ny = this.transform_y(x,y) + this.y;
+	    this.sch.lineTo(c,nx,ny);
+	}
+
+	Component.prototype.draw_line = function(c,x1,y1,x2,y2) {
+	    c.strokeStyle = this.selected ? selected_style :
+                            this.type == 'w' ? normal_style : component_style;
+	    var nx1 = this.transform_x(x1,y1) + this.x;
+	    var ny1 = this.transform_y(x1,y1) + this.y;
+	    var nx2 = this.transform_x(x2,y2) + this.x;
+	    var ny2 = this.transform_y(x2,y2) + this.y;
+	    this.sch.draw_line(c,nx1,ny1,nx2,ny2,1);
+	}
+
+	Component.prototype.draw_circle = function(c,x,y,radius,filled) {
+	    if (filled) c.fillStyle = this.selected ? selected_style : normal_style;
+	    else c.strokeStyle = this.selected ? selected_style :
+		     this.type == 'w' ? normal_style : component_style;
+	    var nx = this.transform_x(x,y) + this.x;
+	    var ny = this.transform_y(x,y) + this.y;
+
+	    this.sch.draw_arc(c,nx,ny,radius,0,2*Math.PI,false,1,filled);
+	}
+
+	rot_angle = [
+		     0.0,		// NORTH (identity)
+		     Math.PI/2,	// EAST (rot270)
+		     Math.PI,	// SOUTH (rot180)
+		     3*Math.PI/2,  // WEST (rot90)
+		     0.0,		// RNORTH (negy)
+		     Math.PI/2,	// REAST (int-neg)
+		     Math.PI,	// RSOUTH (negx)
+		     3*Math.PI/2,	// RWEST (int-pos)
+		     ];
+
+	Component.prototype.draw_arc = function(c,x,y,radius,start_radians,end_radians) {
+	    c.strokeStyle = this.selected ? selected_style :
+                            this.type == 'w' ? normal_style : component_style;
+	    var nx = this.transform_x(x,y) + this.x;
+	    var ny = this.transform_y(x,y) + this.y;
+	    this.sch.draw_arc(c,nx,ny,radius,
+			      start_radians+rot_angle[this.rotation],end_radians+rot_angle[this.rotation],
+			      false,1,false);
+	}
+
+	Component.prototype.draw = function(c) {
+	    /*
+	    for (var i = this.connections.length - 1; i >= 0; --i) {
+		var cp = this.connections[i];
+		cp.draw_x(c);
+	    }
+	    */
+	}
+
+	// result of rotating an alignment [rot*9 + align]
+	aOrient = [
+		   0, 1, 2, 3, 4, 5, 6, 7, 8,		// NORTH (identity)
+		   2, 5, 8, 1, 4, 7, 0, 3, 6, 		// EAST (rot270)
+		   8, 7, 6, 5, 4, 3, 2, 1, 0,		// SOUTH (rot180)
+		   6, 3, 0, 7, 4, 1, 8, 5, 3,		// WEST (rot90)
+		   2, 1, 0, 5, 4, 3, 8, 7, 6,		// RNORTH (negy)
+		   8, 5, 2, 7, 4, 1, 6, 3, 0, 		// REAST (int-neg)
+		   6, 7, 8, 3, 4, 5, 0, 1, 2,		// RSOUTH (negx)
+		   0, 3, 6, 1, 4, 7, 2, 5, 8		// RWEST (int-pos)
+		   ];
+
+	textAlign = [
+		     'left', 'center', 'right',
+		     'left', 'center', 'right',
+		     'left', 'center', 'right'
+		     ];
+
+	textBaseline = [
+			'top', 'top', 'top',
+			'middle', 'middle', 'middle',
+			'bottom', 'bottom', 'bottom'
+			];
+
+	Component.prototype.draw_text = function(c,text,x,y,alignment,size,fill) {
+	    var a = aOrient[this.rotation*9 + alignment];
+	    c.textAlign = textAlign[a];
+	    c.textBaseline = textBaseline[a];
+	    if (fill == undefined)
+		c.fillStyle = this.selected ? selected_style : normal_style;
+	    else
+		c.fillStyle = fill;
+	    this.sch.draw_text(c,text,
+			       this.transform_x(x,y) + this.x,
+			       this.transform_y(x,y) + this.y,
+			       size);
+	}
+
+	Component.prototype.set_select = function(which) {
+	    if (which != this.selected) {
+		this.selected = which;
+		// create an undoable edit record here
+	    }
+	}
+    
+	Component.prototype.select = function(x,y,shiftKey) {
+	    this.was_previously_selected = this.selected;
+	    if (this.near(x,y)) {
+		this.set_select(shiftKey ? !this.selected : true);
+		return true;
+	    } else return false;
+	}
+
+	Component.prototype.select_rect = function(s) {
+	    this.was_previously_selected = this.selected;
+	    if (intersect(this.bbox,s))
+		this.set_select(true);
+	}
+
+	// if connection point of component c bisects the
+	// wire represented by this compononent, return that
+	// connection point.  Otherwise return null.
+	Component.prototype.bisect = function(c) {
+	    return null;
+	}
+
+	// does mouse click fall on this component?
+	Component.prototype.near = function(x,y) {
+	    return inside(this.bbox,x,y);
+	}
+
+	Component.prototype.edit_properties = function(x,y) {
+	    if (this.near(x,y)) {
+		// make an <input> widget for each property
+		var fields = new Array();
+		for (var i in this.properties)
+		    // underscore at beginning of property name => system property
+		    if (i.charAt(0) != '_')
+			fields[i] = build_input('text',10,this.properties[i]);
+
+		var content = build_table(fields);
+		content.fields = fields;
+		content.component = this;
+
+		this.sch.dialog('Edit Properties',content,function(content) {
+			for (var i in content.fields)
+			    content.component.properties[i] = content.fields[i].value;
+			content.component.sch.redraw_background();
+		    });
+		return true;
+	    } else return false;
+	}
+
+	// clear the labels on all connections
+	Component.prototype.clear_labels = function() {
+	    for (var i = this.connections.length - 1; i >=0; --i) {
+		this.connections[i].clear_label();
+	    }
+	}
+
+	// default action: don't propagate label
+	Component.prototype.propagate_label = function(label) {
+	}
+
+	// give components a chance to generate default labels for their connection(s)
+	// default action: do nothing
+	Component.prototype.add_default_labels = function() {
+	}
+
+	// component should generate labels for all unlabeled connections
+	Component.prototype.label_connections = function() {
+	    for (var i = this.connections.length - 1; i >=0; --i) {
+		var cp = this.connections[i];
+		if (!cp.label)
+		    cp.propagate_label(this.sch.get_next_label());
+	    }
+	}
+
+	// default behavior: no probe info
+	Component.prototype.probe_info = function() { return undefined; }
+
+	// default behavior: nothing to display for DC analysis
+	Component.prototype.display_current = function(c,vmap) {
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Connection point
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	connection_point_radius = 2;
+
+	function ConnectionPoint(parent,x,y) {
+	    this.parent = parent;
+	    this.offset_x = x;
+	    this.offset_y = y;
+	    this.location = '';
+	    this.update_location();
+	    this.label = undefined;
+	}
+
+	ConnectionPoint.prototype.toString = function() {
+	    return '<ConnectionPoint ('+this.offset_x+','+this.offset_y+') '+this.parent.toString()+'>';
+	}
+
+	ConnectionPoint.prototype.json = function() {
+	    return this.label;
+	}
+
+	ConnectionPoint.prototype.clear_label = function() {
+	    this.label = undefined;
+	}
+
+	ConnectionPoint.prototype.propagate_label = function(label) {
+	    // should we check if existing label is the same?  it should be...
+
+	    if (this.label === undefined) {
+		// label this connection point
+		this.label = label;
+
+		// propagate label to coincident connection points
+		this.parent.sch.propagate_label(label,this.location);
+
+		// possibly label other cp's for this device?
+		this.parent.propagate_label(label);
+	    } else if (this.label != '0' && label != '0' && this.label != label)
+		alert("Node has two conflicting labels: "+this.label+", "+label);
+	}
+
+	ConnectionPoint.prototype.update_location = function() {
+	    // update location string which we use as a key to find coincident connection points
+	    var old_location = this.location;
+	    var parent = this.parent;
+	    var nx = parent.transform_x(this.offset_x,this.offset_y) + parent.x;
+	    var ny = parent.transform_y(this.offset_x,this.offset_y) + parent.y;
+	    this.x = nx;
+	    this.y = ny;
+	    this.location = nx + ',' + ny;
+
+	    // add ourselves to the connection list for the new location
+	    if (parent.sch) 
+		parent.sch.update_connection_point(this,old_location);
+	}
+
+	ConnectionPoint.prototype.coincident = function(x,y) {
+	    return this.x==x && this.y==y;
+	}
+
+	ConnectionPoint.prototype.draw = function(c,n) {
+	    if (n != 2)
+		this.parent.draw_circle(c,this.offset_x,this.offset_y,connection_point_radius,n > 2);
+	}
+
+	ConnectionPoint.prototype.draw_x = function(c) {
+	    this.parent.draw_line(c,this.offset_x-2,this.offset_y-2,this.offset_x+2,this.offset_y+2,grid_style);
+	    this.parent.draw_line(c,this.offset_x+2,this.offset_y-2,this.offset_x-2,this.offset_y+2,grid_style);
+	}
+
+	ConnectionPoint.prototype.display_voltage = function(c,vmap) {
+	    var v = vmap[this.label];
+	    if (v != undefined) {
+		var label = v.toFixed(2) + 'V';
+		
+		// first draw some solid blocks in the background
+		c.globalAlpha = 0.85;
+		this.parent.draw_text(c,'\u2588\u2588\u2588',this.offset_x,this.offset_y,
+				      4,annotation_size,element_style);
+		c.globalAlpha = 1.0;
+
+		// display the node voltage at this connection point
+		this.parent.draw_text(c,label,this.offset_x,this.offset_y,
+				      4,annotation_size,annotation_style);
+
+		// only display each node voltage once
+		delete vmap[this.label];
+	    }
+	}
+
+	// see if three connection points are collinear
+	function collinear(p1,p2,p3) {
+	    // from http://mathworld.wolfram.com/Collinear.html
+	    var area = p1.x*(p2.y - p3.y) + p2.x*(p3.y - p1.y) + p3.x*(p1.y - p2.y);
+	    return area == 0;
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Wire
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	near_distance = 2;   // how close to wire counts as "near by"
+
+	function Wire(x1,y1,x2,y2) {
+	    // arbitrarily call x1,y1 the origin
+	    Component.call(this,'w',x1,y1,0);
+	    this.dx = x2 - x1;
+	    this.dy = y2 - y1;
+	    this.add_connection(0,0);
+	    this.add_connection(this.dx,this.dy);
+
+	    // compute bounding box (expanded slightly)
+	    var r = [0,0,this.dx,this.dy];
+	    canonicalize(r);
+	    r[0] -= near_distance;
+	    r[1] -= near_distance;
+	    r[2] += near_distance;
+	    r[3] += near_distance;
+	    this.bounding_box = r;
+	    this.update_coords();    // update bbox
+
+	    // used in selection calculations
+	    this.len = Math.sqrt(this.dx*this.dx + this.dy*this.dy);
+	}
+	Wire.prototype = new Component();
+	Wire.prototype.constructor = Wire;
+
+	Wire.prototype.toString = function() {
+	    return '<Wire ('+this.x+','+this.y+') ('+(this.x+this.dx)+','+(this.y+this.dy)+')>';
+	}
+    
+	// return connection point at other end of wire from specified cp
+	Wire.prototype.other_end = function(cp) {
+	    if (cp == this.connections[0]) return this.connections[1];
+	    else if (cp == this.connections[1]) return this.connections[0];
+	    else return undefined;
+	}
+
+	Wire.prototype.json = function(index) {
+	    var json = ['w',[this.x, this.y, this.x+this.dx, this.y+this.dy]];
+	    return json;
+	}
+
+	Wire.prototype.draw = function(c) {
+	    this.draw_line(c,0,0,this.dx,this.dy);
+	}
+
+	Wire.prototype.clone = function(x,y) {
+	    return new Wire(x,y,x+this.dx,y+this.dy);
+	}
+
+	Wire.prototype.near = function(x,y) {
+	    // crude check: (x,y) within expanded bounding box of wire
+	    if (inside(this.bbox,x,y)) {
+		// compute distance between x,y and nearst point on line
+		// http://www.allegro.cc/forums/thread/589720
+		var D = Math.abs((x - this.x)*this.dy - (y - this.y)*this.dx)/this.len;
+		if (D <= near_distance) return true;
+	    }
+	    return false;
+	}
+
+	// selection rectangle selects wire only if it includes
+	// one of the end points
+	Wire.prototype.select_rect = function(s) {
+	    this.was_previously_selected = this.selected;
+	    if (inside(s,this.x,this.y) || inside(s,this.x+this.dx,this.y+this.dy))
+		this.set_select(true);
+	}
+
+	// if connection point cp bisects the
+	// wire represented by this compononent, return true
+	Wire.prototype.bisect_cp = function(cp) {
+	    var x = cp.x;
+	    var y = cp.y;
+
+	    // crude check: (x,y) within expanded bounding box of wire
+	    if (inside(this.bbox,x,y)) {
+		// compute distance between x,y and nearst point on line
+		// http://www.allegro.cc/forums/thread/589720
+		var D = Math.abs((x - this.x)*this.dy - (y - this.y)*this.dx)/this.len;
+		// final check: ensure point isn't an end point of the wire
+		if (D < 1 && !this.connections[0].coincident(x,y) && !this.connections[1].coincident(x,y))
+		    return true;
+	    }
+	    return false;
+	}
+
+	// if some connection point of component c bisects the
+	// wire represented by this compononent, return that
+	// connection point.  Otherwise return null.
+	Wire.prototype.bisect = function(c) {
+	    if (c == undefined) return;
+	    for (var i = c.connections.length - 1; i >= 0; --i) {
+		var cp = c.connections[i];
+		if (this.bisect_cp(cp)) return cp;
+	    }
+	    return null;
+	}
+
+	Wire.prototype.move_end = function() {
+	    // look for wires bisected by this wire
+	    this.sch.check_wires(this);
+
+	    // look for connection points that might bisect us
+	    this.sch.check_connection_points(this);
+	}
+
+	// wires "conduct" their label to the other end
+	Wire.prototype.propagate_label = function(label) {
+	    // don't worry about relabeling a cp, it won't recurse!
+	    this.connections[0].propagate_label(label);
+	    this.connections[1].propagate_label(label);
+	}
+
+	// Wires have no properties to edit
+	Wire.prototype.edit_properties = function(x,y) {
+	    return false;
+	}
+
+	// some actual component will start the labeling of electrical nodes,
+	// so do nothing here
+	Wire.prototype.label_connections = function() {
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Ground
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	function Ground(x,y,rotation) {
+	    Component.call(this,'g',x,y,rotation);
+	    this.add_connection(0,0);
+	    this.bounding_box = [-6,0,6,8];
+	    this.update_coords();
+	}
+	Ground.prototype = new Component();
+	Ground.prototype.constructor = Ground;
+
+	Ground.prototype.toString = function() {
+	    return '<Ground ('+this.x+','+this.y+')>';
+	}
+    
+	Ground.prototype.draw = function(c) {
+	    Component.prototype.draw.call(this,c);   // give superclass a shot
+	    this.draw_line(c,0,0,0,8);
+	    this.draw_line(c,-6,8,6,8);
+	}
+
+	Ground.prototype.clone = function(x,y) {
+	    return new Ground(x,y,this.rotation);
+	}
+
+	// Grounds no properties to edit
+	Ground.prototype.edit_properties = function(x,y) {
+	    return false;
+	}
+
+	// give components a chance to generate a label for their connection(s)
+	// default action: do nothing
+	Ground.prototype.add_default_labels = function() {
+	    this.connections[0].propagate_label('0');   // canonical label for GND node
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Label
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	function Label(x,y,rotation,label) {
+	    Component.call(this,'L',x,y,rotation);
+	    this.properties['label'] = label ? label : '???';
+	    this.add_connection(0,0);
+	    this.bounding_box = [-2,0,2,8];
+	    this.update_coords();
+	}
+	Label.prototype = new Component();
+	Label.prototype.constructor = Label;
+
+	Label.prototype.toString = function() {
+	    return '<Label'+' ('+this.x+','+this.y+')>';
+	}
+    
+	Label.prototype.draw = function(c) {
+	    Component.prototype.draw.call(this,c);   // give superclass a shot
+	    this.draw_line(c,0,0,0,8);
+	    this.draw_text(c,this.properties['label'],0,9,1,property_size);
+	}
+
+	Label.prototype.clone = function(x,y) {
+	    return new Label(x,y,this.rotation,this.properties['label']);
+	}
+
+	// give components a chance to generate a label for their connection(s)
+	// default action: do nothing
+	Label.prototype.add_default_labels = function() {
+	    this.connections[0].propagate_label(this.properties['label']);
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Voltage Probe
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	probe_colors = ['red','green','blue','cyan','magenta','yellow','black','x-axis'];
+	probe_colors_rgb = {
+	    'red': 'rgb(255,64,64)',
+	    'green': 'rgb(64,255,64)',
+	    'blue': 'rgb(64,64,255)',
+	    'cyan': 'rgb(64,255,255)',
+	    'magenta' : 'rgb(255,64,255)',
+	    'yellow': 'rgb(255,255,64)',
+	    'black': 'rgb(0,0,0)',
+	    'x-axis': undefined,
+	};
+
+	function Probe(x,y,rotation,color,offset) {
+	    Component.call(this,'s',x,y,rotation);
+	    this.add_connection(0,0);
+	    this.properties['color'] = color ? color : 'cyan';
+	    this.properties['offset'] = (offset==undefined || offset=='') ? '0' : offset;
+	    this.bounding_box = [0,0,27,-21];
+	    this.update_coords();
+	}
+	Probe.prototype = new Component();
+	Probe.prototype.constructor = Probe;
+
+	Probe.prototype.toString = function() {
+	    return '<Probe ('+this.x+','+this.y+')>';
+	}
+    
+	Probe.prototype.draw = function(c) {
+	    // draw outline
+	    this.draw_line(c,0,0,4,-4);
+	    this.draw_line(c,2,-6,6,-2);
+	    this.draw_line(c,2,-6,17,-21);
+	    this.draw_line(c,6,-2,21,-17);
+	    this.draw_line(c,17,-21,21,-17);
+	    this.draw_arc(c,19,-11,8,3*Math.PI/2,0);
+
+	    // fill body with plot color
+	    var color = probe_colors_rgb[this.properties['color']];
+	    if (color != undefined) {
+		c.fillStyle = color;
+		c.beginPath();
+		this.moveTo(c,2,-6);
+		this.lineTo(c,6,-2);
+		this.lineTo(c,21,-17);
+		this.lineTo(c,17,-21);
+		this.lineTo(c,2,-6);
+		c.fill();
+	    } else {
+		this.draw_text(c,this.properties['color'],27,-11,1,property_size);
+	    }
+	}
+
+	Probe.prototype.clone = function(x,y) {
+	    return new Probe(x,y,this.rotation,this.properties['color'],this.properties['offset']);
+	}
+
+	Probe.prototype.edit_properties = function(x,y) {
+	    if (inside(this.bbox,x,y)) {
+		var fields = new Array();
+		fields['Plot color'] = build_select(probe_colors,this.properties['color']);
+		fields['Plot offset'] = build_input('text',10,this.properties['offset']);
+
+		var content = build_table(fields);
+		content.fields = fields;
+		content.component = this;
+
+		this.sch.dialog('Edit Properties',content,function(content) {
+			var color_choice = content.fields['Plot color'];
+			content.component.properties['color'] = probe_colors[color_choice.selectedIndex];
+			content.component.properties['offset'] = content.fields['Plot offset'].value;
+			content.component.sch.redraw_background();
+		    });
+		return true;
+	    } else return false;
+	}
+
+	// return [color, node_label, offset, type] for this probe
+	Probe.prototype.probe_info = function() {
+	    var color = this.properties['color'];
+	    var offset = this.properties['offset'];
+	    if (offset==undefined || offset=="") offset = '0';
+	    return [color,this.connections[0].label,offset,'voltage'];
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Ammeter Probe
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	function Ammeter(x,y,rotation,color,offset) {
+	    Component.call(this,'a',x,y,rotation);
+	    this.add_connection(0,0);   // pos
+	    this.add_connection(16,0);   // neg
+	    this.properties['color'] = color ? color : 'magenta';
+	    this.properties['offset'] = (offset==undefined || offset=='') ? '0' : offset;
+	    this.bounding_box = [-3,0,16,3];
+	    this.update_coords();
+	}
+	Ammeter.prototype = new Component();
+	Ammeter.prototype.constructor = Ammeter;
+
+	Ammeter.prototype.toString = function() {
+	    return '<Ammeter ('+this.x+','+this.y+')>';
+	}
+    
+	Ammeter.prototype.move_end = function() {
+	    Component.prototype.move_end.call(this);   // do the normal processing
+
+	    // special for current probes: see if probe has been placed
+	    // in the middle of wire, creating three wire segments one
+	    // of which is shorting the two terminals of the probe.  If
+	    // so, auto remove the shorting segment.
+	    var e1 = this.connections[0].location;
+	    var e2 = this.connections[1].location;
+	    var cplist = this.sch.find_connections(this.connections[0]);
+	    for (var i = cplist.length - 1; i >= 0; --i) {
+		var c = cplist[i].parent;  // a component connected to ammeter terminal
+		// look for a wire whose end points match those of the ammeter
+		if (c.type == 'w') {
+		    var c_e1 = c.connections[0].location;
+		    var c_e2 = c.connections[1].location;
+		    if ((e1 == c_e1 && c2 == c_e2) || (e1 == c_e2 && e2 == c_e1)) {
+			c.remove();
+			break;
+		    }
+		}
+	    }
+	}
+
+	Ammeter.prototype.draw = function(c) {
+	    this.draw_line(c,0,0,16,0);
+
+	    // draw chevron in probe color
+	    c.strokeStyle = probe_colors_rgb[this.properties['color']];
+	    if (c.strokeStyle != undefined) {
+		c.beginPath();
+		this.moveTo(c,6,-3);
+		this.lineTo(c,10,0);
+		this.lineTo(c,6,3);
+		c.stroke();
+	    }
+	}
+
+	Ammeter.prototype.clone = function(x,y) {
+	    return new Ammeter(x,y,this.rotation,this.properties['color'],this.properties['offset']);
+	}
+
+	// share code with voltage probe
+	Ammeter.prototype.edit_properties = Probe.prototype.edit_properties;
+
+	Ammeter.prototype.label = function() {
+	    var name = this.properties['name'];
+	    var label = 'I(' + (name ? name : '_' + this.properties['_json_']) + ')';
+	    return label;
+	}
+
+	// display current for DC analysis
+	Ammeter.prototype.display_current = function(c,vmap) {
+	    var label = this.label();
+	    var v = vmap[label];
+	    if (v != undefined) {
+		var i = engineering_notation(v,2) + 'A';
+		this.draw_text(c,i,8,-5,7,annotation_size,annotation_style);
+
+		// only display each current once
+		delete vmap[label];
+	    }
+	}
+
+	// return [color, current_label, offset, type] for this probe
+	Ammeter.prototype.probe_info = function() {
+	    var color = this.properties['color'];
+	    var offset = this.properties['offset'];
+	    if (offset==undefined || offset=="") offset = '0';
+	    return [color,this.label(),offset,'current'];
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Resistor
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	function Resistor(x,y,rotation,name,r) {
+	    Component.call(this,'r',x,y,rotation);
+	    this.properties['name'] = name;
+	    this.properties['r'] = r ? r : '1';
+	    this.add_connection(0,0);
+	    this.add_connection(0,48);
+	    this.bounding_box = [-5,0,5,48];
+	    this.update_coords();
+	}
+	Resistor.prototype = new Component();
+	Resistor.prototype.constructor = Resistor;
+
+	Resistor.prototype.toString = function() {
+	    return '<Resistor '+this.properties['r']+' ('+this.x+','+this.y+')>';
+	}
+    
+	Resistor.prototype.draw = function(c) {
+	    Component.prototype.draw.call(this,c);   // give superclass a shot
+	    this.draw_line(c,0,0,0,12);
+	    this.draw_line(c,0,12,4,14);
+	    this.draw_line(c,4,14,-4,18);
+	    this.draw_line(c,-4,18,4,22);
+	    this.draw_line(c,4,22,-4,26);
+	    this.draw_line(c,-4,26,4,30);
+	    this.draw_line(c,4,30,-4,34);
+	    this.draw_line(c,-4,34,0,36);
+	    this.draw_line(c,0,36,0,48);
+	    if (this.properties['r'])
+		this.draw_text(c,this.properties['r']+'\u03A9',5,24,3,property_size);
+	    if (this.properties['name'])
+		this.draw_text(c,this.properties['name'],-5,24,5,property_size);
+	}
+
+	Resistor.prototype.clone = function(x,y) {
+	    return new Resistor(x,y,this.rotation,this.properties['name'],this.properties['r']);
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Capacitor
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	function Capacitor(x,y,rotation,name,c) {
+	    Component.call(this,'c',x,y,rotation);
+	    this.properties['name'] = name;
+	    this.properties['c'] = c ? c : '1p';
+	    this.add_connection(0,0);
+	    this.add_connection(0,48);
+	    this.bounding_box = [-8,0,8,48];
+	    this.update_coords();
+	}
+	Capacitor.prototype = new Component();
+	Capacitor.prototype.constructor = Capacitor;
+
+	Capacitor.prototype.toString = function() {
+	    return '<Capacitor '+this.properties['r']+' ('+this.x+','+this.y+')>';
+	}
+    
+	Capacitor.prototype.draw = function(c) {
+	    Component.prototype.draw.call(this,c);   // give superclass a shot
+	    this.draw_line(c,0,0,0,22);
+	    this.draw_line(c,-8,22,8,22);
+	    this.draw_line(c,-8,26,8,26);
+	    this.draw_line(c,0,26,0,48);
+	    if (this.properties['c'])
+		this.draw_text(c,this.properties['c']+'F',9,24,3,property_size);
+	    if (this.properties['name'])
+		this.draw_text(c,this.properties['name'],-9,24,5,property_size);
+	}
+
+	Capacitor.prototype.clone = function(x,y) {
+	    return new Capacitor(x,y,this.rotation,this.properties['name'],this.properties['c']);
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Inductor
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	function Inductor(x,y,rotation,name,l) {
+	    Component.call(this,'l',x,y,rotation);
+	    this.properties['name'] = name;
+	    this.properties['l'] = l ? l : '1n';
+	    this.add_connection(0,0);
+	    this.add_connection(0,48);
+	    this.bounding_box = [-4,0,5,48];
+	    this.update_coords();
+	}
+	Inductor.prototype = new Component();
+	Inductor.prototype.constructor = Inductor;
+
+	Inductor.prototype.toString = function() {
+	    return '<Inductor '+this.properties['l']+' ('+this.x+','+this.y+')>';
+	}
+    
+	Inductor.prototype.draw = function(c) {
+	    Component.prototype.draw.call(this,c);   // give superclass a shot
+	    this.draw_line(c,0,0,0,14);
+	    this.draw_arc(c,0,18,4,6*Math.PI/4,3*Math.PI/4);
+	    this.draw_arc(c,0,24,4,5*Math.PI/4,3*Math.PI/4);
+	    this.draw_arc(c,0,30,4,5*Math.PI/4,2*Math.PI/4);
+	    this.draw_line(c,0,34,0,48);
+
+	    if (this.properties['l'])
+		this.draw_text(c,this.properties['l']+'H',6,24,3,property_size);
+	    if (this.properties['name'])
+		this.draw_text(c,this.properties['name'],-3,24,5,property_size);
+	}
+
+	Inductor.prototype.clone = function(x,y) {
+	    return new Inductor(x,y,this.rotation,this.properties['name'],this.properties['l']);
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Diode
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	diode_types = ['normal','ideal'];
+
+	function Diode(x,y,rotation,name,area,type) {
+	    Component.call(this,'d',x,y,rotation);
+	    this.properties['name'] = name;
+	    this.properties['area'] = area ? area : '1';
+	    this.properties['type'] = type ? type : 'normal';
+	    this.add_connection(0,0);   // anode
+	    this.add_connection(0,48);  // cathode
+	    this.bounding_box = (type == 'ideal') ? [-12,0,12,48] : [-8,0,8,48];
+	    this.update_coords();
+	}
+	Diode.prototype = new Component();
+	Diode.prototype.constructor = Diode;
+
+	Diode.prototype.toString = function() {
+	    return '<Diode '+this.properties['area']+' ('+this.x+','+this.y+')>';
+	}
+    
+	Diode.prototype.draw = function(c) {
+	    Component.prototype.draw.call(this,c);   // give superclass a shot
+	    this.draw_line(c,0,0,0,16);
+	    this.draw_line(c,-8,16,8,16);
+	    this.draw_line(c,-8,16,0,32);
+	    this.draw_line(c,8,16,0,32);
+	    this.draw_line(c,-8,32,8,32);
+	    this.draw_line(c,0,32,0,48);
+
+	    if (this.properties['type'] == 'ideal') {
+		// put a box around an ideal diode
+		this.draw_line(c,-10,12,10,12);
+		this.draw_line(c,-10,12,-10,36);
+		this.draw_line(c,10,12,10,36);
+		this.draw_line(c,-10,36,10,36);
+	    }
+
+	    if (this.properties['area'])
+		this.draw_text(c,this.properties['area'],10,24,3,property_size);
+	    if (this.properties['name'])
+		this.draw_text(c,this.properties['name'],-10,24,5,property_size);
+	}
+
+	Diode.prototype.clone = function(x,y) {
+	    return new Diode(x,y,this.rotation,this.properties['name'],this.properties['area'],this.properties['type']);
+	}
+
+	Diode.prototype.edit_properties = function(x,y) {
+	    if (inside(this.bbox,x,y)) {
+		var fields = new Array();
+		fields['name'] = build_input('text',10,this.properties['name']);
+		fields['area'] = build_input('text',10,this.properties['area']);
+		fields['type'] = build_select(diode_types,this.properties['type']);
+
+		var content = build_table(fields);
+		content.fields = fields;
+		content.component = this;
+
+		this.sch.dialog('Edit Properties',content,function(content) {
+			content.component.properties['name'] = content.fields['name'].value;
+			content.component.properties['area'] = content.fields['area'].value;
+			content.component.properties['type'] = diode_types[content.fields['type'].selectedIndex];
+			content.component.sch.redraw_background();
+		    });
+		return true;
+	    } else return false;
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  N-channel Mosfet
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	function NFet(x,y,rotation,name,w_over_l) {
+	    Component.call(this,'n',x,y,rotation);
+	    this.properties['name'] = name;
+	    this.properties['W/L'] = w_over_l ? w_over_l : '2';
+	    this.add_connection(0,0);   // drain
+	    this.add_connection(-24,24);  // gate
+	    this.add_connection(0,48);  // source
+	    this.bounding_box = [-24,0,8,48];
+	    this.update_coords();
+	}
+	NFet.prototype = new Component();
+	NFet.prototype.constructor = NFet;
+
+	NFet.prototype.toString = function() {
+	    return '<NFet '+this.properties['W/L']+' ('+this.x+','+this.y+')>';
+	}
+    
+	NFet.prototype.draw = function(c) {
+	    Component.prototype.draw.call(this,c);   // give superclass a shot
+	    this.draw_line(c,0,0,0,16);
+	    this.draw_line(c,-8,16,0,16);
+	    this.draw_line(c,-8,16,-8,32);
+	    this.draw_line(c,-8,32,0,32);
+	    this.draw_line(c,0,32,0,48);
+
+	    this.draw_line(c,-24,24,-12,24);
+	    this.draw_line(c,-12,16,-12,32);
+
+	    var dim = this.properties['W/L'];
+	    if (this.properties['name']) {
+		this.draw_text(c,this.properties['name'],2,22,6,property_size);
+		this.draw_text(c,dim,2,26,0,property_size);
+	    } else
+		this.draw_text(c,dim,2,24,3,property_size);
+	}
+
+	NFet.prototype.clone = function(x,y) {
+	    return new NFet(x,y,this.rotation,this.properties['name'],this.properties['W/L']);
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  P-channel Mosfet
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	function PFet(x,y,rotation,name,w_over_l) {
+	    Component.call(this,'p',x,y,rotation);
+	    this.properties['name'] = name;
+	    this.properties['W/L'] = w_over_l ? w_over_l : '2';
+	    this.add_connection(0,0);   // drain
+	    this.add_connection(-24,24);  // gate
+	    this.add_connection(0,48);  // source
+	    this.bounding_box = [-24,0,8,48];
+	    this.update_coords();
+	}
+	PFet.prototype = new Component();
+	PFet.prototype.constructor = PFet;
+
+	PFet.prototype.toString = function() {
+	    return '<PFet '+this.properties['W/L']+' ('+this.x+','+this.y+')>';
+	}
+    
+	PFet.prototype.draw = function(c) {
+	    Component.prototype.draw.call(this,c);   // give superclass a shot
+	    this.draw_line(c,0,0,0,16);
+	    this.draw_line(c,-8,16,0,16);
+	    this.draw_line(c,-8,16,-8,32);
+	    this.draw_line(c,-8,32,0,32);
+	    this.draw_line(c,0,32,0,48);
+
+	    this.draw_line(c,-24,24,-16,24);
+
+	    this.draw_circle(c,-14,24,2,false);
+	    this.draw_line(c,-12,16,-12,32);
+
+	    var dim = this.properties['W/L'];
+	    if (this.properties['name']) {
+		this.draw_text(c,this.properties['name'],2,22,6,property_size);
+		this.draw_text(c,dim,2,26,0,property_size);
+	    } else
+		this.draw_text(c,dim,2,24,3,property_size);
+	}
+
+	PFet.prototype.clone = function(x,y) {
+	    return new PFet(x,y,this.rotation,this.properties['name'],this.properties['W/L']);
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Op Amp
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	function OpAmp(x,y,rotation,name,A) {
+	    Component.call(this,'o',x,y,rotation);
+	    this.properties['name'] = name;
+	    this.properties['A'] = A ? A : '30000';
+	    this.add_connection(0,0);   // +
+	    this.add_connection(0,16);  // -
+	    this.add_connection(48,8);  // output
+	    this.add_connection(24,32);  // ground
+	    this.bounding_box = [0,-8,48,32];
+	    this.update_coords();
+	}
+	OpAmp.prototype = new Component();
+	OpAmp.prototype.constructor = OpAmp;
+
+	OpAmp.prototype.toString = function() {
+	    return '<OpAmp'+this.properties['A']+' ('+this.x+','+this.y+')>';
+	}
+    
+	OpAmp.prototype.draw = function(c) {
+	    Component.prototype.draw.call(this,c);   // give superclass a shot
+	    // triangle
+	    this.draw_line(c,8,-8,8,24);
+	    this.draw_line(c,8,-8,40,8);
+	    this.draw_line(c,8,24,40,8);
+	    // inputs and output
+	    this.draw_line(c,0,0,8,0);
+	    this.draw_line(c,0,16,8,16);
+	    this.draw_text(c,'gnd',37,18,property_size);
+	    this.draw_line(c,40,8,48,8);
+	    this.draw_line(c,24,16,24,32);
+	    // + and -
+	    this.draw_line(c,10,0,16,0);
+	    this.draw_line(c,13,-3,13,3);
+	    this.draw_line(c,10,16,16,16);
+
+	    if (this.properties['name'])
+		this.draw_text(c,this.properties['name'],32,16,0,property_size);
+	}
+
+	OpAmp.prototype.clone = function(x,y) {
+	    return new OpAmp(x,y,this.rotation,this.properties['name'],this.properties['A']);
+	}
+
+	////////////////////////////////////////////////////////////////////////////////
+	//
+	//  Source
+	//
+	////////////////////////////////////////////////////////////////////////////////
+
+	
+	function Source(x,y,rotation,name,type,value) {
+	    Component.call(this,type,x,y,rotation);
+	    this.properties['name'] = name;
+	    if (value == undefined) value = 'dc(1)';
+	    this.properties['value'] = value;
+	    this.add_connection(0,0);
+	    this.add_connection(0,48);
+	    this.bounding_box = [-12,0,12,48];
+	    this.update_coords();
+
+	    this.content = document.createElement('div');  // used by edit_properties
+	}
+	Source.prototype = new Component();
+	Source.prototype.constructor = Source;
+
+	Source.prototype.toString = function() {
+	    return '<'+this.type+'source '+this.properties['params']+' ('+this.x+','+this.y+')>';
+	}
+    
+	Source.prototype.draw = function(c) {
+	    Component.prototype.draw.call(this,c);   // give superclass a shot
+	    this.draw_line(c,0,0,0,12);
+	    this.draw_circle(c,0,24,12,false);
+	    this.draw_line(c,0,36,0,48);
+
+	    if (this.type == 'v') {  // voltage source
+		//this.draw_text(c,'+',0,12,1,property_size);
+		//this.draw_text(c,'\u2013',0,36,7,property_size);  // minus sign
+		// draw + and -
+		this.draw_line(c,0,15,0,21);
+		this.draw_line(c,-3,18,3,18);
+		this.draw_line(c,-3,30,3,30);
+		// draw V
+		//this.draw_line(c,-3,20,0,28);
+		//this.draw_line(c,3,20,0,28);
+	    } else if (this.type == 'i') {  // current source
+		// draw arrow: pos to neg
+		this.draw_line(c,0,15,0,32);
+		this.draw_line(c,-3,26,0,32);
+		this.draw_line(c,3,26,0,32);
+	    }
+
+	    if (this.properties['name'])
+		this.draw_text(c,this.properties['name'],-13,24,5,property_size);
+	    if (this.properties['value'])
+		this.draw_text(c,this.properties['value'],13,24,3,property_size);
+	}
+
+	// map source function name to labels for each source parameter
+	source_functions = {
+	    'dc': ['DC value'],
+
+	    'impulse': ['Height',
+			'Width (secs)'],
+
+	    'step': ['Initial value',
+		     'Plateau value',
+		     'Delay until step (secs)',
+		     'Rise time (secs)'],
+
+	    'square': ['Initial value',
+		       'Plateau value',
+		       'Frequency (Hz)',
+		       'Duty cycle (%)'],
+
+	    'triangle': ['Initial value',
+			 'Plateau value',
+			 'Frequency (Hz)'],
+
+	    'pwl': ['Comma-separated list of alternating times and values'],
+
+	    'pwl_repeating': ['Comma-separated list of alternating times and values'],
+
+	    'pulse': ['Initial value',
+		      'Plateau value',
+		      'Delay until pulse (secs)',
+		      'Time for first transition (secs)',
+		      'Time for second transition (secs)',
+		      'Pulse width (secs)',
+		      'Period (secs)'],
+
+	    'sin': ['Offset value',
+		    'Amplitude',
+		    'Frequency (Hz)',
+		    'Delay until sin starts (secs)',
+		    'Phase offset (degrees)'],
+	}
+
+	// build property editor div
+	Source.prototype.build_content = function(src) {
+	    // make an <input> widget for each property
+	    var fields = []
+	    fields['name'] = build_input('text',10,this.properties['name']);
+
+	    if (src == undefined) {
+		fields['value'] = this.properties['value'];
+	    } else {
+		// fancy version: add select tag for source type
+		var src_types = [];
+		for (var t in source_functions) src_types.push(t);
+		var type_select = build_select(src_types,src.fun);
+		type_select.component = this;
+		type_select.addEventListener('change',source_type_changed,false)
+		fields['type'] = type_select;
+
+		if (src.fun == 'pwl' || src.run == 'pwl_repeating') {
+		    var v = '';
+		    var first = true;
+		    for (var i = 0; i < src.args.length; i++) {
+			if (first) first = false;
+			else v += ',';
+			v += engineering_notation(src.args[i],3);
+			if (i % 2 == 0) v += 's';
+		    }
+		    fields[source_functions[src.fun][0]] = build_input('text',30,v);
+		} else {
+		    // followed separate input tag for each parameter
+		    var labels = source_functions[src.fun];
+		    for (var i = 0; i < labels.length; i++) {
+			var v = engineering_notation(src.args[i],3);
+			fields[labels[i]] = build_input('text',10,v);
+		    }
+		}
+	    }
+
+	    var div = this.content;
+	    if (div.hasChildNodes())
+		div.removeChild(div.firstChild);  // remove table of input fields
+	    div.appendChild(build_table(fields));
+	    div.fields = fields;
+	    div.component = this;
+	    return div;
+	}
+
+	function source_type_changed(event) {
+	    if (!event) event = window.event;
+	    var select = (window.event) ? event.srcElement : event.target;
+
+	    // see where to get source parameters from
+	    var type = select.options[select.selectedIndex].value;
+	    var src = undefined;
+	    if (this.src != undefined && type == this.src.fun)
+		src = this.src;
+	    else if (typeof cktsim != 'undefined')
+		src = cktsim.parse_source(type+'()');
+
+	    select.component.build_content(src);
+	}
+
+	Source.prototype.edit_properties = function(x,y) {
+	    if (this.near(x,y)) {
+		this.src = undefined;
+		if (typeof cktsim != 'undefined')
+		    this.src = cktsim.parse_source(this.properties['value']);
+		var content = this.build_content(this.src);
+
+		this.sch.dialog('Edit Properties',content,function(content) {
+			var c = content.component;
+			var fields = content.fields;
+
+			var first = true;
+			var value = '';
+			for (var label in fields) {
+			    if (label == 'name') 
+				c.properties['name'] = fields['name'].value;
+			    else if (label == 'value')  {
+				// if unknown source type
+				value = fields['value'].value;
+				c.sch.redraw_background();
+				return;
+			    } else if (label == 'type') {
+				var select = fields['type'];
+				value = select.options[select.selectedIndex].value + '(';
+			    } else {
+				if (first) first = false;
+				else value += ',';
+				value += fields[label].value;
+			    }
+			}
+			c.properties['value'] = value + ')';
+			c.sch.redraw_background();
+		    });
+		return true;
+	    } else return false;
+	}
+
+
+	function VSource(x,y,rotation,name,value) {
+	    Source.call(this,x,y,rotation,name,'v',value);
+	    this.type = 'v';
+	}
+	VSource.prototype = new Component();
+	VSource.prototype.constructor = VSource;
+	VSource.prototype.toString = Source.prototype.toString;
+	VSource.prototype.draw = Source.prototype.draw;
+	VSource.prototype.clone = Source.prototype.clone;
+	VSource.prototype.build_content = Source.prototype.build_content;
+	VSource.prototype.edit_properties = Source.prototype.edit_properties;
+
+	// display current for DC analysis
+	VSource.prototype.display_current = function(c,vmap) {
+	    var name = this.properties['name'];
+	    var label = 'I(' + (name ? name : '_' + this.properties['_json_']) + ')';
+	    var v = vmap[label];
+	    if (v != undefined) {
+		// first draw some solid blocks in the background
+		c.globalAlpha = 0.5;
+		this.draw_text(c,'\u2588\u2588\u2588',-8,8,4,annotation_size,element_style);
+		c.globalAlpha = 1.0;
+
+		// display the element current 
+		var i = engineering_notation(v,2) + 'A';
+		this.draw_text(c,i,-3,5,5,annotation_size,annotation_style);
+		// draw arrow for current
+		this.draw_line(c,-3,4,0,8);
+		this.draw_line(c,3,4,0,8);
+		// only display each current once
+		delete vmap[label];
+	    }
+	}
+
+	VSource.prototype.clone = function(x,y) {
+	    return new VSource(x,y,this.rotation,this.properties['name'],this.properties['value']);
+	}
+
+	function ISource(x,y,rotation,name,value) {
+	    Source.call(this,x,y,rotation,name,'i',value);
+	    this.type = 'i';
+	}
+	ISource.prototype = new Component();
+	ISource.prototype.constructor = ISource;
+	ISource.prototype.toString = Source.prototype.toString;
+	ISource.prototype.draw = Source.prototype.draw;
+	ISource.prototype.clone = Source.prototype.clone;
+	ISource.prototype.build_content = Source.prototype.build_content;
+	ISource.prototype.edit_properties = Source.prototype.edit_properties;
+
+	ISource.prototype.clone = function(x,y) {
+	    return new ISource(x,y,this.rotation,this.properties['name'],this.properties['value']);
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  JQuery slider support for setting a component value
+	//
+	///////////////////////////////////////////////////////////////////////////////
+
+	function component_slider(event,ui) {
+	    var sname = $(this).slider("option","schematic");
+
+	    // set value of specified component
+	    var cname = $(this).slider("option","component");
+	    var pname = $(this).slider("option","property");
+	    var suffix = $(this).slider("option","suffix");
+	    if (typeof suffix != "string") suffix = "";
+
+	    var v = ui.value;
+	    $(this).slider("value",v);  // move slider's indicator
+
+	    var choices = $(this).slider("option","choices");
+	    if (choices instanceof Array) v = choices[v];
+
+	    // selector may match several schematics
+	    $("." + sname).each(function(index,element) {
+		    element.schematic.set_property(cname,pname,v.toString() + suffix);
+		})
+
+	    // perform requested analysis
+	    var analysis = $(this).slider("option","analysis");
+	    if (analysis == "dc")
+		$("." + sname).each(function(index,element) {
+			element.schematic.dc_analysis();
+		    })
+
+	    return false;
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Module definition
+	//
+	///////////////////////////////////////////////////////////////////////////////
+
+	var module = {
+	    'Schematic': Schematic,
+	    'component_slider': component_slider,
+	}
+	return module;
+    }());
diff --git a/common/test/data/full/problem/Circuit_Sandbox.xml b/common/test/data/full/problem/Circuit_Sandbox.xml
new file mode 100644
index 0000000000..89625f447b
--- /dev/null
+++ b/common/test/data/full/problem/Circuit_Sandbox.xml
@@ -0,0 +1,6 @@
+<problem><startouttext/><p/>Here's a sandbox where you can experiment with all the components
+we'll discuss in 6.002x.  If you click on CHECK below, your diagram
+will be saved on the server and you can return at some later time.
+<endouttext/><schematicresponse><p/><center><schematic name="work" value="" width="800" height="600"/></center><answer type="loncapa/python">
+correct = ['correct']
+</answer></schematicresponse></problem>
diff --git a/common/test/data/full/problem/H1P1_Energy.xml b/common/test/data/full/problem/H1P1_Energy.xml
new file mode 100644
index 0000000000..18e71622d3
--- /dev/null
+++ b/common/test/data/full/problem/H1P1_Energy.xml
@@ -0,0 +1,32 @@
+<problem><script type="loncapa/python">
+i = random.randrange(3)
+M = ["Big Mac", "Angus Bacon and Cheese", "Quarter Pounder with Cheese"][i]
+C = [540, 790, 510][i]
+
+BM = C*1000*4.2
+CB = 50*12*3600
+</script><startouttext/>
+According to McDonald's
+<a href="http://nutrition.mcdonalds.com/getnutrition/nutritionfacts.pdf">nutrition
+facts</a> a \($M\) provides \($C\) kiloCalories of energy.  (1 dietitian's
+calorie is 1000 physicist's calories.)  A typical automobile lead-acid
+battery can supply 50 Ampere-hours at 12 Volts.  We can compare these by
+converting the energy specifications to common units.  The SI unit of
+energy is the Joule=1 Watt-second.  One physicist's calorie is 4.2 Joules.
+<endouttext/>
+<startouttext/> 
+<br/>
+How many Joules are there in a \($M\)?
+<endouttext/>
+<numericalresponse answer="$BM"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/> 
+<br/>
+How many Joules are there in a car battery?
+<endouttext/>
+<numericalresponse answer="$CB"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/> 
+<br/>
+Which tastes better? :-)
+<endouttext/>
+
+</problem>
diff --git a/common/test/data/full/problem/H1P2_Duality.xml b/common/test/data/full/problem/H1P2_Duality.xml
new file mode 100644
index 0000000000..4b1812c0b7
--- /dev/null
+++ b/common/test/data/full/problem/H1P2_Duality.xml
@@ -0,0 +1,127 @@
+<problem><script type="loncapa/python">
+scale = float(random.randrange(1000,2000,10))/1000
+
+V  = 10*scale
+R1 = 3*scale
+R2 = 2*scale
+
+vV = V
+R1R2S = R1+R2
+i1 = V/R1R2S
+i2 = i1
+iV = -i1
+v1 = i1*R1
+v2 = i2*R2
+
+Ps= vV*iV + v1*i1 + v2*i2
+
+
+I  = V
+R3 = 1/R1
+R4 = 1/R2
+
+iI = -I
+R3R4P = (R3*R4)/(R3+R4)
+vI = I*R3R4P
+v3 = vI
+v4 = vI
+i3 = v3/R3
+i4 = v4/R4
+
+Pp = vI*iI + v3*i3 + v4*i4
+</script><startouttext/>
+In this problem we will investigate a fun idea called "duality."
+<br/>
+Consider the series circuit in the diagram shown.
+<center><img src="/static/circuits/duality.gif"/></center>
+We are given device parameters \(V=$V\)V, \(R_1=$R1\Omega\), and \(R_2=$R2\Omega\).
+All of the unknown voltages and currents are labeled in associated reference
+directions.  Solve this circuit for the unknowns and enter them into
+the boxes given.
+<br/>
+The value (in Volts) of \(v_1\) is: 
+<endouttext/>
+<numericalresponse answer="$v1"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+The value (in Amperes) of \(i_1\) is: 
+<endouttext/>
+<numericalresponse answer="$i1"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+The value (in Volts) of \(v_2\) is: 
+<endouttext/>
+<numericalresponse answer="$v2"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+The value (in Amperes) of \(i_2\) is: 
+<endouttext/>
+<numericalresponse answer="$i2"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+The value (in Volts) of \(v_V\) is: 
+<endouttext/>
+<numericalresponse answer="$vV"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+The value (in Amperes) of \(i_V\) is: 
+<endouttext/>
+<numericalresponse answer="$iV"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+The sum of the powers (in Watts) entering all of the elements is:
+<endouttext/>
+<numericalresponse answer="$Ps"><responseparam type="tolerance" default="0.00001" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+
+<startouttext/>
+<br/> <br/> Now, let's turn our attentions to the parallel circuit.  
+The numerical value of the strength of the current source is set to be
+the same as the numerical value of the strength of the voltage source: 
+\(I=$I\)A.  The resistances are set to be reciprocals of the
+resistances in the series circuit:  \(R_3=$R3\Omega\) and
+\(R_4=$R4\Omega\). 
+<br/>
+Solve this circuit for the unknowns and enter them into
+the boxes given.
+<br/>
+The value (in Volts) of \(v_3\) is: 
+<endouttext/>
+<numericalresponse answer="$v3"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+The value (in Amperes) of \(i_3\) is: 
+<endouttext/>
+<numericalresponse answer="$i3"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+The value (in Volts) of \(v_4\) is: 
+<endouttext/>
+<numericalresponse answer="$v4"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+The value (in Amperes) of \(i_4\) is: 
+<endouttext/>
+<numericalresponse answer="$i4"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+The value (in Volts) of \(v_I\) is: 
+<endouttext/>
+<numericalresponse answer="$vI"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+The value of (in Amperes) \(i_I\) is: 
+<endouttext/>
+<numericalresponse answer="$iI"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+The sum of the powers (in Watts) entering all of the elements is:
+<endouttext/>
+<numericalresponse answer="$Pp"><responseparam type="tolerance" default="0.00001" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+
+<startouttext/>
+<br/> <br/>  Look carefully at the numbers you have derived.
+Compare the series and parallel circuit.  Do you see the pattern?
+<endouttext/>
+
+
+</problem>
diff --git a/common/test/data/full/problem/H1P3_Poor_Workmanship.xml b/common/test/data/full/problem/H1P3_Poor_Workmanship.xml
new file mode 100644
index 0000000000..cf9db4053a
--- /dev/null
+++ b/common/test/data/full/problem/H1P3_Poor_Workmanship.xml
@@ -0,0 +1,84 @@
+<problem><script type="loncapa/python">
+V = 240
+P = float(random.randrange(800,1600,10))
+Pmax = 3*P
+Imax = Pmax/V
+
+Iq = Pmax/120
+
+R = (V**2)/P
+
+Rbad = 3*R/2
+
+Pbad = (V**2)/Rbad
+
+Ibad = Pbad/V
+
+PH1 = (Ibad**2)*R
+PH2 = ((Ibad/2)**2)*R
+PH3 = PH2
+</script><startouttext/>
+Joe wants to heat his 12'X20' workshop with electric heat.  He has
+hired the HACME electrician company to build the system.  They propose
+to use three \($P\)W 240V baseboard heaters to provide a total heating
+capacity of \($Pmax\)W.  (A heater is basically a
+resistor.  This is not quite true, because there is a thermostatic
+switch incorporated into the heater and because the resistance of a
+heater varies a bit with its temperature.  But we will use a linear
+resistor as a model of a heater.)
+<br/>
+In the proposed system the heaters are connected in parallel with the
+240V 60Hz AC power line (modeled by a voltage source) as shown in the
+diagram:
+<center><img src="/static/circuits/heaters-parallel.gif"/></center>
+Remember (from exercise S1E3: AC POWER) that AC power-line voltages
+and currents are specified as RMS values.  So 120V AC heats a given
+resistance exactly as much as 120V DC would heat that same 
+resistance.
+<endouttext/>
+
+<startouttext/>
+<br/>
+How much current is expected to be drawn from the power line by this
+heating system when all three heaters are on?
+<endouttext/>
+<numericalresponse answer="$Imax"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+If instead, HACME chose to implement the system with 120V heaters, how
+much current would have been needed?
+<endouttext/>
+<numericalresponse answer="$Iq"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+Notice that this would require much heavier and more expensive wire to
+distribute the power.  
+<br/> <br/>
+Back to the original plan with 240V power.
+<br/>
+Unfortunately, Sparky, who works for HACME, was a little sleepy that
+day.  He accidentally connected the heaters as shown below:
+<center><img src="/static/circuits/heaters-bad.gif"/></center>
+<br/>
+As a consequence, Joe found his workshop too cold.  H1 was weak; H2
+and H3 barely warmed up.
+<br/>
+What power was being dissipated in H1?
+<endouttext/>
+<numericalresponse answer="$PH1"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+What power was being dissipated in H2 (or in H3)?
+<endouttext/>
+<numericalresponse answer="$PH2"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+So the total heating power in Joe's shop was:
+<endouttext/>
+<numericalresponse answer="$Pbad"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+<startouttext/>
+<br/>
+No wonder Joe was cold.
+<endouttext/>
+
+</problem>
diff --git a/common/test/data/full/problem/Lab_0_Using_the_Tools.xml b/common/test/data/full/problem/Lab_0_Using_the_Tools.xml
new file mode 100644
index 0000000000..b5f593c294
--- /dev/null
+++ b/common/test/data/full/problem/Lab_0_Using_the_Tools.xml
@@ -0,0 +1,115 @@
+<problem><startouttext/><br/>In this first lab, the goal is to familiarize yourself with the
+interactive tool that will be used to enter and analyze circuits.  Here's
+the example schematic used below:
+
+<br/><center><input type="hidden" class="schematic" analyses="" parts="" origin_x="50" origin_y="20" width="400" height="350" name="fig1" value="[[&quot;w&quot;,[120,160,144,160]],[&quot;v&quot;,[48,64,0],{&quot;name&quot;:&quot;Vsupply&quot;,&quot;value&quot;:&quot;dc(3)&quot;,&quot;_json_&quot;:1},[&quot;A&quot;,&quot;D&quot;]],[&quot;r&quot;,[120,64,0],{&quot;name&quot;:&quot;R2&quot;,&quot;r&quot;:&quot;3k&quot;,&quot;_json_&quot;:2},[&quot;B&quot;,&quot;C&quot;]],[&quot;r&quot;,[120,16,0],{&quot;name&quot;:&quot;R1&quot;,&quot;r&quot;:&quot;1k&quot;,&quot;_json_&quot;:3},[&quot;A&quot;,&quot;B&quot;]],[&quot;r&quot;,[120,112,0],{&quot;name&quot;:&quot;R3&quot;,&quot;r&quot;:&quot;2k&quot;,&quot;_json_&quot;:4},[&quot;C&quot;,&quot;D&quot;]],[&quot;w&quot;,[48,64,48,16]],[&quot;w&quot;,[48,16,120,16]],[&quot;w&quot;,[48,112,48,160]],[&quot;w&quot;,[48,160,120,160]],[&quot;w&quot;,[120,112,144,112]],[&quot;w&quot;,[120,64,144,64]],[&quot;w&quot;,[120,16,144,16]],[&quot;L&quot;,[144,16,3],{&quot;label&quot;:&quot;A&quot;,&quot;_json_&quot;:12},[&quot;A&quot;]],[&quot;L&quot;,[144,64,3],{&quot;label&quot;:&quot;B&quot;,&quot;_json_&quot;:13},[&quot;B&quot;]],[&quot;L&quot;,[144,112,3],{&quot;label&quot;:&quot;C&quot;,&quot;_json_&quot;:14},[&quot;C&quot;]],[&quot;g&quot;,[48,160,0],{&quot;_json_&quot;:15},[&quot;D&quot;]],[&quot;L&quot;,[144,160,3],{&quot;label&quot;:&quot;D&quot;,&quot;_json_&quot;:16},[&quot;D&quot;]],[&quot;view&quot;,0,0,2,&quot;5&quot;,&quot;10&quot;,&quot;10MEG&quot;,null,&quot;100&quot;,&quot;1&quot;]]"/>
+Figure 1.  Test Circuit for Lab 0
+</center><br/>And here's the interactive tool to be used in the tasks that follow:
+
+<endouttext/><schematicresponse><startouttext/><br/><center><schematic analyses="dc,tran" parts="g,L,v,r,s" name="work" value="" width="600" height="400"/></center><endouttext/><answer type="loncapa/python">
+correct = ['correct']
+</answer></schematicresponse><startouttext/><br/>Please do the following tasks.  When you're done, remember to click CHECK to preserve
+your work and to verify your answers.
+
+<ol style="list-style-type:decimal; margin-left: 2em;"><br/><li><b>Enter schematic.</b> Add the voltage source, resistors,
+wires and ground reference to your diagram, connected as shown
+in <nobr>Figure 1</nobr>.</li><br/><li><b>Measure voltages.</b> Use the tool to run a DC analysis on
+the circuit, i.e.., click on the DC button in the toolbar.  This will
+annotate each node/voltage source in the circuit with a
+voltage/current.  If the components are wired correctly, the
+voltage for node D should be reported as 0V since it's
+connected to the ground reference and the voltage for node A
+should be reported as 3V since it is connected directly to the
+positive terminal of a 3V voltage source whose negative terminal
+is connected to ground.  Please enter the voltages reported for nodes
+B and C.
+
+<br/><div style="margin-left: 4em;">
+Voltage for node B (volts):
+<numericalresponse answer="2.5"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+</div>
+
+<div style="margin-left: 4em;">
+Voltage for node C (volts):
+<numericalresponse answer="1.0"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+</div>
+
+</li><br/><li><b>Measure current.</b>
+
+The DC analysis annotates each voltage source with the current it is
+providing to the rest of the circuit. The simulator denotes the sign
+of the source current as positive if the current is flowing out of the
+positive terminal of the source, through the rest of the circuit, and
+then back in to the negative terminal.  And the source current sign is
+negative if the current is flowing out of the negative terminal of the
+source, through the circuit, and into the positive terminal of the
+source. Please report the total resistance of the path connecting the
+positive and negative terminals of the source, the signed current
+flowing from the source into the circuit, and (using the voltage
+value for the source) verify that Ohm's law is obeyed.
+
+<br/><div style="margin-left: 4em;">
+Total resistance between pos and neg terminals (ohms):
+<numericalresponse answer="6000"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+</div>
+
+<div style="margin-left: 4em;">
+Current flowing from source into the circuit (amps, with correct sign):
+<numericalresponse answer="500e-6"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+</div>
+
+</li><br/><li><b>Verify KVL.</b> The four components in the schematic form a
+large loop -- let's verify that Kirchoff's Voltage Law holds by
+summing the voltage changes across the devices.  Starting with node A,
+travel clockwise around the loop of components, entering the voltage
+change across each component.  Choose the sign of the change for a
+component using the first terminal you come to in the clockwise
+traversal as the reference node.  Verify that these four values sum
+to 0.
+
+<br/>
+<div style="margin-left: 4em;">
+Voltage change across R1 (volts, with correct sign):
+<numericalresponse answer="-0.5"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+</div>
+
+<div style="margin-left: 4em;">
+Voltage change across R2 (volts, with correct sign):
+<numericalresponse answer="-1.5"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+</div>
+
+<div style="margin-left: 4em;">
+Voltage change across R3 (volts, with correct sign):
+<numericalresponse answer="-1.0"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+</div>
+
+<div style="margin-left: 4em;">
+Voltage change across Vsupply (volts, with correct sign):
+<numericalresponse answer="3.0"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+</div>
+</li><br/><li><b>Transient analysis.</b> Change the waveform produced by
+the voltage source from a DC value of 3V to a sinusoid with a 1V
+amplitude, an offset voltage of 1V, and a frequency of 1kHz.  Add
+scope probes to nodes A, B and C and edit their properties so that the
+plots will be different colors. Now run a transient analysis for 5ms.
+Move the mouse over the plot until the marker (a vertical dashed line
+that follows the mouse when it's over the plot) is at approximately
+1.25ms.  Please report the measured voltages for nodes A, B and C.
+
+<br/>
+<div style="margin-left: 4em;">
+Voltage for node A (volts):
+<numericalresponse answer="1.995"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+</div>
+
+<div style="margin-left: 4em;">
+Voltage for node B (volts):
+<numericalresponse answer="1.662"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+</div>
+
+<div style="margin-left: 4em;">
+Voltage for node C (volts):
+<numericalresponse answer=".665"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+</div>
+
+</li></ol><endouttext/></problem>
diff --git a/common/test/data/full/problem/Resistor_Divider.xml b/common/test/data/full/problem/Resistor_Divider.xml
new file mode 100644
index 0000000000..a5d6630c79
--- /dev/null
+++ b/common/test/data/full/problem/Resistor_Divider.xml
@@ -0,0 +1,59 @@
+<problem><startouttext/><br/><br/>You have a 6-volt battery (assumed ideal) and a 1.5-volt flashlight
+bulb, which is known to draw \(0.5 A\) when the bulb voltage is \(1.5 V\) (see
+figure below). Design a network of resistors to go between the battery
+and the bulb to give \(v_s = 1.5 V\) when the bulb is connected, yet
+ensures that \(v_s\) does not rise above \(2 V\) when the bulb is disconnected.
+
+<br/><br/><center><img src="/static/circuits/Lab1_1.png"/></center><br/><br/><i>Hint</i>: use a two-resistor voltage divider to create the voltage for node A.  You'll
+have two unknowns (R1 and R2) which can be determined by solving the two equations for
+\(v_s\) derived from the constraints above: one involving R1, R2 and Rbulb where \(v_s = 1.5\), and
+one involving R1 and R2 where \(v_s = 2\).
+
+<br/><br/>There are two schematic diagrams below.  Please enter the network
+of resistors you've designed into both diagrams.  The top diagram is
+the model when the bulb is connected; the bottom diagram is the model
+when the bulb is disconnected.
+
+<br/><br/>Run a DC analysis on both diagrams to
+show that the node labeled "A" has a voltage of approximately 
+\(1.5 V\) in the top diagram and less than \(2 V\) in the bottom
+adiagram.  Submit your results <i>after</i> the DC analyses have
+been run (so the results of the analyses will be submitted too).
+<endouttext/>
+
+<schematicresponse><startouttext/>
+Schematic model when bulb is connected:
+
+<center><schematic height="270" width="400" parts="r" analyses="dc" initial_value="[[&quot;w&quot;,[48,88,48,112]],[&quot;L&quot;,[160,16,3],{&quot;label&quot;:&quot;A&quot;},[&quot;A&quot;]],[&quot;g&quot;,[48,112,0],{},[&quot;0&quot;]],[&quot;w&quot;,[160,112,136,112]],[&quot;w&quot;,[160,88,160,112]],[&quot;w&quot;,[160,16,136,16]],[&quot;w&quot;,[160,40,160,16]],[&quot;r&quot;,[160,40,0],{&quot;name&quot;:&quot;Bulb&quot;,&quot;r&quot;:&quot;3&quot;},[&quot;A&quot;,&quot;1&quot;]],[&quot;w&quot;,[48,112,72,112]],[&quot;w&quot;,[48,16,72,16]],[&quot;w&quot;,[48,40,48,16]],[&quot;v&quot;,[48,40,0],{&quot;name&quot;:&quot;Battery&quot;,&quot;value&quot;:&quot;6V&quot;},[&quot;2&quot;,&quot;0&quot;]],[&quot;view&quot;,0,0,2]]"/></center>
+
+Schematic model when bulb is disconnected:
+
+<center><schematic height="270" width="400" parts="r" analyses="dc" initial_value="[[&quot;w&quot;,[48,88,48,112]],[&quot;L&quot;,[160,16,3],{&quot;label&quot;:&quot;A&quot;},[&quot;A&quot;]],[&quot;g&quot;,[48,112,0],{},[&quot;0&quot;]],[&quot;w&quot;,[160,112,136,112]],[&quot;w&quot;,[160,88,160,112]],[&quot;w&quot;,[160,16,136,16]],[&quot;w&quot;,[160,40,160,16]],[&quot;w&quot;,[48,112,72,112]],[&quot;w&quot;,[48,16,72,16]],[&quot;w&quot;,[48,40,48,16]],[&quot;v&quot;,[48,40,0],{&quot;name&quot;:&quot;Battery&quot;,&quot;value&quot;:&quot;6V&quot;},[&quot;2&quot;,&quot;0&quot;]],[&quot;view&quot;,0,0,2]]"/></center>
+<endouttext/>
+
+<answer type="loncapa/python">
+# for a schematic response, submission[i] is the json representation
+# of the diagram and analysis results for the i-th schematic tag
+
+correct = ['incorrect',  'incorrect']    # optimistic default :)
+
+def get_dc(json):
+  for element in json:
+    if element[0] == 'dc': return element[1]
+  return None
+
+dc_with_bulb = get_dc(submission[0])
+if dc_with_bulb:
+  v = dc_with_bulb['A']
+  if v &gt;= 1.4 and v &lt;= 1.6:    # want 1.5
+    correct[0] = 'correct'
+
+dc_without_bulb = get_dc(submission[1])
+if dc_without_bulb:
+  v = dc_without_bulb['A']
+  if v &lt;= 2.1:    # want 2
+    correct[1] = 'correct'
+
+</answer>
+</schematicresponse>
+</problem>
diff --git a/common/test/data/full/problem/S1E3_AC_power.xml b/common/test/data/full/problem/S1E3_AC_power.xml
new file mode 100644
index 0000000000..b818d936f5
--- /dev/null
+++ b/common/test/data/full/problem/S1E3_AC_power.xml
@@ -0,0 +1,40 @@
+<problem><script type="loncapa/python">
+R = float(random.randrange(100,200,10))
+
+Vrms = 120
+Vp = math.sqrt(2)*Vrms
+Pp = (Vp**2)/R
+Prms = (Vrms**2)/R
+</script><startouttext/>
+The plot shows 1/10 second of the voltage waveform of a 120V 60Hz AC
+(Alternating Current)
+power circuit, like that delivered to residences in the United States.
+<center><img src="/static/circuits/120V60Hz.gif"/></center>
+The actual voltage is \(120*sqrt(2)*cos(2*\pi*60*t)\)Volts.  If we apply
+this voltage across a resistor of resistance \($R\Omega\) the resistor
+will dissipate a time-varying power.
+What is the peak power (in Watts) dissipated by the resistor?
+<endouttext/>
+<numericalresponse answer="$Pp"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+
+<startouttext/>
+<br/> What is the average power (in Watts) dissipated by the resistor?  (Hint: you
+  compute the average power by integrating the power over one cycle of
+  the waveform.)
+<endouttext/>
+<numericalresponse answer="$Prms"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+
+<startouttext/>
+<br/> What would be the power (in Watts) dissipated by the resistor if the voltage
+  was a constant value of 120V?
+<endouttext/>
+<numericalresponse answer="$Prms"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+
+<startouttext/>
+<br/> If a time-varying voltage dissipates the same power in a resistor
+as a constant voltage would dissipate, we say that the time-varying voltage has
+the RMS value of the constant.  RMS is an abbreviation for Root-Mean-Square.
+<endouttext/>
+
+
+</problem>
diff --git a/common/test/data/full/problem/Sample_Algebraic_Problem.xml b/common/test/data/full/problem/Sample_Algebraic_Problem.xml
new file mode 100644
index 0000000000..7bea1cc92e
--- /dev/null
+++ b/common/test/data/full/problem/Sample_Algebraic_Problem.xml
@@ -0,0 +1,13 @@
+<problem><script type="loncapa/python">
+
+z = "A*x^2 + sqrt(y)"
+
+</script><startouttext/>
+Enter the algebraic expression \(A x^2 + \sqrt{y}\) in the box below.  The
+entry is case sensitive.  The product must be indicated with an
+asterisk, and the exponentation with a caret, so you must write 
+"A*x^2 + sqrt(y)".
+<endouttext/>
+<formularesponse type="cs" samples="A,x,y@1,1,1:3,3,3#10" answer="$z"><responseparam description="Numerical Tolerance" type="tolerance" default="0.00001" name="tol"/><textline size="40"/></formularesponse>
+
+</problem>
diff --git a/common/test/data/full/problem/Sample_Numeric_Problem.xml b/common/test/data/full/problem/Sample_Numeric_Problem.xml
new file mode 100644
index 0000000000..f41881a028
--- /dev/null
+++ b/common/test/data/full/problem/Sample_Numeric_Problem.xml
@@ -0,0 +1,8 @@
+<problem><startouttext/>
+Enter the numerical value of the expression \(x + y\) where 
+\(x = 3\) and \(y = 5\).
+<endouttext/>
+
+<numericalresponse answer="8"><responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance"/><textline/></numericalresponse>
+
+</problem>
diff --git a/common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml b/common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml
new file mode 100644
index 0000000000..28b56fb9b0
--- /dev/null
+++ b/common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml
@@ -0,0 +1,18 @@
+<sequential>
+  <vertical filename="vertical_58" slug="vertical_58" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never"/>
+  <vertical slug="vertical_66" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never">
+    <problem filename="S1E3_AC_power" slug="S1E3_AC_power" name="S1E3: AC power"/>
+    <customtag tag="S1E3" slug="discuss_67">
+      <impl>discuss</impl>
+    </customtag>
+    <html slug="html_68"> S1E4 has been removed. </html>
+  </vertical>
+  <vertical filename="vertical_89" slug="vertical_89" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never"/>
+  <vertical slug="vertical_94" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never">
+    <video youtube="0.75:XNh13VZhThQ,1.0:XbDRmF6J0K0,1.25:JDty12WEQWk,1.50:wELKGj-5iyM" slug="What_s_next" name="What's next"/>
+    <html slug="html_95">Minor correction: Six elements (five resistors)</html>
+    <customtag tag="S1" slug="discuss_96">
+      <impl>discuss</impl>
+    </customtag>
+  </vertical>
+</sequential>
diff --git a/common/test/data/full/sequential/System_Usage_Sequence.xml b/common/test/data/full/sequential/System_Usage_Sequence.xml
new file mode 100644
index 0000000000..baf73f1e9e
--- /dev/null
+++ b/common/test/data/full/sequential/System_Usage_Sequence.xml
@@ -0,0 +1,7 @@
+<sequential>
+  <vertical slug="vertical_7" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never">
+    <problem filename="Sample_Numeric_Problem" slug="Sample_Numeric_Problem" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="false" name="Sample Numeric Problem"/>
+    <problem filename="Sample_Algebraic_Problem" slug="Sample_Algebraic_Problem" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="false" name="Sample Algebraic Problem"/>
+  </vertical>
+  <vertical filename="vertical_16" slug="vertical_16" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never"/>
+</sequential>
diff --git a/common/test/data/full/static/js/sound_labs/circuit.js b/common/test/data/full/static/js/sound_labs/circuit.js
new file mode 100644
index 0000000000..dfd756a4a2
--- /dev/null
+++ b/common/test/data/full/static/js/sound_labs/circuit.js
@@ -0,0 +1,1247 @@
+var Circuit = (function() {
+
+	var Color =
+	{
+		background : "rgb(0, 51, 102)", //0.0, 0.2, 0.4
+		black : "rgb(0, 0, 0)", //0.0
+		lodarkgray : "rgb(26, 26, 26)", //0.1 = 25.5
+		darkgray : "rgb(51, 51, 51)", //0.2
+		lomidgray : "rgb(102, 102, 102)", //0.4
+		midgray : "rgb(128, 128, 128)", //0.5 = 127.5
+		himidgray : "rgb(153, 153, 153)", //0.6
+		litegray : "rgb(204, 204, 204)", //0.8
+		white : "rgb(255, 255, 255)", //1.0
+
+		red : "rgb(255, 0, 0)",
+		green : "rgb(0, 255, 0)",
+		blue : "rgb(0, 0, 255)",
+		yellow : "rgb(255, 255, 0)",
+		cyan : "rgb(0, 255, 255)",
+		magenta : "rgb(255, 0, 255)"
+	};
+	
+	var Utils =
+	{
+		TWO_PI: 2.0*Math.PI,
+		PI_DIV_2: Math.PI/2.0
+	};
+	
+	function distance(x1, y1, x2, y2)
+	{
+		var dx = x2 - x1;
+		var dy = y2 - y1;
+
+		return Math.sqrt(dx * dx + dy * dy);
+	}
+	
+	function transform(x, y, xt, yt, rot)
+	{
+		//First translate
+		x -= xt;
+		y -= yt;
+		//Then rotate
+		return {x: x * Math.cos(rot) - y * Math.sin(rot), y: x * Math.sin(rot) + y * Math.cos(rot)};
+	}
+
+	function closestGridPoint(gridStep, x)
+	{
+		return gridStep * Math.round(x / gridStep);
+	}
+	
+	function getMousePosition(diagram, event)
+	{
+		var mouseX = event.pageX - (parseInt(diagram.element.offset().left) + parseInt(diagram.element.css('paddingLeft')) + parseInt(diagram.element.css('borderLeftWidth')));
+		var mouseY = event.pageY - (parseInt(diagram.element.offset().top) + parseInt(diagram.element.css('paddingTop')) + parseInt(diagram.element.css('borderTopWidth')));
+		return {x : mouseX,	y : mouseY};
+	}
+	
+	function diagramMouseDown(event)
+	{
+		if (!event) event = window.event;
+	  else event.preventDefault();
+	  var canvas = (window.event) ? event.srcElement : event.target;
+	  var diagram = canvas.diagram;
+		var mpos = getMousePosition(diagram, event);
+
+		for(var i = 0, len = diagram.components.length; i < len; i++)
+		{
+			if(diagram.components[i].isInside(mpos.x, mpos.y))
+			{
+				diagram.components[i].selected = true;
+				diagram.startx = closestGridPoint(diagram.gridStep, mpos.x);
+				diagram.starty = closestGridPoint(diagram.gridStep, mpos.y);
+			}
+		}
+		
+		return false;
+	}
+
+	function diagramMouseMove(event)
+	{
+		if (!event) event = window.event;
+	  else event.preventDefault();
+	  var canvas = (window.event) ? event.srcElement : event.target;
+	  var diagram = canvas.diagram;
+	  var mpos = getMousePosition(diagram, event);
+		var componentSelected = false;
+
+		//First check if any component if selected
+		for(var i = 0, len = diagram.components.length; i < len; i++)
+		{
+			if(diagram.components[i].selected)
+			{
+				diagram.endx = closestGridPoint(diagram.gridStep, mpos.x);
+				diagram.components[i].x += (diagram.endx - diagram.startx);
+				diagram.startx = diagram.endx;
+				diagram.endy = closestGridPoint(diagram.gridStep, mpos.y);
+				diagram.components[i].y += (diagram.endy - diagram.starty);
+				diagram.starty = diagram.endy;
+				diagram.paint();
+				componentSelected = true;
+			}
+		}
+
+		if(!componentSelected)
+		{
+			for(var i = 0, len = diagram.components.length; i < len; i++)
+			{
+				if(diagram.components[i].isInside(mpos.x, mpos.y))
+					diagram.components[i].selectable = true;
+				else
+					diagram.components[i].selectable = false;
+				//Repaint only once, on a mouse enter or mouse leave
+				if(diagram.components[i].previousSelectable != diagram.components[i].selectable)
+				{
+					diagram.components[i].previousSelectable = diagram.components[i].selectable;
+					diagram.paint();
+				}
+			}
+		}
+
+		return false;
+	}
+	
+	function diagramMouseUp(event)
+	{
+		if (!event) event = window.event;
+	  else event.preventDefault();
+	  var canvas = (window.event) ? event.srcElement : event.target;
+	  var diagram = canvas.diagram;	
+		var mpos = getMousePosition(diagram, event);
+
+		for(var i = 0, len = diagram.components.length; i < len; i++)
+		{
+			//Unselect all
+			diagram.components[i].selected = false;
+		}
+		diagram.startx = 0;
+		diagram.endx = diagram.startx;
+		diagram.starty = 0;
+		diagram.endx = diagram.starty;
+
+		return false;
+	}
+	
+	function diagramDoubleClick(event)
+	{
+		if (!event) event = window.event;
+	  else event.preventDefault();
+	  var canvas = (window.event) ? event.srcElement : event.target;
+	  var diagram = canvas.diagram;	
+		
+		alert(diagram.toString());
+		
+		return false;
+	}
+	
+	function copyPrototype(descendant, parent)
+	{
+		var sConstructor = parent.toString();
+		var aMatch = sConstructor.match(/\s*function (.*)\(/);
+		if(aMatch != null)
+		{
+			descendant.prototype[aMatch[1]] = parent;
+		}
+		for(var m in parent.prototype)
+		{
+			descendant.prototype[m] = parent.prototype[m];
+		}
+	}
+	
+	function Diagram(element, frozen)
+	{
+		this.element = element;
+		this.frozen = frozen;
+		this.canvas = element[0];
+		this.canvas.diagram = this;
+		this.width = this.canvas.width;
+		this.height = this.canvas.height;
+		this.ctx = this.canvas.getContext("2d");
+		this.background = Color.black;
+		if (!this.frozen)
+		{
+			this.canvas.addEventListener('mousedown', diagramMouseDown, false);
+			this.canvas.addEventListener('mousemove', diagramMouseMove, false);
+			this.canvas.addEventListener('mouseup', diagramMouseUp, false);
+			this.canvas.addEventListener('dblclick', diagramDoubleClick, false);
+		}	
+		//To disable text selection outside the canvas
+		this.canvas.onselectstart = function(){return false;};
+		this.components = [];
+		this.gridStep = 5;
+		this.startx = 0;
+		this.endx = 0;
+		this.starty = 0;
+		this.endy = 0;
+		this.showGrid = false;
+		this.xGridMin = 10;
+		this.xGridMax = 500;
+		this.yGridMin = 10;
+		this.yGridMax = 500;
+		this.xOrigin = 0;
+		this.yOrigin = 0;
+		this.scale = 2; //Scaling is the same in x and y directions
+		this.fontSize = 6;
+		this.fontType = 'sans-serif'; 
+	}
+	
+	Diagram.prototype.toString = function()
+	{
+		var result = "";
+		for(var i = 0, len = this.components.length; i < len; i++)
+		{
+			result += this.components[i].toString();
+		}
+		
+		return result;
+	}
+	
+	Diagram.prototype.addNode = function(x, y)
+	{
+		var n = new Node(x, y);
+		n.ctx = this.ctx;
+		n.diagram = this;
+		n.updateBoundingBox();
+		this.components.push(n);
+		return n;
+	}
+	
+	Diagram.prototype.addWire = function(x1, y1, x2, y2)
+	{
+		var w = new Wire(x1, y1, x2, y2)
+		w.ctx = this.ctx;
+		w.diagram = this;
+		w.updateBoundingBox();
+		this.components.push(w);
+		return w;
+	}
+	
+	Diagram.prototype.addLabel = function(x, y, value, textAlign)
+	{
+		var l = new Label(x, y, value, textAlign)
+		l.ctx = this.ctx;
+		l.diagram = this;
+		l.updateBoundingBox();
+		this.components.push(l);
+		return l;
+	}
+	
+	Diagram.prototype.addResistor = function(x, y, value)
+	{
+		var r = new Resistor(x, y, value)
+		r.ctx = this.ctx;
+		r.diagram = this;
+		r.updateBoundingBox();
+		this.components.push(r);
+		return r;
+	}
+	
+	Diagram.prototype.addInductor = function(x, y, value)
+	{
+		var l = new Inductor(x, y, value)
+		l.ctx = this.ctx;
+		l.diagram = this;
+		l.updateBoundingBox();
+		this.components.push(l);
+		return l;
+	}
+	
+	Diagram.prototype.addCapacitor = function(x, y, value)
+	{
+		var c = new Capacitor(x, y, value)
+		c.ctx = this.ctx;
+		c.diagram = this;
+		c.updateBoundingBox();
+		this.components.push(c);
+		return c;
+	}
+	
+	Diagram.prototype.addMosfet = function(x, y, value, type)
+	{
+		var m = new Mosfet(x, y, value, type)
+		m.ctx = this.ctx;
+		m.diagram = this;
+		m.updateBoundingBox();
+		this.components.push(m);
+		return m;
+	}
+	
+	Diagram.prototype.addGround = function(x, y)
+	{
+		var g = new Ground(x, y)
+		g.ctx = this.ctx;
+		g.diagram = this;
+		g.updateBoundingBox();
+		this.components.push(g);
+		return g;
+	}
+	
+	Diagram.prototype.addDiode = function(x, y, value)
+	{
+		var d = new Diode(x, y, value)
+		d.ctx = this.ctx;
+		d.diagram = this;
+		d.updateBoundingBox();
+		this.components.push(d);
+		return d;
+	}
+	
+	Diagram.prototype.addSource = function(x, y, value, type)
+	{
+		var v = new Source(x, y, value, type)
+		v.ctx = this.ctx;
+		v.diagram = this;
+		v.updateBoundingBox();
+		this.components.push(v);
+		return v;
+	}
+	
+	Diagram.prototype.paint = function()
+	{
+		this.ctx.clearRect(0, 0, this.ctx.canvas.width, this.ctx.canvas.height);
+		if (this.showGrid)
+			this.drawGrid();
+		
+		for(var i = 0, len = this.components.length; i < len; i++)
+		{
+			this.components[i].paint();
+		}	
+	}
+	
+	Diagram.prototype.drawGrid = function()
+	{
+		this.ctx.fillStyle = Color.black;
+		for(x = this.xGridMin; x <= this.xGridMax; x += this.gridStep)
+		{
+			for( y = this.yGridMin; y <= this.yGridMax; y += this.gridStep)
+			{
+				this.drawPixel(this.ctx, x, y);
+			}
+		}
+	}
+	//Drawing routines from schematic
+	Diagram.prototype.drawLine = function(c, x1, y1, x2, y2)
+	{
+		c.beginPath();
+		c.moveTo((x1 - this.xOrigin) * this.scale, (y1 - this.yOrigin) * this.scale);
+		c.lineTo((x2 - this.xOrigin) * this.scale, (y2 - this.yOrigin) * this.scale);
+		c.stroke();
+	}
+	
+	Diagram.prototype.drawArc = function(c, x, y, radius,startRadians, endRadians, anticlockwise, width, filled)
+	{
+		c.lineWidth = width;
+		c.beginPath();
+		c.arc((x - this.xOrigin)*this.scale, (y - this.yOrigin)*this.scale, radius*this.scale, startRadians, endRadians, anticlockwise);
+		if (filled) c.fill();
+		else c.stroke();
+	}
+	
+	Diagram.prototype.drawCircle = function(c, x, y, radius, filled)
+	{
+		this.drawArc(c, x, y, radius, 0, 2*Math.PI, false, 1, filled);
+	}
+	
+	Diagram.prototype.drawText = function(c, str, x, y)
+	{
+		c.font = this.scale*this.fontSize + "pt " + this.fontType;
+		c.fillText(str, (x - this.xOrigin) * this.scale, (y - this.yOrigin) * this.scale);
+	}
+	//End drawing routines
+	
+	Diagram.prototype.parseSubSuperScriptText = function(str)
+	{
+		/*var regExpSub = /_\{(.*?)\}/g;
+		var regExpSup = /\^\{(.*?)\}/g;
+		var subs = [];
+		var sups = [];
+		var text = [];
+		var finalText = [];
+		var isSub = false;
+		var isSup = false;
+
+		subs = str.match(regExpSub);
+		for (var i = 0; i < subs.length; i++)
+		{
+			subs[i] = subs[i].substring(2, subs[i].length - 1); //Discard _{ and }
+		}
+
+		sups = str.match(regExpSup);
+		for (var i = 0; i < sups.length; i++)
+		{
+			sups[i] = sups[i].substring(2, sups[i].length - 1); //Discard ^{ and }
+		}*/
+	   	
+    var len = str.length;
+   	var i = 0;
+   	var start;
+   	var end;
+   	found = false;
+   	var text = [];
+   	var type;
+   	var ntext = "";
+	   	
+   	while (i < len)
+   	{
+   		if (str[i] == "_") //Encountered a potential subscript _
+   			type = "sub";
+   		else if (str[i] == "^")  //Encountered a potential superscript ^
+   			type = "sup";
+   			
+   		if (type == "sub" || type == "sup")
+   		{
+   			if (str[i+1] == "{")
+   			{
+   				i += 2; //Discard _{ or ^{
+   				start = i;
+   				found = false;
+   				while (i < len) //Look for }
+   				{
+   					if (str[i] == "}")
+   					{
+   						found = true;
+   						end = i;
+   						break;
+   					}
+   					i++;
+   				}
+   				if (found && end > start) //Discard empty subscript ie _{}
+   				{
+   					//Store previous normal text if not empty and tag it as so
+   					if (ntext.length != 0)
+   					{
+   						text.push({s: ntext, type: "normal"});
+   						ntext = "";
+   					}	
+   					//Store subscript or superscript and tag it as so
+   					if (type == "sub")
+   						text.push({s: str.substring(start, end), type: "sub"});
+   					else if (type == "sup")
+   						text.push({s: str.substring(start, end), type: "sup"});
+   					i = end + 1;
+   				}
+   				else
+   					i = start - 2; //Nothing was found, backtrack to _ or ^
+   			}
+   		}
+   		ntext += str[i];
+   		if (i == len - 1 && ntext.length != 0) //We've reached the end, store normal text if not empty and tag it as so 
+   			text.push({s: ntext, type: "normal"});
+   		i++;
+   	}
+   	
+		return text;
+	}
+  
+  Diagram.prototype.subSuperScriptLength = function(c, text)
+	{
+		var fontNormal = this.scale*this.fontSize + "pt " + this.fontType;
+    var fontSubSup = this.scale*(this.fontSize-2) + "pt " + this.fontType;
+	    	    	    
+   	var xpos = 0;
+   	
+   	for (var i = 0; i < text.length; i++)
+   	{		
+			if (text[i].type == "normal")
+				c.font = fontNormal;
+			else if (text[i].type == "sub")
+				c.font = fontSubSup;
+			else
+				c.font = fontSubSup;
+			xpos += c.measureText(text[i].s).width;	
+		}
+   	
+		return xpos;
+	}	
+  	
+	Diagram.prototype.drawSubSuperScript = function(c, str, x, y, way)
+	{
+		var fontNormal = this.scale*this.fontSize + "pt " + this.fontType;
+    var fontSubSup = this.scale*(this.fontSize-2) + "pt " + this.fontType;
+	    	    	    
+   	var text = this.parseSubSuperScriptText(str);
+   	var len = this.subSuperScriptLength(c, text);
+   	var xposIni = (x - this.xOrigin) * this.scale;
+   	var yposIni = (y - this.yOrigin) * this.scale;
+   	var xpos, ypos;
+   	
+   	if (way == "left")
+   		xpos = xposIni;
+   	else if (way == "right")
+   		xpos = xposIni - len;
+   	else if (way == "center")
+   		xpos = xposIni - len/2;	
+   	
+   	//Draw the text
+   	for (var i = 0; i < text.length; i++)
+   	{		
+			if (text[i].type == "normal")
+			{
+				c.font = fontNormal;
+				ypos = yposIni;
+			}	
+			else if (text[i].type == "sub")
+			{
+				c.font = fontSubSup;
+				ypos = yposIni + 3;
+			}
+			else
+			{
+				c.font = fontSubSup;
+				ypos = yposIni - 5;
+			}
+			c.fillText(text[i].s, xpos, ypos);
+			//Advance x position
+			xpos += c.measureText(text[i].s).width;	
+		}   		
+	}
+
+	//Draws a rectangle, top left corner x1, y1 and bottom right corner x2, y2
+	Diagram.prototype.drawCrispLine = function(c, x1, y1, x2, y2)
+	{
+		c.beginPath();
+		c.moveTo(x1 + 0.5, y1 + 0.5);
+		c.lineTo(x2 + 0.5, y2 + 0.5);
+		c.stroke();
+	}
+	
+	Diagram.prototype.drawRect = function(c, x1, y1, x2, y2)
+	{
+		c.strokeRect(x1 + 0.5, y1 + 0.5, x2 - x1 + 1.0, y2 - y1 + 1.0);
+	}
+
+	Diagram.prototype.fillRect = function(c, x1, y1, x2, y2)
+	{
+		c.fillRect(x1, y1, x2 - x1 + 1.0, y2 - y1 + 1.0);
+	}
+
+	Diagram.prototype.clearRect = function(c, x1, y1, x2, y2)
+	{
+		c.clearRect(x1 + 0.5, y1 + 0.5, x2 - x1 + 1.0, y2 - y1 + 1.0);
+	}
+
+	Diagram.prototype.drawPixel = function(c, x, y)
+	{
+		c.fillRect(x, y, 1.0, 1.0);	
+	}
+
+	Diagram.prototype.drawPoint = function(c, x, y, radius)
+	{
+		c.beginPath();
+		c.arc(x + 0.5, y + 0.5, radius, 0, Utils.TWO_PI, true); //Last param is anticlockwise  
+		c.fill();
+	}
+
+	Diagram.prototype.drawHollowPoint = function(c, x, y, radius)
+	{
+		c.beginPath();
+		c.arc(x + 0.5, y + 0.5, radius, 0, Utils.TWO_PI, true); //Last param is anticlockwise  
+		c.stroke();  
+	}
+
+	Diagram.prototype.drawTriangle = function(c, x1, y1, x2, y2, x3, y3)
+	{
+		c.beginPath();
+		c.moveTo(x1 + 0.5, y1 + 0.5);
+		c.lineTo(x2 + 0.5, y2 + 0.5);
+		c.lineTo(x3 + 0.5, y3 + 0.5);
+		c.closePath();
+		c.stroke();
+	}
+
+	Diagram.prototype.fillTriangle = function(c, x1, y1, x2, y2, x3, y3)
+	{
+		c.beginPath();
+		c.moveTo(x1 + 0.5, y1 + 0.5);
+		c.lineTo(x2 + 0.5, y2 + 0.5);
+		c.lineTo(x3 + 0.5, y3 + 0.5);
+		c.closePath();
+		c.fill();
+	}
+
+	Diagram.prototype.drawHalfCircle = function(c, x, y, radius, concaveDown) //For inductance only
+	{
+		c.beginPath();
+		if (concaveDown)
+			c.arc(x + 0.5, y + 0.5, radius, 0, Math.PI, true); //Last param is anticlockwise
+		else
+			c.arc(x + 0.5, y + 0.5, radius, Math.PI, 0, true); //Last param is anticlockwise  
+    c.stroke(); 
+	}
+
+	Diagram.prototype.drawDiamond = function(c, x, y, h)
+	{
+		var xc = x + 0.5;
+		var yc = y + 0.5;
+	
+		c.beginPath();  
+		c.moveTo(xc-h, yc);  
+		c.lineTo(xc, yc-h);  
+		c.lineTo(xc+h, yc);
+		c.lineTo(xc, yc+h);
+		c.closePath();
+
+		c.fill();  
+	}
+
+	Diagram.prototype.drawX = function(c, x, y, h)
+	{
+		var xc = x + 0.5;
+		var yc = y + 0.5;
+		
+		c.beginPath();
+		c.moveTo(xc+h, yc-h);
+		c.lineTo(xc-h, yc+h);
+		c.moveTo(xc-h, yc-h);
+		c.lineTo(xc+h, yc+h);
+		c.stroke();	
+	}
+
+	Diagram.prototype.drawArrow = function(c, x1, y1, x2, y2, base, height)
+	{
+		var xs1 = x1 + 0.5;
+		var ys1 = y1 + 0.5;
+		var xs2 = x2 + 0.5;
+		var ys2 = y2 + 0.5;
+		var xv = x2 - x1;
+		var yv = y2 - y1;
+		var ang = Math.atan2(-yv, xv);
+		
+		c.beginPath();
+		//Arrow line
+		c.moveTo(xs1, ys1);
+		c.lineTo(xs2, ys2);
+		c.stroke();
+		//Arrow head, first draw a triangle with top on origin then translate/rotate to orient and fit on line
+		c.save();
+		c.beginPath();
+		c.translate(xs2, ys2);
+		c.rotate(Utils.PI_DIV_2-ang);
+	
+		c.moveTo(0, 0);
+		c.lineTo(-base, height);
+		c.lineTo(base, height);
+		c.closePath();
+		c.fill();
+		//c.stroke();
+		c.restore();
+	}
+			
+	//***** COMPONENT *****//
+	function Component(x, y, width, height)
+	{
+		this.x = x;
+		this.y = y;
+		
+		this.boundingBox = [0, 0, 0, 0];
+		this.transBoundingBox = [0, 0, 0, 0];
+		this.xMiddle = 0;
+		this.yMiddle = 0;
+
+		this.previousSelectable = false;
+		this.selectable = false;
+		this.selected = false;
+		this.ctx;
+		this.diagram;
+		this.color = Color.white;
+		this.selectedColor = Color.red;
+		this.eventListeners = {};
+		//Label to the left
+		this.label = {str: "", x: 0, y: 0, position: "left", show: true, color: Color.white}; //color: Color.lodarkgray
+		//String representing value to the right
+		this.valueString = {x: 0, y: 0, position: "right", show: true, suffix: "", decimal: -1, color: Color.white}; //color: Color.lodarkgray
+				
+		this.lineWidth = 1;
+		this.rotation = 0;
+		this.value = 0;
+	}
+	
+	Component.prototype.addEventListener = function(type, eventListener)
+	{
+		if(!(type in this.eventListeners))
+			this.eventListeners[type] = eventListener;
+	}
+
+	Component.prototype.removeEventListener = function(type, eventListener)
+	{
+		for(var i in this.eventListeners)
+		{
+			if(this.eventListeners[i] === eventListener)
+				delete this.eventListeners[i].eventListener;
+		}
+	}
+
+	Component.prototype.fireEvent = function(event)
+	{
+		if( typeof event == "string")
+			(this.eventListeners[event])();
+		else
+			throw new Error("Event object missing 'type' property.");
+	}
+	
+	Component.prototype.updateBoundingBox = function()
+	{
+		//Apply global transform
+		this.transBoundingBox[0] = (this.boundingBox[0] - this.diagram.xOrigin) * this.diagram.scale;
+		this.transBoundingBox[1] = (this.boundingBox[1] - this.diagram.yOrigin) * this.diagram.scale;
+		this.transBoundingBox[2] = (this.boundingBox[2] - this.diagram.xOrigin) * this.diagram.scale;
+		this.transBoundingBox[3] = (this.boundingBox[3] - this.diagram.yOrigin) * this.diagram.scale;
+		//this.getMiddle();
+		this.label.x = this.transBoundingBox[0]- 5;
+		this.label.y = (this.transBoundingBox[3] - this.transBoundingBox[1]) / 2;
+		this.valueString.x = this.transBoundingBox[2] + 5;
+		this.valueString.y = (this.transBoundingBox[3] - this.transBoundingBox[1]) / 2;
+	}
+	
+	Component.prototype.initPaint = function()
+	{
+		if(this.selectable)
+		{
+			this.ctx.strokeStyle = this.selectedColor;		
+			this.ctx.fillStyle = this.selectedColor;
+		}
+		else
+		{	
+			this.ctx.strokeStyle = this.color;		
+			this.ctx.fillStyle = this.color;
+		}
+	}
+	
+	Component.prototype.transform = function()
+	{
+		this.ctx.translate(this.x, this.y);
+		if(this.rotation != 0)
+			this.ctx.rotate(-this.rotation);
+	}
+	
+	Component.prototype.getMiddle = function()
+	{
+		this.xMiddle = (this.boundingBox[2] - this.boundingBox[0]) / 2;
+		this.yMiddle = (this.boundingBox[3] - this.boundingBox[1]) / 2;
+	}	
+	
+	Component.prototype.drawLabel = function()
+	{
+		if (this.label.show)
+		{
+			var textAlign;
+			this.ctx.save();
+			this.ctx.fillStyle = this.label.color;
+			this.ctx.textAlign = "left";
+			if (this.rotation == 0) //Component is vertical
+			{
+				if (this.label.position == "left") //Label is on left
+				{
+					this.ctx.textBaseline = "middle";
+					textAlign = "right";
+				}
+				else if (this.label.position == "right") //Label is on right
+				{
+					this.ctx.textBaseline = "middle";
+					textAlign = "left";
+				}
+			}
+			else if (this.rotation == Math.PI/2) //Component is horizontal
+			{
+				if (this.label.position == "left") //Label now on bottom
+				{
+					this.ctx.textBaseline = "top";
+					textAlign = "center";
+				}
+				else if (this.label.position == "right") //Label on top
+				{
+					this.ctx.textBaseline = "bottom";
+					textAlign = "center";
+				}
+			}
+			else if (this.rotation == Math.PI) //Component is horizontal
+			{
+				if (this.label.position == "left") //Label now on right
+				{
+					this.ctx.textBaseline = "middle";
+					textAlign = "left";
+				}
+				else if (this.label.position == "right") //Label now on left
+				{
+					this.ctx.textBaseline = "middle";
+					textAlign = "right";
+				}
+			}	
+			else if (this.rotation == 2*Math.PI/3) //Component is vertical
+			{
+				if (this.label.position == "left") //Label is on right
+				{
+					this.ctx.textBaseline = "middle";
+					textAlign = "left";
+				}
+				else if (this.label.position == "right") //Label is on right
+				{
+					this.ctx.textBaseline = "middle";
+					textAlign = "right";
+				}
+			}			
+			this.ctx.translate(this.label.x, this.label.y);
+			this.ctx.rotate(this.rotation);
+			this.diagram.drawSubSuperScript(this.ctx, this.label.str, 0, 0, textAlign);
+			this.ctx.restore();
+		}	
+	}
+	
+	Component.prototype.drawValueString = function()
+	{
+		if (this.valueString.show)
+		{
+			var textAlign;
+			this.ctx.save();
+			this.ctx.fillStyle = this.valueString.color;
+			this.ctx.textAlign = "left";
+			if (this.rotation == 0) //Component is vertical
+			{
+				if (this.valueString.position == "left") //Label is on left
+				{
+					this.ctx.textBaseline = "middle";
+					textAlign = "right";
+				}
+				else if (this.valueString.position == "right") //Label is on right
+				{
+					this.ctx.textBaseline = "middle";
+					textAlign = "left";
+				}
+			}
+			else if (this.rotation == Math.PI/2) //Component is horizontal
+			{
+				if (this.valueString.position == "left") //Label now on bottom
+				{
+					this.ctx.textBaseline = "top";
+					textAlign = "center";
+				}
+				else if (this.valueString.position == "right") //Label on top
+				{
+					this.ctx.textBaseline = "bottom";
+					textAlign = "center";
+				}
+			}
+			else if (this.rotation == Math.PI) //Component is horizontal
+			{
+				if (this.valueString.position == "left") //Label now on right
+				{
+					this.ctx.textBaseline = "middle";
+					textAlign = "left";
+				}
+				else if (this.valueString.position == "right") //Label now on left
+				{
+					this.ctx.textBaseline = "middle";
+					textAlign = "right";
+				}
+			}	
+			else if (this.rotation == 2*Math.PI/3) //Component is vertical
+			{
+				if (this.valueString.position == "left") //Label is on right
+				{
+					this.ctx.textBaseline = "middle";
+					textAlign = "left";
+				}
+				else if (this.valueString.position == "right") //Label is on right
+				{
+					this.ctx.textBaseline = "middle";
+					textAlign = "right";
+				}
+			}
+			this.ctx.translate(this.valueString.x, this.valueString.y);
+			this.ctx.rotate(this.rotation);
+			var str;
+			if (this.valueString.decimal < 0)
+				str = this.value + " " + this.valueString.suffix;
+			else //Force a certain number of digits
+				str = (this.value).toFixed(this.valueString.decimal) + " " + this.valueString.suffix;
+			
+			this.diagram.drawSubSuperScript(this.ctx, str, 0, 0, textAlign);
+			this.ctx.restore();
+		}	
+	}
+	
+	Component.prototype.isInside = function(x, y)
+	{
+		var pt = transform(x, y, this.x, this.y, this.rotation);
+		if((this.transBoundingBox[0] <= pt.x) && (pt.x <= this.transBoundingBox[2]) && (this.transBoundingBox[1] <= pt.y) && (pt.y <= this.transBoundingBox[3]))
+			return true;
+		else
+			return false;
+	}
+	
+	//***** NODE COMPONENT *****//
+	function Node(x, y)
+	{
+		//Call super class
+		this.Component(x, y);
+		this.boundingBox = [-2, -2, 2, 2];
+		this.nodeRadius = 2;
+	}
+
+	copyPrototype(Node, Component);
+	Node.prototype.paint = function()
+	{
+		this.initPaint();
+		this.ctx.save();
+		this.transform();
+		this.ctx.strokeStyle = this.color;		
+		this.ctx.fillStyle = this.color;
+		this.diagram.drawCircle(this.ctx, 0, 0, this.nodeRadius, true);
+		this.drawLabel();
+		this.ctx.restore();
+	}
+	
+	Node.prototype.toString = function()
+	{
+	    return "<Node (" + this.x + "," + this.y + ")>";
+	}
+
+	//***** WIRE COMPONENT *****//
+	function Wire(x1, y1, x2, y2)
+	{
+		//Call super class
+		this.Component(x1, y1);
+		this.dx = x2 - x1;
+		this.dy = y2 - y1;
+		this.boundingBox = [-5, -5, this.dx + 5, this.dy + 5];
+	}
+
+	copyPrototype(Wire, Component);
+	Wire.prototype.paint = function()
+	{
+		this.initPaint();
+		this.ctx.save();
+		this.transform();
+		this.ctx.strokeStyle = this.color;		
+		this.ctx.fillStyle = this.color;
+		this.diagram.drawLine(this.ctx, 0, 0, this.dx, this.dy);
+		this.ctx.restore();
+	}
+	
+	Wire.prototype.toString = function()
+	{
+	    return "<Wire (" + this.x + "," + this.y + "," + (this.x + this.dx) + "," + (this.y + this.dy) + ")>";
+	}
+
+	//***** LABEL *****//
+	function Label(x, y, value, textAlign)
+	{
+		//Call super class
+		this.Component(x, y);
+		this.boundingBox = [-10, -10, 10, 10];
+		this.value = value;
+		this.textAlign = textAlign;
+	}
+
+	copyPrototype(Label, Component);
+	Label.prototype.paint = function()
+	{
+		this.ctx.save();
+		this.ctx.textAlign = "left";
+		this.ctx.translate(this.x, this.y);
+		this.ctx.rotate(this.rotation);
+		this.ctx.strokeStyle = this.color;		
+		this.ctx.fillStyle = this.color;
+		this.diagram.drawSubSuperScript(this.ctx, this.value, 0, 0, this.textAlign);
+		this.ctx.restore();
+	}
+	
+	Label.prototype.toString = function()
+	{
+	    return "<Label (" + this.x + "," + this.y + ")>";
+	}
+	
+	//***** CAPACITOR COMPONENT *****//
+	function Capacitor(x, y, value)
+	{
+		//Call super class
+		this.Component(x, y);
+		this.boundingBox = [-8, 0, 8, 48];
+		this.value = value;
+	}
+
+	copyPrototype(Capacitor, Component);
+	Capacitor.prototype.paint = function()
+	{
+		this.initPaint();
+		this.ctx.save();
+		this.transform();
+		this.ctx.strokeStyle = this.color;		
+		this.ctx.fillStyle = this.color;
+		this.diagram.drawLine(this.ctx, 0, 0, 0, 22);
+		this.diagram.drawLine(this.ctx, -8, 22, 8, 22);
+		this.diagram.drawLine(this.ctx, -8, 26, 8, 26);
+		this.diagram.drawLine(this.ctx, 0, 26, 0, 48);
+		this.drawLabel();
+		this.drawValueString();
+		this.ctx.restore();
+	}
+	
+	Capacitor.prototype.toString = function()
+	{
+	    return "<Capacitor (" + this.x + "," + this.y + ")>";
+	}
+
+	//***** RESISTOR COMPONENT *****//
+	function Resistor(x, y, value)
+	{
+		//Call super class
+		this.Component(x, y);
+		this.boundingBox = [-5, 0, 5, 48];
+		this.value = value;
+	}
+
+	copyPrototype(Resistor, Component);
+	Resistor.prototype.paint = function()
+	{
+		this.initPaint();
+		this.ctx.save();
+		this.transform();
+		this.ctx.strokeStyle = this.color;		
+		this.ctx.fillStyle = this.color;
+		this.diagram.drawLine(this.ctx, 0, 0, 0, 12);
+		this.diagram.drawLine(this.ctx, 0, 12, 4, 14);
+		this.diagram.drawLine(this.ctx, 4, 14, -4, 18);
+		this.diagram.drawLine(this.ctx, -4, 18, 4, 22);
+		this.diagram.drawLine(this.ctx, 4, 22, -4, 26);
+		this.diagram.drawLine(this.ctx, -4, 26, 4, 30);
+		this.diagram.drawLine(this.ctx, 4, 30, -4, 34);
+		this.diagram.drawLine(this.ctx, -4, 34, 0, 36);
+		this.diagram.drawLine(this.ctx, 0, 36, 0, 48);
+		this.drawLabel();
+		this.drawValueString();
+		this.ctx.restore();
+	}
+	
+	Resistor.prototype.toString = function()
+	{
+	    return "<Resistor (" + this.x + "," + this.y + ")>";
+	}
+
+	//***** INDUCTOR COMPONENT *****//
+	function Inductor(x, y, value)
+	{
+		//Call super class
+		this.Component(x, y);
+		this.boundingBox = [-4, 0, 5, 48];
+		this.value = value;
+	}
+
+	copyPrototype(Inductor, Component);
+	Inductor.prototype.paint = function()
+	{
+		this.initPaint();
+		this.ctx.save();
+		this.transform();
+		this.ctx.strokeStyle = this.color;		
+		this.ctx.fillStyle = this.color;
+		this.diagram.drawLine(this.ctx, 0, 0, 0, 14);
+		this.diagram.drawArc(this.ctx, 0, 18, 4, 6*Math.PI/4, 3*Math.PI/4);
+		this.diagram.drawArc(this.ctx, 0, 24, 4, 5*Math.PI/4, 3*Math.PI/4);
+		this.diagram.drawArc(this.ctx, 0, 30, 4, 5*Math.PI/4, 2*Math.PI/4);
+		this.diagram.drawLine(this.ctx, 0, 34, 0, 48);
+		this.drawLabel();
+		this.drawValueString();
+		this.ctx.restore();
+	}
+	
+	Inductor.prototype.toString = function()
+	{
+	    return "<Inductor (" + this.x + "," + this.y + ")>";
+	}
+
+	//***** N-CHANNEL AND P-CHANNEL MOSFET COMPONENT *****//
+	function Mosfet(x, y, value, type)
+	{
+		//Call super class
+		this.Component(x, y);
+		this.boundingBox = [-24, 0, 8, 48];
+		this.value = value;
+		this.type = type;
+	}
+
+	copyPrototype(Mosfet, Component);
+	Mosfet.prototype.paint = function()
+	{
+		this.initPaint();
+		this.ctx.save();
+		this.transform();
+		this.ctx.strokeStyle = this.color;		
+		this.ctx.fillStyle = this.color;
+		this.diagram.drawLine(this.ctx, 0, 0, 0, 16);
+		this.diagram.drawLine(this.ctx, -8, 16, 0, 16);
+		this.diagram.drawLine(this.ctx, -8, 16, -8, 32);
+		this.diagram.drawLine(this.ctx, -8, 32, 0, 32);
+		this.diagram.drawLine(this.ctx, 0, 32, 0, 48);
+		if (this.type == "n")
+		{
+			this.diagram.drawLine(this.ctx,-24,24,-12,24);
+			this.diagram.drawLine(this.ctx,-12,16,-12,32);
+		}
+		else if (this.type == "p")
+		{
+			this.diagram.drawLine(this.ctx, -24, 24, -16, 24);
+			this.diagram.drawCircle(this.ctx, -14, 24, 2, false);
+			this.diagram.drawLine(this.ctx, -12, 16, -12, 32);
+		}
+		this.drawLabel();
+		this.drawValueString();			
+		this.ctx.restore();
+	}
+	
+	Mosfet.prototype.toString = function()
+	{
+	    if (this.type = "n")
+	    	return "<Mosfet N Channel (" + this.x + "," + this.y + ")>";
+	    else if (this.type = "p")
+	    	return "<Mosfet P Channel (" + this.x + "," + this.y + ")>";
+	}
+
+	//***** VOLTAGE AND CURRENT SOURCE COMPONENT *****//
+	function Source(x, y, value, type)
+	{
+		//Call super class
+		this.Component(x, y);
+		this.boundingBox = [-12, 0, 12, 48];
+		this.value = value;
+		this.type = type;
+	}
+
+	copyPrototype(Source, Component);
+	Source.prototype.paint = function()
+	{
+		this.initPaint();
+		this.ctx.save();
+		this.transform();
+		this.ctx.strokeStyle = this.color;		
+		this.ctx.fillStyle = this.color;
+		this.diagram.drawLine(this.ctx, 0, 0, 0, 12);
+		this.diagram.drawCircle(this.ctx, 0, 24, 12, false);
+		this.diagram.drawLine(this.ctx, 0, 36, 0, 48);
+		if (this.type == "v")
+		{
+			//Plus sign, vertical bar
+			this.ctx.save();
+			this.ctx.translate(0, this.diagram.scale*18);
+			this.ctx.rotate(this.rotation);
+			this.diagram.drawLine(this.ctx, 0, -3, 0, 3); //this.diagram.drawLine(this.ctx, 0, 15, 0, 21);
+			this.ctx.restore();
+			
+			//Plus sign, horizontal bar
+			this.ctx.save();
+			this.ctx.translate(0, this.diagram.scale*18);
+			this.ctx.rotate(this.rotation);
+			this.diagram.drawLine(this.ctx, -3, 0, 3, 0); //this.diagram.drawLine(this.ctx, -3, 18, 3, 18);
+			this.ctx.restore();
+			//Minus sign
+			this.ctx.save();
+			this.ctx.translate(0, this.diagram.scale*30);
+			this.ctx.rotate(this.rotation);
+			this.diagram.drawLine(this.ctx, -3, 0, 3, 0);	//this.diagram.drawLine(this.ctx, -3, 30, 3, 30);
+			this.ctx.restore();
+		}
+		else if (this.type == "i")
+		{
+			this.diagram.drawLine(this.ctx, 0, 15, 0, 32);
+			this.diagram.drawLine(this.ctx,-3, 26, 0, 32);
+			this.diagram.drawLine(this.ctx,3, 26, 0, 32);		
+		}
+		this.drawLabel();
+		this.drawValueString();
+		this.ctx.restore();
+	}
+	
+	Source.prototype.toString = function()
+	{
+			if (this.type = "v")
+				return "<Voltage Source (" + this.x + "," + this.y + ")>";
+	    else if (this.type = "i")
+				return "<Current Source (" + this.x + "," + this.y + ")>";
+	}
+
+	//***** GROUND COMPONENT *****//
+	function Ground(x, y)
+	{
+		//Call super class
+		this.Component(x, y);
+		this.boundingBox = [-6, 0, 6, 8];
+	}
+
+	copyPrototype(Ground, Component);
+	Ground.prototype.paint = function()
+	{
+		this.initPaint();
+		this.ctx.save();
+		this.transform();
+		this.ctx.strokeStyle = this.color;		
+		this.ctx.fillStyle = this.color;
+		this.diagram.drawLine(this.ctx, 0, 0, 0, 8);
+	  this.diagram.drawLine(this.ctx, -6, 8, 6, 8);
+	  this.ctx.restore();
+	}
+	
+	Ground.prototype.toString = function()
+	{
+	    return "<Ground (" + this.x + "," + this.y + ")>";
+	}
+
+	//***** DIODE COMPONENT *****//
+	function Diode(x, y, value)
+	{
+		//Call super class
+		this.Component(x, y);
+		this.boundingBox = [-8, 0, 8, 48];
+		this.value = value;
+	}
+
+	copyPrototype(Diode, Component);
+	Diode.prototype.paint = function()
+	{
+		this.initPaint();
+		this.ctx.save();
+		this.transform();
+		this.drawLabel();
+		this.ctx.strokeStyle = this.color;		
+		this.ctx.fillStyle = this.color;
+		this.diagram.drawLine(this.ctx, 0, 0, 0, 16);
+		this.diagram.drawLine(this.ctx, -8, 16, 8, 16);
+		this.diagram.drawLine(this.ctx, -8, 16, 0, 32);
+		this.diagram.drawLine(this.ctx, 8, 16, 0, 32);
+		this.diagram.drawLine(this.ctx, -8, 32, 8, 32);
+		this.diagram.drawLine(this.ctx,0 , 32, 0, 48);
+		this.ctx.restore();
+	}
+	
+	Diode.prototype.toString = function()
+	{
+	    return "<Diode (" + this.x + "," + this.y + ")>";
+	}
+	
+//////////PUBLIC FIELDS AND METHODS//////////
+	return {
+
+		Utils: Utils,
+		Color: Color,
+		Diagram: Diagram,
+	};
+}());
diff --git a/common/test/data/full/static/js/sound_labs/mosfet_amplifier.js b/common/test/data/full/static/js/sound_labs/mosfet_amplifier.js
new file mode 100644
index 0000000000..614388df27
--- /dev/null
+++ b/common/test/data/full/static/js/sound_labs/mosfet_amplifier.js
@@ -0,0 +1,658 @@
+$(document).ready(function()
+{
+	//The try catch block checks if canvas and audio libraries are present. If not, we exit and alert the user.
+	try
+	{
+		//Add corresponding listener to various UI elements		
+		$('#musicTypeSelect').change(onSelectChange);		
+		$('input:checkbox').click(checkboxClicked);
+		$('input:radio').click(radioButtonClicked);
+		$('#playButton').click(playButtonClicked);
+		initSound();
+		initDiagram();
+		initGraph();
+		setGraph();
+		generateBuffer();
+		calculateSignals();
+		draw();
+		labEnabled = true;
+	}
+	catch(err)
+	{
+		labEnabled = false;
+		alert(err + " The tool is disabled.");
+	}	
+});
+
+function initGraph()
+{
+	//Test if canvas is supported. If not, exit.
+	var testCanvas = document.createElement("canvas")
+	if (!testCanvas.getContext)
+		throw "Canvas element is not supported in this browser."
+	//Get canvas
+	var canvas = $('#graph')[0];
+	//To disable text selection outside the canvas
+	canvas.onselectstart = function(){return false;};
+	//Create an offscreen buffer
+	var buffer = document.createElement('canvas');
+	buffer.width = canvas.width;
+	buffer.height = canvas.height;
+	graph = new Plotter.Graph(50, 50, 400, 400, canvas, buffer);
+}
+
+var diagram, VS, VIn, VBias, R;
+
+function initDiagram()
+{
+	//Test if canvas is supported. If not, exit.
+	var testCanvas = document.createElement("canvas")
+	if (!testCanvas.getContext)
+		throw "Canvas element is not supported in this browser."
+	
+	var element = $('#diag1');
+	diagram = new Circuit.Diagram(element, true);
+
+	//Lines
+	var wirev1 = diagram.addWire(100, 289, 100, 361);
+	var wirev2 = diagram.addWire(100, 78, 100, 135.5);
+	var wirev3 = diagram.addWire(380, 78.5, 380, 89.5);
+	var wirev4 = diagram.addWire(380, 290, 380, 361.5);
+	
+	var wireh1 = diagram.addWire(100, 78, 240, 78);
+	var wireh2 = diagram.addWire(240, 243, 286, 243);
+	var wireh3 = diagram.addWire(100, 433, 240, 433);
+		
+	var vOutPlus = diagram.addLabel(396, 219, "\u002B", "left");
+	var vOutLabel = diagram.addLabel(396, 244, "v_{OUT}", "left");
+	var vOutMinus = diagram.addLabel(396, 274, "\u2212", "left");
+	vOutPlus.color = Plotter.Color.lightyellow;
+	vOutLabel.color = Plotter.Color.lightyellow;
+	vOutMinus.color = Plotter.Color.lightyellow;
+	
+	var vRPlus = diagram.addLabel(310, 127, "\u002B", "left");
+	var vRLabel = diagram.addLabel(310, 152, "v_{R}", "left");
+	var vRMinus = diagram.addLabel(310, 182, "\u2212", "left");
+	vRPlus.color = Plotter.Color.lightgreen;
+	vRLabel.color = Plotter.Color.lightgreen;
+	vRMinus.color = Plotter.Color.lightgreen;
+	
+	//vin
+	//Plotter.Color.lightblue);
+	//vout
+	//Plotter.Color.lightyellow);
+	//vr
+	//Plotter.Color.lightgreen);
+	
+	//Ground
+	var ground = diagram.addGround(240, 433);
+		
+	//Resistor
+	R = diagram.addResistor(380, 99.5, 10);
+	R.label.str = "R";
+	R.valueString.suffix = "k\u03A9";
+	
+	//Voltage sources
+	VS = diagram.addSource(100, 193, 1.6, "v");
+	VS.label.str = "V_{S}";
+	VS.valueString.suffix = "V";
+	VIn = diagram.addSource(240, 243, 3, "v");
+	VIn.label.str = "v_{IN}";
+	VIn.label.color = Plotter.Color.lightblue;
+	VIn.valueString.suffix = "V";
+	VIn.valueString.color = Plotter.Color.lightblue;
+	VBias = diagram.addSource(240, 338, 2.5, "v");
+	VBias.label.str = "v_{BIAS}";
+	VBias.valueString.suffix = "V";
+	
+	//Mosfet
+	var nMosfet = diagram.addMosfet(380, 195, "", "n"); 
+	
+	//diagram.showGrid = true;
+	//diagram.gridStep = 1;
+	diagram.paint();
+}
+
+function setGraph()
+{
+	var lticks = 1;
+	var sticks = 0.5;
+	//x axis
+	graph.xText = xLab;
+	graph.yText = "V_{MAX} (Volts)";	
+	graph.xmin = 0;
+	graph.xmax = maxTime;
+	graph.xspan = maxTime;
+	graph.xShortTickMin = 0;
+	graph.xShortTickMax = maxTime;
+	graph.xShortTickStep = maxTime/20;
+	graph.xLongTickMin = 0;
+	graph.xLongTickMax = maxTime;
+	graph.xLongTickStep = maxTime/10;
+	graph.xLabelMin = 0;
+	graph.xLabelMax = maxTime;
+	graph.xLabelStep = maxTime/10;
+	graph.xGridMin = 0;
+	graph.xGridMax = maxTime;
+	graph.xGridStep = maxTime/10;
+	//y axis
+	graph.ymin = -maxVolt;
+	graph.ymax = maxVolt;
+	graph.yspan = 2*maxVolt;
+	graph.yShortTickMin = -maxVolt + (maxVolt % sticks);
+	graph.yShortTickMax = maxVolt - (maxVolt % sticks);
+	graph.yShortTickStep = sticks;
+	graph.yLongTickMin = -maxVolt + (maxVolt % lticks);
+	graph.yLongTickMax = maxVolt - (maxVolt % lticks);
+	graph.yLongTickStep = lticks;
+	graph.yLabelMin = -maxVolt + (maxVolt % lticks);
+	graph.yLabelMax = maxVolt - (maxVolt % lticks);
+	graph.yLabelStep = lticks;
+	graph.yGridMin = -maxVolt + (maxVolt % lticks);
+	graph.yGridMax = maxVolt - (maxVolt % lticks);
+	graph.yGridStep = lticks;
+}	
+	
+function generateBuffer()
+{
+	//Draw on offscreen image buffer
+	graph.paintOn("buffer"); 
+	graph.paint();
+}
+
+function draw()
+{	
+	//Paint buffer on canvas
+	graph.paintBuffer();
+	
+	//Draw on canvas
+	graph.paintOn("canvas"); //Draw on screen image
+	
+	if (vinChecked)	
+		graph.drawArray(time, insig, Plotter.Color.lightblue);
+	if (voutChecked)
+		graph.drawArray(time, outsig, Plotter.Color.lightyellow);
+	if (vrChecked)
+		graph.drawArray(time, rsig, Plotter.Color.lightgreen);
+}
+
+function initSound()
+{
+	sp = new Sound.Player();
+	sp.soundStarted = function()
+	{
+		$('#playButton').prop('value', "Stop");
+	}	
+	
+	sp.soundStopped = function()
+	{
+		$('#playButton').prop('value', "Play");
+	}
+}		
+	
+function communSlide()
+{
+	if (labEnabled)
+	{
+		if (sp.isPlaying)
+			sp.stopTone();
+		calculateSignals();
+		draw();
+		diagram.paint();
+	}	
+}		
+
+$(function()
+{
+	$("#vsSlider" ).slider({value: vS, min: 0, max: 10, step: 0.01,
+					slide: function(event, ui)
+					{
+						$("#vs").html("V<sub>S</sub> = " + ui.value + " V");
+						vS = ui.value;
+						VS.value = vS;
+						communSlide();
+					}
+				});
+	$("#vs").html("V<sub>S</sub> = "+ $("#vsSlider").slider("value") + " V");
+
+	$("#vinSlider").slider({value: vIn, min: 0, max: 5, step: 0.01,
+					slide: function(event, ui)
+					{
+						$("#vin").html("v<sub>IN</sub> = " + ui.value + " V");
+						vIn = ui.value;
+						VIn.value = vIn;
+						communSlide();
+					}
+				});
+	$("#vin").html("v<sub>IN</sub> = " + $("#vinSlider").slider("value") + " V");
+
+	$("#freqSlider").slider({value: freq, min: 0, max: 5000, step: 100,
+					slide: function(event, ui)
+					{
+						$("#freq").html("Frequency = " + ui.value + " Hz");
+						freq = ui.value;
+						communSlide();
+					}
+				});
+	$("#freq").html("Frequency = " + $("#freqSlider").slider("value") + " Hz");
+
+	$("#vbiasSlider").slider({value: vBias, min: 0, max: 10, step: 0.01,
+					slide: function(event, ui)
+					{
+						$("#vbias").html("V<sub>BIAS</sub> = " + ui.value + " V");
+						vBias = ui.value;
+						VBias.value = vBias;
+						communSlide();
+					}
+				});
+	$("#vbias").html("V<sub>BIAS</sub> = " + $("#vbiasSlider").slider("value") + " V");
+
+	$("#rSlider").slider({value: 1, min: 0.1, max: 10, step: 0.01,
+					slide: function(event, ui)
+					{
+						//Values of slider are in Kilo Ohms
+						var val = getResistance(ui.value);
+						$(this).slider("value", val);
+						if (val >= 1.0) //kOhms
+						{
+							$("#r").html("R = " +  val + " k&Omega;");
+							R.value = val;
+							R.valueString.suffix = "k\u03A9";
+						}	
+						else
+						{
+							$("#r").html("R = " +  kiloToUnit(val) + " &Omega;");
+							R.value = kiloToUnit(val);
+							R.valueString.suffix = "\u03A9";  
+						}	
+						
+						r = kiloToUnit(val);
+						communSlide();
+						//return false; //Blocks keystrokes if enabled
+					}
+				});
+	$("#r").html("R = " + $("#rSlider").slider("value") + " k&Omega;");
+
+	$("#kSlider").slider({value: k*1000, min: 0, max: 10, step: 0.01,
+					slide: function(event, ui)
+					{
+						$("#k").html("k = " + ui.value + " mA/V<sup>2</sup>");
+						k = ui.value / 1000; //Values are in mA
+						communSlide();
+					}
+				});
+	$("#k").html("k = " + $("#kSlider").slider("value") + " mA/V<sup>2</sup>");
+
+        $("#vtSlider").slider({value: vt, min: 0, max: 10, step: 0.01,
+					slide: function(event, ui)
+					{
+						$("#vt").html("V<sub>T</sub> = " + ui.value + " V");
+						vt = ui.value;
+						communSlide();
+					} 
+				});
+	$("#vt").html("V<sub>T</sub> = " + $("#vtSlider").slider("value") + " V");
+
+	$("#vmaxSlider" ).slider({value: vMax, min: 1, max: 20, step: 0.1,
+					slide: function(event, ui)
+					{
+						$("#vmax").html("V<sub>MAX</sub> = " + ui.value + " V");
+						maxVolt = ui.value;
+						if (labEnabled)
+						{
+							if (sp.isPlaying)
+								sp.stopTone();
+							setGraph();
+							generateBuffer();
+							calculateSignals();
+							draw();	
+						}	
+					}
+				});
+	$("#vmax").html("V<sub>MAX</sub> = " + $("#vmaxSlider").slider("value") + " V");
+});
+
+function getCheckboxesState()
+{
+	if($('#vinCheckbox').prop('checked')) 
+		vinChecked = true;
+	else
+		vinChecked = false;
+	if($('#voutCheckbox').prop('checked')) 
+		voutChecked = true;
+	else
+		voutChecked = false;
+	if($('#vrCheckbox').prop('checked')) 
+		vrChecked = true;
+	else
+		vrChecked = false;
+}
+
+function getRadioButtonsState()
+{
+	if($('#vinRadioButton').prop('checked')) 
+		sp.inSignal.listen = true;
+	else
+		sp.inSignal.listen = false;
+	if($('#voutRadioButton').prop('checked')) 
+		sp.outSignals[0].listen = true;
+	else
+		sp.outSignals[0].listen = false;
+	if($('#vrRadioButton').prop('checked')) 
+		sp.outSignals[1].listen = true;
+	else
+		sp.outSignals[1].listen = false;
+}
+
+function onSelectChange()
+{
+	if (labEnabled)
+	{
+		musicType = $("#musicTypeSelect").val();
+		sp.stopTone();
+		if (musicType == 0) //Zero Input
+		{
+			$("#vinSlider").slider( "option", "disabled", true);
+			$("#freqSlider").slider( "option", "disabled", true);
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}
+		else if (musicType == 1) //Unit Impulse
+		{
+			$("#vinSlider").slider( "option", "disabled", true);
+			$("#freqSlider").slider( "option", "disabled", true);	
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}
+		else if (musicType == 2) //Unit Step
+		{
+			$("#vinSlider").slider( "option", "disabled", true);
+			$("#freqSlider").slider( "option", "disabled", true);	
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}	
+		if (musicType == 3) //Sine Wave
+		{
+			$("#vinSlider").slider( "option", "disabled", false);
+			$("#freqSlider").slider( "option", "disabled", false);		
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}
+		else if (musicType == 4) //Square Wave
+		{
+			$("#vinSlider").slider( "option", "disabled", false);
+			$("#freqSlider").slider( "option", "disabled", false);		
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}		
+		else if (musicType == 5 || musicType == 6 || musicType == 7 || musicType == 8) //Music
+		{		
+			$("#vinSlider").slider( "option", "disabled", false);
+			$("#freqSlider").slider( "option", "disabled", true);		
+			maxTime = 20; //s
+			xLab = "t (s)";
+			
+			if (musicType == 5)
+				sp.load("classical.wav", musicLoaded);
+			else if (musicType == 6)
+				sp.load("folk.wav", musicLoaded);
+			else if (musicType == 7)
+				sp.load("jazz.wav", musicLoaded);
+			else
+				sp.load("reggae.wav", musicLoaded);
+		}
+	}	
+}
+
+function musicLoaded()
+{
+	setGraph();
+	generateBuffer();
+	calculateSignals();
+	draw();
+}	
+
+function checkboxClicked()
+{
+	if (labEnabled)
+	{
+		getCheckboxesState();
+		draw();
+	}	
+}
+
+function radioButtonClicked()
+{
+	if (labEnabled)
+	{
+		if (sp.isPlaying)
+			sp.stopTone();
+		getRadioButtonsState();
+	}	
+}
+
+function playButtonClicked()
+{
+	if (labEnabled)
+	{
+		if (sp.isPlaying)
+			sp.stopTone();
+		else
+			sp.playTone();
+	}	
+}
+
+//TO DO: PUT ALL THE FOLLOWING GLOBAL VARIABLES IN A NAMESPACE
+var labEnabled = true;
+//Graph
+var graph;
+var maxTime = 10; //In ms
+var xLab = "t (ms)";
+var maxVolt = 2;
+var time;
+var insig;
+var outsig;
+//Sound Player
+var sp;
+
+//Drop variable down for Type of Input
+var musicType = 3;
+//Checkboxes variables for Graph
+var vinChecked = true;
+var voutChecked = true;
+var vrChecked = false;
+//Slider variables
+var vS = 1.6;
+var vIn = 3.0;
+var vInMax = 5.0;
+var freq = 1000;
+var vBias = 2.5;
+var r = 10000;
+var k = 0.001;
+var vt = 1;
+var vMax = 2;
+
+function calculateSignals()
+{
+	if (musicType == 0 || musicType == 1 || musicType == 2 || musicType == 3) 
+	{	
+		sp.soundLength = 1;		
+		sp.sampleRate = 50000;
+	}
+	else if (musicType == 4)
+	{
+		sp.soundLength = 1;		
+		sp.sampleRate = 88200;
+	}
+	else if (musicType == 5 || musicType == 6 || musicType == 7 || musicType == 8) //Classical, Folk, Jazz, Reggae
+	{
+		sp.soundLength = 20;
+		sp.sampleRate = 22050;
+	} 
+
+	sp.createBuffers(2); //We have two outputs, first one is the voltage across Drain, Source, the second across resistor R
+	getRadioButtonsState(); //Set what we are listening to, input, or one of the above
+	
+	if (musicType == 0) //Zero Input
+		sp.generateZero();
+	else if (musicType == 1) //Unit Impulse
+		sp.generateUnitImpulse();
+	else if (musicType == 2) //Unit Step
+		sp.generateUnitStep();
+	else if (musicType == 3) //Sine Wave
+		sp.generateSineWave(vIn, freq, 0);	
+	else if (musicType == 4) //Square Wave
+		sp.generateSquareWave(vIn, freq, 0);
+	else if (musicType == 5 || musicType == 6 || musicType == 7 || musicType == 8) //Classical, Folk, Jazz, Reggae
+	{
+		//TO DO: MOVE OUT		
+		var max = Number.NEGATIVE_INFINITY;
+		var amp = 0.0;
+			
+		//Find the max and normalize
+		for (var i = 0, l = sp.inSignal.data.length; i < l; i++)
+		{
+			amp = Math.abs(sp.audioData[i]);
+			if (amp > max)
+				max = amp;
+		}
+		max /= 0.5;
+		if (max != 0.0)
+		{	
+			for (var i = 0, l = sp.inSignal.data.length; i < l; i++)
+			{
+				sp.inSignal.data[i] = vIn*sp.audioData[i] / max;	
+			}
+		}
+		else //Fill in with zeros
+		{
+			for (var i = 0, l = sp.inSignal.data.length; i < l; i++)
+			{
+				sp.inSignal.data[i] = 0.0;	
+			}
+		}
+	}
+	
+	getVDS(sp.inSignal.data, sp.outSignals[0].data, vBias, vS, r, k, vt);
+	getVr(sp.outSignals[0].data, sp.outSignals[1].data);
+        
+	time = [];
+	insig = [];
+	outsig = [];
+	rsig = [];
+	var i = 0;
+	var ii;
+	var imult;
+	var imax;
+	var x = 0;
+	var xinc;
+	
+	
+	//Scale of graph is 500 px
+	//All generated sound (sine wave etc.) except square wave have sampling rate of 50000 Hz, length 1s. We will plot the first 10 ms. That's 500 		samples for 10 ms and 500 px
+	if (musicType == 0 || musicType == 1 || musicType == 2 || musicType == 3)
+	{
+		xinc = 10/500;
+		imax = 500;
+		imult = 1;
+	}
+	else if (musicType == 4) //At 50000 Hz, square wave plays very poorly, we use 88200 Hz
+	{
+		xinc = 10/882;
+		imax = 882;
+		imult = 1;
+	}
+	else if (musicType == 5 || musicType == 6 || musicType == 7 || musicType == 8) //All music files have a sampling rate 22050 Hz, length 20s. 20s/500px --> get value every 0.04 s ie every 882 samples.
+	{
+		xinc = 20/500;
+		imax = 500;		
+		imult = 882;	
+	}
+
+	while (i <= imax)
+	{
+		ii = imult*i;		
+		time[i] = x;
+		insig[i] = sp.inSignal.data[ii];
+		outsig[i] = sp.outSignals[0].data[ii];
+		rsig[i] = sp.outSignals[1].data[ii];
+		x += xinc;
+		i++;	
+	}
+
+	sp.normalizeAllSounds();
+}
+
+var resistance = [0.1, 0.11, 0.12, 0.13, 0.15, 0.16, 0.18, 0.2, 0.22, 0.24, 0.27, 0.3, 0.33, 0.36, 0.39, 0.43, 0.47, 0.51, 0.56, 0.62, 0.68, 0.75, 0.82, 0.91, 1, 1.1, 1.2, 1.3, 1.50, 1.6, 1.8, 2, 2.2, 2.4, 2.7, 3, 3.3, 3.6, 3.9, 4.3, 4.7, 5.1, 5.6, 6.2, 6.8, 7.5, 8.2, 9.1, 10];
+
+function getResistance(value)
+{
+	var distance;
+	var minDistance = Number.POSITIVE_INFINITY;
+	var minIndex;
+   	
+   	for (var i = 0, l = resistance.length; i < l; i++)
+   	{
+		distance = Math.abs(value - resistance[i]);
+		if (distance < minDistance)
+		{
+			minDistance = distance;
+			minIndex = i;
+		}
+   	}
+	return resistance[minIndex];	
+}
+
+function kiloToUnit(k)
+{
+	return k*1000;
+}
+
+function getVDS(inData, outData, VBIAS, VS, R, K, VT)
+{
+	// Given vector of inputs (VGS), compute vector of outputs (VDS)
+	// VGS: input source in vector
+	// VDS: voltage across MOSFET
+	// VS: Supply Voltage
+	// R: load resistor
+	// VC: gate-to-source below above which MOSFET is in saturation
+	// K, VT: mosfet parameters
+	
+	var b;
+	var VC = getVC(VS, R, K, VT);
+	var indata;
+ 	
+	for (var i = 0, l = inData.length; i < l; i++)
+	{
+		indata = inData[i] + VBIAS;
+		
+		if (indata < VT)
+			outData[i] = VS;
+		else if (indata < VC)
+			outData[i] = VS - R*(K/2)*Math.pow(indata - VT, 2);
+        	else
+		{
+                	b = -R*K*(indata - VT) - 1;
+			outData[i] = (-b - Math.sqrt(b*b - 2*R*K*VS))/(R*K);
+		}
+	}
+};
+
+// Solve for VC, where VC is the VGS below which the MOSFET is in saturation
+function getVC(VS, R, K, VT)
+{
+	return VT + (-1 + Math.sqrt(1 + 2*VS*R*K))/(R*K);
+}
+
+function getVr(inData, outData)
+{
+	for (var i = 0, l = outData.length; i < l; i++)
+	{
+		outData[i] = vS - inData[i];
+	}	
+}
diff --git a/common/test/data/full/static/js/sound_labs/plotter.js b/common/test/data/full/static/js/sound_labs/plotter.js
new file mode 100644
index 0000000000..0ce37927c5
--- /dev/null
+++ b/common/test/data/full/static/js/sound_labs/plotter.js
@@ -0,0 +1,1038 @@
+var Plotter = (function() {
+
+	//////////PRIVATE FIELDS AND METHODS//////////
+	var Utils =
+	{
+		TWO_PI: 2.0*Math.PI,
+		PI_DIV_2: Math.PI/2.0,
+
+		getxPix : function(fx, fleft, fwidth, wleft, wwidth)
+		{
+			return Math.round(wleft + wwidth * (fx - fleft) / fwidth);
+		},
+		
+		getxFromPix : function(wx, wleft, wwidth, fleft, fwidth)
+		{
+			return fleft + fwidth * (wx - wleft) / wwidth;
+		},
+	
+		getyPix : function(fy, fbottom, fheight, wbottom, wheight)
+		{
+			return Math.round(wbottom - wheight * (fy - fbottom) / fheight);
+		},
+		
+		getyFromPix : function(wy, wbottom, wheight, fbottom, fheight)
+		{
+			return fbottom + fheight * (wbottom - wy) / wheight;
+		},
+		
+		log10: function(x)
+		{
+			return Math.log(x)/Math.LN10;
+		}
+	};
+
+	var Color =
+	{
+		//Old palette
+		/*background : "rgb(0, 51, 102)", //0.0, 0.2, 0.4
+		black : "rgb(0, 0, 0)", //0.0
+		lodarkgray : "rgb(26, 26, 26)", //0.1 = 25.5
+		darkgray : "rgb(51, 51, 51)", //0.2
+		lomidgray : "rgb(102, 102, 102)", //0.4
+		midgray : "rgb(128, 128, 128)", //0.5 = 127.5
+		himidgray : "rgb(153, 153, 153)", //0.6
+		litegray : "rgb(204, 204, 204)", //0.8
+		white : "rgb(255, 255, 255)", //1.0
+
+		red : "rgb(255, 0, 0)",
+		green : "rgb(0, 255, 0)",
+		blue : "rgb(255, 255, 0)",
+		yellow : "rgb(255, 255, 0)",
+		cyan : "rgb(0, 255, 255)",
+		magenta : "rgb(255, 0, 255)",*/
+		
+		
+		//Solarized palette: http://ethanschoonover.com/solarized
+		base03 :   "#002b36",
+		base02 :   "#073642",
+		base015:   "#30535c",
+		base01 :   "#586e75",
+		base00 :   "#657b83",
+		base0  :   "#839496",
+		base1  :   "#93a1a1",
+		base2  :   "#eee8d5",
+		base3  :   "#fdf6e3",
+		yellow :   "#b58900",
+		orange :   "#cb4b16",
+		red    :   "#dc322f",
+		magenta:   "#d33682",
+		violet :   "#6c71c4",
+		blue   :   "#268bd2",
+		cyan   :   "#2aa198",
+		green  :   "#859900",
+		//lightgreen: "#c3cd82
+		//lightblue: "#95c6e9",
+		lightblue: "#00bfff",
+		lightyellow: "#ffcf48",
+		lightgreen: "#1df914",
+		lightmagenta: "#ff3656"
+	};
+	
+	////////// GENERAL DRAWING ROUTINES //////////
+	
+	function drawLine(c, x1, y1, x2, y2)
+	{
+		c.beginPath();
+		c.moveTo(x1 + 0.5, y1 + 0.5);
+		c.lineTo(x2 + 0.5, y2 + 0.5);
+		c.stroke();
+	}
+
+	//Draws a rectangle, top left corner x1, y1 and bottom right corner x2, y2
+	function drawRect(c, x1, y1, x2, y2)
+	{
+		c.strokeRect(x1 + 0.5, y1 + 0.5, x2 - x1 + 1.0, y2 - y1 + 1.0);
+	}
+
+	function fillRect(c, x1, y1, x2, y2)
+	{
+		c.fillRect(x1, y1, x2 - x1 + 1.0, y2 - y1 + 1.0);
+	}
+
+	function clearRect(c, x1, y1, x2, y2)
+	{
+		c.clearRect(x1 + 0.5, y1 + 0.5, x2 - x1 + 1.0, y2 - y1 + 1.0);
+	}
+
+	function drawPixel(c, x, y)
+	{
+		c.fillRect(x, y, 1.0, 1.0);
+	}
+
+	function drawPoint(c, x, y, radius)
+	{
+		c.beginPath();
+		c.arc(x + 0.5, y + 0.5, radius, 0, Utils.TWO_PI, true); //Last param is anticlockwise
+		c.fill();
+	}
+
+	function drawHollowPoint(c, x, y, radius)
+	{
+		c.beginPath();
+		c.arc(x + 0.5, y + 0.5, radius, 0, Utils.TWO_PI, true); //Last param is anticlockwise
+		c.stroke();
+	}
+
+	function drawTriangle(c, x1, y1, x2, y2, x3, y3)
+	{
+		c.beginPath();
+		c.moveTo(x1 + 0.5, y1 + 0.5);
+		c.lineTo(x2 + 0.5, y2 + 0.5);
+		c.lineTo(x3 + 0.5, y3 + 0.5);
+		c.closePath();
+		c.stroke();
+	}
+
+	function fillTriangle(c, x1, y1, x2, y2, x3, y3)
+	{
+		c.beginPath();
+		c.moveTo(x1 + 0.5, y1 + 0.5);
+		c.lineTo(x2 + 0.5, y2 + 0.5);
+		c.lineTo(x3 + 0.5, y3 + 0.5);
+		c.closePath();
+		c.fill();
+	}
+
+	function drawHalfCircle(c, x, y, radius, concaveDown) //For inductance only
+	{
+		c.beginPath();
+		if (concaveDown)
+			c.arc(x + 0.5, y + 0.5, radius, 0, Math.PI, true); //Last param is anticlockwise
+		else
+			c.arc(x + 0.5, y + 0.5, radius, Math.PI, 0, true); //Last param is anticlockwise
+		c.stroke();
+	}
+
+	function drawDiamond(c, x, y, h)
+	{
+		var xc = x + 0.5;
+		var yc = y + 0.5;
+
+		c.beginPath();
+		c.moveTo(xc-h, yc);
+		c.lineTo(xc, yc-h);
+		c.lineTo(xc+h, yc);
+		c.lineTo(xc, yc+h);
+		c.closePath();
+
+		c.fill();
+	}
+
+	function drawX(c, x, y, h)
+	{
+		var xc = x + 0.5;
+		var yc = y + 0.5;
+
+		c.beginPath();
+		c.moveTo(xc+h, yc-h);
+		c.lineTo(xc-h, yc+h);
+		c.moveTo(xc-h, yc-h);
+		c.lineTo(xc+h, yc+h);
+		c.stroke();
+	}
+	
+	function drawArrow(c, x1, y1, x2, y2, base, height)
+	{
+		var xs1 = x1 + 0.5;
+		var ys1 = y1 + 0.5;
+		var xs2 = x2 + 0.5;
+		var ys2 = y2 + 0.5;
+		var xv = x2 - x1;
+		var yv = y2 - y1;
+		var ang = Math.atan2(-yv, xv);
+
+		c.beginPath();
+		//Arrow line
+		c.moveTo(xs1, ys1);
+		c.lineTo(xs2, ys2);
+		c.stroke();
+		//Arrow head, first draw a triangle with top on origin then translate/rotate to orient and fit on line
+		c.save();
+		c.beginPath();
+		c.translate(xs2, ys2);
+		c.rotate(Utils.PI_DIV_2-ang);
+
+		c.moveTo(0, 0);
+		c.lineTo(-base, height);
+		c.lineTo(base, height);
+		c.closePath();
+		c.fill();
+		//c.stroke();
+		c.restore();
+	}
+	
+	function DrawingZone(left, top, width, height)
+	{
+		this.left = left;
+		this.top = top;
+		this.width = width;
+		this.height = height;
+		this.right = left + width - 1;
+		this.bottom = top + height - 1;
+	}
+	
+	function Graph(x, y, width, height, canvas, buffer)
+	{
+		this.canvas = canvas;
+		this.buffer = buffer;
+		this.canvas_ctx = canvas.getContext("2d");
+		this.buffer_ctx = buffer.getContext("2d");
+		this.canvasColor = Color.base02; //Color.background : "rgb(0, 51, 102)"
+		
+		//Use the screen canvas
+		this.ctx = this.canvas_ctx;
+		
+		this.drawingZone = new DrawingZone(x, y, width, height);
+		this.drawingZoneColor = Color.base03; //Color.black;
+		this.drawingZoneBorderColor = Color.base01; //Color.lomidgray;
+
+		this.xGridColor = Color.base015; //Color.darkGray;
+		this.xAxisColor = Color.base00;  //Color.himidgray;
+		this.xLabelColor = Color.base1;  //Color.himidgray;
+		this.xTextColor = Color.base2;   //Color.litegray;
+
+		this.yGridColor = Color.base015; //Color.darkGray;
+		this.yAxisColor = Color.base00;  //Color.himidgray;
+		this.yLabelColor = Color.base1;  //Color.himidgray;
+		this.yTextColor = Color.base2;   //Color.litegray;
+		
+		this.xText = "x";
+		this.yText = "y";
+
+		this.xmin = -1.0;
+		this.xmax = 1.0;
+		this.xspan = 2.0;
+		this.ymin = -10.0;
+		this.ymax = 10.0;
+		this.yspan = 20.0;
+
+		this.x0 = 0.0;
+		this.y0 = 0.0;
+		this.wx0 = 0;
+		this.wy0 = 0;
+		this.xShortTickStep = 0.1;
+		this.xShortTickMin = this.xmin;
+		this.xShortTickMax = this.xmax;
+
+		this.xLongTickStep = 0.2;
+		this.xLongTickMin = this.xmin;
+		this.xLongTickMax = this.xmax;
+
+		this.xLabelStep = 0.2;
+		this.xLabelMin = this.xmin;
+		this.xLabelMax = this.xmax;
+
+		this.xGridStep = 0.2;
+		this.xGridMin = this.xmin;
+		this.xGridMax = this.xmax;
+
+		this.formatxzero = true;
+		this.formatyzero = true;
+
+		this.yShortTickStep = 1;
+		this.yShortTickMin = this.ymin;
+		this.yShortTickMax = this.ymax;
+
+		this.yLongTickStep = 2;
+		this.yLongTickMin = this.ymin;
+		this.yLongTickMax = this.ymax;
+
+		this.yLabelStep = 2;
+		this.yLabelMin = this.ymin;
+		this.yLabelMax = this.ymax;
+
+		this.yGridStep = 2;
+		this.yGridMin = this.ymin;
+		this.yGridMax = this.ymax;
+
+		this.automaticxLabels = true;
+		this.xLabelyOffset = 7;
+		this.automaticyLabels = true;
+		this.yLabelxOffset = -7;
+
+		this.xTextxOffset = 9;
+		this.yTextyOffset = -9;
+		
+		this.hasxLog = false;
+		this.hasyLog = false;
+		this.xPowerMin = 1;
+		this.xPowerMax = 5;
+		this.yPowerMin = 1;
+		this.yPowerMax = 5;
+		this.xLabelDecimalDigits = 1;
+		this.yLabelDecimalDigits = 1;
+
+		this.showxGrid = true;
+		this.showyGrid = true;
+		this.showBorder = true;
+		this.showxShortTicks = true;
+		this.showxLongTicks = true;
+		this.showxLabels = true;
+		this.showyShortTicks = true;
+		this.showyLongTicks = true;
+		this.showyLabels = true;
+		this.showxAxis = true;
+		this.showxText = true;
+		this.showyAxis = true;
+		this.showyText = true;
+
+		this.paintOn = function(where) //On what context the drawing commands will operate
+		{
+			if (where == "buffer")
+				this.ctx = this.buffer_ctx;
+			else if (where == "canvas")
+				this.ctx = this.canvas_ctx;  //Default behavior
+		};
+		
+		this.paintBuffer = function() //Paints buffer on screen canvas
+		{
+			this.canvas_ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+			this.canvas_ctx.drawImage(buffer, 0, 0);
+		};
+		
+		this.paintCanvas = function() //Paints screen canvas on buffer
+		{
+			this.buffer_ctx.clearRect(0, 0, this.buffer.width, this.buffer.height);
+			this.buffer_ctx.drawImage(canvas, 0, 0);
+		};		
+		
+		this.drawBorder = function()
+		{
+			this.ctx.strokeStyle = this.drawingZoneBorderColor;
+			drawRect(this.ctx, this.drawingZone.left, this.drawingZone.top, this.drawingZone.right - 1, this.drawingZone.bottom - 1);
+		};
+
+		this.drawxAxis = function()
+		{
+			this.wy0 = this.getyPix(this.y0);
+			this.ctx.strokeStyle = this.xAxisColor;
+			drawLine(this.ctx, this.drawingZone.left, this.wy0, this.drawingZone.right + 6, this.wy0);
+			drawLine(this.ctx, this.drawingZone.right + 3, this.wy0 - 3, this.drawingZone.right + 3, this.wy0 + 3);
+			drawLine(this.ctx, this.drawingZone.right + 4, this.wy0 - 2, this.drawingZone.right + 4, this.wy0 + 2);
+			drawLine(this.ctx, this.drawingZone.right + 5, this.wy0 - 1, this.drawingZone.right + 5, this.wy0 + 1);
+		};
+		
+		/*
+		if (this.hasxLog)
+						wx = this.getxPix(Utils.log10(x));
+		if (this.hasyLog)
+						wy = this.getyPix(Utils.log10(y));
+		*/
+						
+		/*
+		this.ctx.textAlign = "left";
+		this.ctx.textAlign = "center";
+		this.ctx.textAlign = "right";
+		this.ctx.textBaseline = "top";
+		this.ctx.textBaseline = "middle";
+		this.ctx.textBaseline = "bottom";
+		this.ctx.textBaseline = "alphabetic";
+		*/
+						
+		this.drawxLog = function()
+		{
+			var power;
+			var x;
+			var wx;
+			var wy = this.drawingZone.bottom + 12;
+			var str;
+			
+			//Don't draw grid line when on border of graph
+			for(var p = this.xPowerMin; p <= this.xPowerMax; p++)
+			{
+				wx = this.getxPix(p);
+				if(wx > this.drawingZone.right)
+						wx = this.drawingZone.right;
+				//Labeled grid line
+				if (p != this.xPowerMin && p != this.xPowerMax) //Don't draw line on left or right border of graph
+				{ 
+					this.ctx.strokeStyle = this.xGridColor;
+					drawLine(this.ctx, wx, this.drawingZone.bottom, wx, this.drawingZone.top);
+				}	
+				//Long ticks
+				this.ctx.strokeStyle = this.xLabelColor;
+				drawLine(this.ctx, wx, this.drawingZone.bottom, wx, this.drawingZone.bottom + 4);
+				//Now the labels
+				this.ctx.fillStyle = this.xLabelColor;
+				this.ctx.strokeStyle = this.xLabelColor;
+				str = "10^{" + p.toFixed(0) + "}";
+				this.drawSubSuperScript(this.ctx, str, wx, wy, "center", "top");
+								
+				if (p != this.xPowerMax)
+				{
+					for(var i = 2; i < 10; i++)
+					{
+						x = p + Utils.log10(i);
+						wx = this.getxPix(x);
+						//Grid
+						this.ctx.strokeStyle = this.xGridColor;
+						drawLine(this.ctx, wx, this.drawingZone.bottom, wx, this.drawingZone.top);
+						//Short ticks
+						this.ctx.strokeStyle = this.xLabelColor;
+						drawLine(this.ctx, wx, this.drawingZone.bottom, wx, this.drawingZone.bottom + 2);
+					}
+				}
+			}
+		}
+		
+		this.drawyLog = function()
+		{
+			var power;
+			var y;
+			var wy;
+			var wx = this.drawingZone.left - 7;
+			var str;
+			
+			//Don't draw grid line when on border of graph
+			for(var p = this.yPowerMin; p <= this.yPowerMax; p++)
+			{
+				wy = this.getyPix(p);	
+				if(wy < this.drawingZone.top)
+					wy = this.drawingZone.top;
+				//Labeled grid line
+				if (p != this.yPowerMin && p != this.yPowerMax) //Don't draw line on left or right border of graph
+				{ 
+					this.ctx.strokeStyle = this.yGridColor;
+					drawLine(this.ctx, this.drawingZone.left, wy, this.drawingZone.right, wy);
+				}	
+				//Long ticks
+				this.ctx.strokeStyle = this.yLabelColor;
+				drawLine(this.ctx, this.drawingZone.left, wy, this.drawingZone.left - 4, wy);
+				//Now the labels
+				this.ctx.fillStyle = this.yLabelColor;
+				this.ctx.strokeStyle = this.yLabelColor;
+				str = "10^{" + p.toFixed(0) + "}";
+				this.drawSubSuperScript(this.ctx, str, wx, wy, "right", "middle");
+				
+				if (p != this.xPowerMax)
+				{
+					for(var i = 2; i < 10; i++)
+					{
+						y = p + Utils.log10(i);
+						wy = this.getyPix(y);
+						//Grid
+						this.ctx.strokeStyle = this.yGridColor;
+						drawLine(this.ctx, this.drawingZone.left, wy, this.drawingZone.right, wy);
+						//Short ticks
+						this.ctx.strokeStyle = this.xLabelColor;
+						drawLine(this.ctx, this.drawingZone.left, wy, this.drawingZone.left - 2, wy);
+					}
+				}
+			}
+		}
+
+		this.drawxGrid = function()
+		{
+			var x;
+			var wx;
+
+			this.ctx.strokeStyle = this.xGridColor;
+
+			if(this.xGridStep > 0)
+			{
+				for(x = this.xGridMin; x <= this.xGridMax; x += this.xGridStep)
+				{
+					wx = this.getxPix(x);
+					if(wx > this.drawingZone.right)
+						wx = this.drawingZone.right;
+					drawLine(this.ctx, wx, this.drawingZone.bottom, wx, this.drawingZone.top);
+				}
+			}
+		};
+
+		this.drawxLongTicks = function()
+		{
+			var x;
+			var wx;
+
+			this.ctx.strokeStyle = this.xLabelColor;
+
+			if(this.xLongTickStep > 0)
+			{
+				for(x = this.xLongTickMin; x <= this.xLongTickMax; x += this.xLongTickStep)
+				{
+					wx = this.getxPix(x);
+					if(wx > this.drawingZone.right)
+						wx = this.drawingZone.right;
+					drawLine(this.ctx, wx, this.drawingZone.bottom, wx, this.drawingZone.bottom + 4);
+				}
+			}
+		};
+
+		this.drawxShortTicks = function()
+		{
+			var x;
+			var wx;
+
+			this.ctx.strokeStyle = this.xLabelColor;
+
+			if(this.xShortTickStep > 0)
+			{
+				for(x = this.xShortTickMin; x <= this.xShortTickMax; x += this.xShortTickStep)
+				{
+					wx = this.getxPix(x);
+					if(wx > this.drawingZone.right)
+						wx = this.drawingZone.right;
+					drawLine(this.ctx, wx, this.drawingZone.bottom, wx, this.drawingZone.bottom + 2);
+				}
+			}
+		};
+		
+		this.drawyAxis = function()
+		{
+			this.wx0 = this.getxPix(this.x0);
+
+			this.ctx.strokeStyle = this.yAxisColor;
+			drawLine(this.ctx, this.wx0, this.drawingZone.bottom, this.wx0, this.drawingZone.top - 6);
+			drawLine(this.ctx, this.wx0 - 3, this.drawingZone.top - 3, this.wx0 + 3, this.drawingZone.top - 3);
+			drawLine(this.ctx, this.wx0 - 2, this.drawingZone.top - 4, this.wx0 + 2, this.drawingZone.top - 4);
+			drawLine(this.ctx, this.wx0 - 1, this.drawingZone.top - 5, this.wx0 + 1, this.drawingZone.top - 5);
+		};
+
+		this.drawyLongTicks = function()
+		{
+			var y;
+			var wy;
+
+			this.ctx.strokeStyle = this.yLabelColor;
+
+			if(this.yLongTickStep > 0)
+			{
+				for(y = this.yLongTickMin; y <= this.yLongTickMax; y += this.yLongTickStep)
+				{
+					wy = this.getyPix(y);	
+					if(wy < this.drawingZone.top)
+						wy = this.drawingZone.top;
+					drawLine(this.ctx, this.drawingZone.left, wy, this.drawingZone.left - 4, wy);
+				}
+			}
+		};
+
+		this.drawyShortTicks = function()
+		{
+			var y;
+			var wy;
+
+			this.ctx.strokeStyle = this.yLabelColor;
+
+			if(this.yShortTickStep > 0)
+			{
+				for(y = this.yShortTickMin; y <= this.yShortTickMax; y += this.yShortTickStep)
+				{
+					wy = this.getyPix(y);
+					if(wy < this.drawingZone.top)
+						wy = this.drawingZone.top;
+					drawLine(this.ctx, this.drawingZone.left, wy, this.drawingZone.left - 2, wy);
+				}
+			}
+		};
+
+		this.drawyGrid = function()
+		{
+			var y;
+			var wy;
+
+			this.ctx.strokeStyle = this.yGridColor;
+
+			if(this.yGridStep > 0)
+			{
+				for(y = this.yGridMin; y <= this.yGridMax; y += this.yGridStep)
+				{
+					wy = this.getyPix(y);
+					if(wy < this.drawingZone.top)
+						wy = this.drawingZone.top;
+					drawLine(this.ctx, this.drawingZone.left, wy, this.drawingZone.right, wy);
+				}
+			}
+		};
+
+		this.drawxLabels = function()
+		{
+			var x;
+			var wx = 0;
+			var wy = this.drawingZone.bottom + this.xLabelyOffset;
+			//y coordinate of all labels
+			var str;
+
+			this.ctx.font = "8pt Verdana bold";
+			this.ctx.fillStyle = this.xLabelColor;
+			this.ctx.strokeStyle = this.xLabelColor;
+			this.ctx.textAlign = "center";
+			this.ctx.textBaseline = "top";
+			
+			if(this.automaticxLabels)
+			{
+				for( x = this.xLabelMin; x <= this.xLabelMax; x += this.xLabelStep)
+				{
+					wx = this.getxPix(x);
+
+					if(Math.abs(x) < 0.00001 && this.formatxzero)
+						str = "0";
+					else
+						str = x.toFixed(this.xLabelDecimalDigits);
+
+					//this.ctx.fillText(this.text, xmid, ymid);
+					this.ctx.strokeText(str, wx, wy);
+					this.ctx.fillText(str, wx, wy);
+				}
+			}
+		}
+		
+		this.drawxText = function()
+		{
+			var x;
+			var wx = this.drawingZone.right + this.xTextxOffset;
+			var wy = this.getyPix(this.y0);
+
+			this.ctx.fillStyle = this.xTextColor;
+			this.ctx.strokeStyle = this.xTextColor;
+			this.drawSubSuperScript(this.ctx, this.xText, wx, wy, "left", "middle", "10pt Verdana bold", "8pt Verdana bold");
+		};
+
+		this.drawyLabels = function()
+		{
+			var y;
+			var wy = 0;
+			var wx = this.drawingZone.left + this.yLabelxOffset;
+			var str;
+
+			this.ctx.font = "8pt Verdana bold";
+			this.ctx.fillStyle = this.yLabelColor;
+			this.ctx.strokeStyle = this.yLabelColor;
+			this.ctx.textAlign = "right";
+			this.ctx.textBaseline = "middle";
+			
+			if(this.automaticyLabels)
+			{
+				for( y = this.yLabelMin; y <= this.yLabelMax; y += this.yLabelStep)
+				{
+					wy = this.getyPix(y);
+
+					if(Math.abs(y) < 0.00001 && this.formatyzero)
+						str = "0";
+					else
+						str = y.toFixed(this.yLabelDecimalDigits);
+
+					this.ctx.strokeText(str, wx, wy);
+					this.ctx.fillText(str, wx, wy);
+				}
+			}
+		};
+
+		this.drawyText = function()
+		{
+			var x;
+			var wx = this.getxPix(this.x0);
+			var wy = this.drawingZone.top + this.yTextyOffset;
+
+			this.ctx.fillStyle = this.yTextColor;
+			this.ctx.strokeStyle = this.yTextColor;
+			this.drawSubSuperScript(this.ctx, this.yText, wx, wy, "left", "bottom", "10pt Verdana bold", "8pt Verdana bold");
+		};
+		
+		this.parseSubSuperScriptText = function(str)
+		{
+			/*var regExpSub = /_\{(.*?)\}/g;
+			var regExpSup = /\^\{(.*?)\}/g;
+			var subs = [];
+			var sups = [];
+			var text = [];
+			var finalText = [];
+			var isSub = false;
+			var isSup = false;
+
+			subs = str.match(regExpSub);
+			for (var i = 0; i < subs.length; i++)
+			{
+				subs[i] = subs[i].substring(2, subs[i].length - 1); //Discard _{ and }
+			}
+
+			sups = str.match(regExpSup);
+			for (var i = 0; i < sups.length; i++)
+			{
+				sups[i] = sups[i].substring(2, sups[i].length - 1); //Discard ^{ and }
+			}*/
+	   	
+    	var len = str.length;
+   		var i = 0;
+   		var start;
+   		var end;
+   		found = false;
+   		var text = [];
+   		var type;
+   		var ntext = "";
+	   	
+   		while (i < len)
+   		{
+   			if (str[i] == "_") //Encountered a potential subscript _
+   				type = "sub";
+   			else if (str[i] == "^")  //Encountered a potential superscript ^
+   				type = "sup";
+   			
+   			if (type == "sub" || type == "sup")
+   			{
+   				if (str[i+1] == "{")
+   				{
+   					i += 2; //Discard _{ or ^{
+   					start = i;
+   					found = false;
+   					while (i < len) //Look for }
+   					{
+   						if (str[i] == "}")
+   						{
+   							found = true;
+   							end = i;
+   							break;
+   						}
+   						i++;
+   					}
+   					if (found && end > start) //Discard empty subscript ie _{}
+   					{
+   						//Store previous normal text if not empty and tag it as so
+   						if (ntext.length != 0)
+   						{
+   							text.push({s: ntext, type: "normal"});
+   							ntext = "";
+   						}	
+   						//Store subscript or superscript and tag it as so
+   						if (type == "sub")
+   							text.push({s: str.substring(start, end), type: "sub"});
+   						else if (type == "sup")
+   							text.push({s: str.substring(start, end), type: "sup"});
+   						i = end + 1;
+   					}
+   					else
+   						i = start - 2; //Nothing was found, backtrack to _ or ^
+   				}
+   			}
+   			ntext += str[i];
+   			if (i == len - 1 && ntext.length != 0) //We've reached the end, store normal text if not empty and tag it as so 
+   				text.push({s: ntext, type: "normal"});
+   			i++;
+   		}
+   	
+			return text;
+		}
+  
+		this.subSuperScriptLength = function(c, text, fNormal, fSubSup)
+		{
+			var fontNormal = fNormal;
+			var fontSubSup = fSubSup;
+				    	    
+   		var xpos = 0;
+   	
+   		for (var i = 0; i < text.length; i++)
+   		{		
+				if (text[i].type == "normal")
+					c.font = fontNormal;
+				else if (text[i].type == "sub")
+					c.font = fontSubSup;
+				else
+					c.font = fontSubSup;
+				xpos += c.measureText(text[i].s).width;	
+			}
+   	
+			return xpos;
+		}	
+  	
+		this.drawSubSuperScript = function(c, str, x, y, xway, yway, fNormal, fSubSup)
+		{
+			var fontNormal = (typeof fNormal == 'undefined') ? "8pt Verdana bold" : fNormal;
+			var fontSubSup = (typeof fSubSup == 'undefined') ? "7pt Verdana bold" : fSubSup;
+			
+			this.ctx.textAlign = "left"; 
+			this.ctx.textBaseline = yway;
+	    	    	    
+   		var text = this.parseSubSuperScriptText(str);
+   		var len = this.subSuperScriptLength(c, text, fontNormal, fontSubSup);
+   		var xposIni = x;
+   		var yposIni = y;
+   		var xpos, ypos;
+   	
+   		if (xway == "left")
+   			xpos = xposIni;
+   		else if (xway == "right")
+   			xpos = xposIni - len;
+   		else if (xway == "center")
+   			xpos = xposIni - len/2;	
+   	
+   		//Draw the text
+   		for (var i = 0; i < text.length; i++)
+   		{		
+				if (text[i].type == "normal")
+				{
+					c.font = fontNormal;
+					ypos = yposIni;
+				}	
+				else if (text[i].type == "sub")
+				{
+					c.font = fontSubSup;
+					ypos = yposIni + 3;
+				}
+				else
+				{
+					c.font = fontSubSup;
+					ypos = yposIni - 5;
+				}
+				c.strokeText(text[i].s, xpos, ypos);
+				c.fillText(text[i].s, xpos, ypos);
+				//Advance x position
+				xpos += c.measureText(text[i].s).width + 2;	
+			}   		
+		}
+
+		this.paint = function()
+		{
+			//Clears the canvas entirely with background color
+			this.ctx.fillStyle = this.canvasColor;
+			this.ctx.fillRect(0, 0, this.ctx.canvas.width, this.ctx.canvas.height);
+			
+			//Clear drawing zone
+			this.ctx.fillStyle = this.drawingZoneColor;
+			fillRect(this.ctx, this.drawingZone.left, this.drawingZone.top, this.drawingZone.right, this.drawingZone.bottom);
+
+			if (!this.hasxLog)
+			{
+				if(this.showxGrid)
+					this.drawxGrid();
+			}
+			
+			if (!this.hasyLog)
+			{	
+				if(this.showyGrid)
+					this.drawyGrid();
+			}		
+
+			if(this.showBorder)
+				this.drawBorder();
+
+			if (!this.hasxLog)
+			{
+				if(this.showxShortTicks)
+					this.drawxShortTicks();
+				if(this.showxLongTicks)
+					this.drawxLongTicks();
+				if(this.showxLabels)
+					this.drawxLabels();
+			}		
+
+			if (!this.hasyLog)
+			{
+				if(this.showyShortTicks)
+					this.drawyShortTicks();
+				if(this.showyLongTicks)
+					this.drawyLongTicks();
+				if(this.showyLabels)
+					this.drawyLabels();
+			}		
+
+			if (this.hasxLog)
+				this.drawxLog();
+				
+			if (this.hasyLog)
+				this.drawyLog();
+			
+			if(this.showxAxis)
+				this.drawxAxis();
+			if(this.showxText)
+				this.drawxText();
+			
+			if(this.showyAxis)
+				this.drawyAxis();
+			if(this.showyText)
+				this.drawyText();
+						
+			
+		};
+
+		this.drawCurve = function(f, color)
+		{
+			var wx, wy;
+			var x, y;
+
+			this.ctx.strokeStyle = color;
+			wx = this.drawingZone.left;
+			x = this.getxFromPix(wx);
+			y = f(x);
+			wy = this.getyPix(y);
+
+			this.ctx.beginPath();
+			this.ctx.moveTo(wx + 0.5, wy + 0.5);
+
+			while(wx < this.drawingZone.right)
+			{
+				wx++;
+				x = this.getxFromPix(wx);
+				y = f(x);
+				wy = this.getyPix(y);
+				this.ctx.lineTo(wx + 0.5, wy + 0.5);
+			}
+			//this.ctx.closePath();
+
+			this.ctx.stroke();
+		};
+
+		this.drawArray = function(tt, ff, color)
+		{
+			var wx, wy;
+			var x, y;
+			var l = tt.length;
+			this.ctx.save();
+			this.ctx.beginPath();
+			this.ctx.rect(this.drawingZone.left, this.drawingZone.top, this.drawingZone.width, this.drawingZone.height);
+			this.ctx.clip();
+			this.ctx.strokeStyle = color;//"rgb(256, 0, 0)";// Color.orange; //yellow, orange, red, magenta, violet, blue, cyan, green
+
+			wx = this.getxPix(tt[0]);
+			wy = this.getyPix(ff[0]);
+			this.ctx.beginPath();
+			this.ctx.moveTo(wx + 0.5, wy + 0.5);
+
+			for (var i = 0; i < l; i++)
+			{
+				wx = this.getxPix(tt[i]);
+				wy = this.getyPix(ff[i]);
+				//this.ctx.lineTo(wx + 0.5, wy + 0.5);
+				this.ctx.lineTo(wx, wy);
+			}
+
+			//this.ctx.closePath();
+
+			this.ctx.stroke();
+			this.ctx.restore();
+		};
+
+		this.drawPoint = function(x, y, color)
+		{
+			this.ctx.fillStyle = color;
+			drawPoint(this.ctx, this.getxPix(x), this.getyPix(y), 4);
+		};
+
+		this.drawHollowPoint = function(x, y, color)
+		{
+			this.ctx.strokeStyle = color;
+			drawHollowPoint(this.ctx, this.getxPix(x), this.getyPix(y), 4);
+		};
+
+		this.drawDiamond = function(x, y, color)
+		{
+			this.ctx.fillStyle = color;
+			drawDiamond(this.ctx, this.getxPix(x), this.getyPix(y), 4);
+		};
+
+		this.drawX = function(x, y, color)
+		{
+			this.ctx.strokeStyle = color;
+			drawX(this.ctx, this.getxPix(x), this.getyPix(y), 4);
+		};
+
+		this.drawLine = function(x1, y1, x2, y2, color)
+		{
+			this.ctx.strokeStyle = color;
+			drawLine(this.ctx, this.getxPix(x1), this.getyPix(y1), this.getxPix(x2), this.getyPix(y2));
+		};
+
+		this.drawArrow = function(x1, y1, x2, y2, color)
+		{
+			this.ctx.strokeStyle = color;
+			this.ctx.fillStyle = color;
+			drawArrow(this.ctx, this.getxPix(x1), this.getyPix(y1), this.getxPix(x2), this.getyPix(y2), 5, 10);
+		};
+
+		this.getxPix = function(x)
+		{
+			return Math.round(this.drawingZone.left + this.drawingZone.width * (x - this.xmin) / this.xspan);
+		};
+
+		this.getyPix = function(y)
+		{
+			return Math.round(this.drawingZone.bottom - this.drawingZone.height * (y - this.ymin) / this.yspan);
+		};
+
+		this.getxFromPix = function(wx)
+		{
+			return (this.xmin + this.xspan * (wx - this.drawingZone.left) / this.drawingZone.width);
+		};
+
+		this.getyFromPix = function(wy)
+		{
+			return (this.ymin + this.yspan * (this.drawingZone.bottom - wy) / this.drawingZone.height);
+		};
+
+		this.isInside = function(x, y)
+		{
+			if((this.drawingZone.left <= x) && (x <= this.drawingZone.right) && (this.drawingZone.top <= y) && (y <= this.drawingZone.bottom))
+				return true;
+			else
+				return false;
+		};
+
+		this.inBounds = function(x, y)
+		{
+			if((this.xmin <= x) && (x <= this.xmax) && (this.ymin <= y) && (y <= this.ymax))
+				return true;
+			else
+				return false;
+		};
+	}
+
+	//////////PUBLIC FIELDS AND METHODS//////////
+	return {
+
+		Utils: Utils,
+		Color: Color,
+		DrawingZone: DrawingZone,
+		Graph: Graph,
+	};
+}());
diff --git a/common/test/data/full/static/js/sound_labs/rc_filters.js b/common/test/data/full/static/js/sound_labs/rc_filters.js
new file mode 100644
index 0000000000..caa3781b4a
--- /dev/null
+++ b/common/test/data/full/static/js/sound_labs/rc_filters.js
@@ -0,0 +1,938 @@
+$(document).ready(function()
+{
+	//The try catch block checks if canvas and audio libraries are present. If not, we exit and alert the user.
+	try
+	{
+		//Add corresponding listener to various UI elements		
+		$('#musicTypeSelect').change(onSelectChange);		
+		$('input:checkbox').click(checkboxClicked);
+		$('input:radio').click(radioButtonClicked);
+		$('#playButton').click(playButtonClicked);
+		initSound();
+		initDiagram();
+		initGraphs();
+		setTimeGraph();
+		setMagGraph();
+		setPhaseGraph();
+		generateBuffer();
+		calculateSignals();
+		draw();
+		labEnabled = true;
+		$("#graphTabs").tabs();
+		$("#graphTabs").bind("tabsselect", tabSelected);
+	}	
+	catch(err)
+	{
+		labEnabled = false;
+		alert(err + " The tool is disabled.");
+	}	
+});
+
+function initGraphs()
+{
+	//Test if canvas is supported. If not, exit.
+	var testCanvas = document.createElement("canvas")
+	if (!testCanvas.getContext)
+		throw "Canvas element is not supported in this browser."
+		
+	//Time graph
+	//Get canvas
+	var timeCanvas = $('#time')[0];
+	//To disable text selection outside the canvas
+	timeCanvas.onselectstart = function(){return false;};
+	//Create an offscreen buffer
+	var timeBuffer = document.createElement('canvas');
+	timeBuffer.width = timeCanvas.width;
+	timeBuffer.height = timeCanvas.height;
+	timeGraph = new Plotter.Graph(50, 50, 400, 400, timeCanvas, timeBuffer);
+	
+	//Magnitude graph
+	//Get canvas
+	var magCanvas = $('#magnitude')[0];
+	//To disable text selection outside the canvas
+	magCanvas.onselectstart = function(){return false;};
+	//Create an offscreen buffer
+	var magBuffer = document.createElement('canvas');
+	magBuffer.width = magCanvas.width;
+	magBuffer.height = magCanvas.height;
+	magGraph = new Plotter.Graph(50, 50, 400, 400, magCanvas, magBuffer);
+	
+	//Phase graph
+	//Get canvas
+	var phaseCanvas = $('#phase')[0];
+	//To disable text selection outside the canvas
+	phaseCanvas.onselectstart = function(){return false;};
+	//Create an offscreen buffer
+	var phaseBuffer = document.createElement('canvas');
+	phaseBuffer.width = phaseCanvas.width;
+	phaseBuffer.height = phaseCanvas.height;
+	phaseGraph = new Plotter.Graph(50, 50, 400, 400, phaseCanvas, phaseBuffer);
+}
+
+var diagram, VIn, R, C;
+
+function initDiagram()
+{
+	//Test if canvas is supported. If not, exit.
+	var testCanvas = document.createElement("canvas")
+	if (!testCanvas.getContext)
+		throw "Canvas element is not supported in this browser."
+	
+	var element = $('#diag2');
+	diagram = new Circuit.Diagram(element, true);
+
+	//Lines
+	var wirev1 = diagram.addWire(100, 295, 100, 325);
+	var wirev2 = diagram.addWire(100, 140, 100, 170);
+	var wirev3 = diagram.addWire(380, 295, 380, 325);
+	var wirev4 = diagram.addWire(380, 140, 380, 170);
+	var wireh1 = diagram.addWire(100, 140, 145, 140);
+	var wireh2 = diagram.addWire(285, 140, 333, 140);
+	var wireh3 = diagram.addWire(100, 355, 240, 355);
+		
+	var rLabel = diagram.addLabel(205, 75, "\u002B  v_{R}  \u2212", "left"); 
+	var cLabelPlus = diagram.addLabel(305, 225, "\u002B", "left");
+	var cLabel = diagram.addLabel(305, 250, "v_{C}", "left");
+	var cLabelMinus = diagram.addLabel(305, 270, "\u2212", "left");
+	rLabel.color = Plotter.Color.lightgreen;
+	cLabelPlus.color = Plotter.Color.lightyellow;
+	cLabel.color = Plotter.Color.lightyellow;
+	cLabelMinus.color = Plotter.Color.lightyellow;
+	
+	//Ground
+	var ground = diagram.addGround(240, 355);
+		
+	//Resistor
+	R = diagram.addResistor(190, 140, 1);
+	R.rotation = Math.PI/2;
+	R.label.str = "R";
+	R.valueString.suffix = "k\u03A9";
+	
+	//Capacitor
+	C = diagram.addCapacitor(380, 200, 110);
+	C.label.str = "C";
+	C.valueString.suffix = "nF";
+	
+	//Voltage source
+	VIn = diagram.addSource(100, 200, 3, "v");
+	VIn.label.str = "v_{IN}";
+	VIn.valueString.suffix = "V";
+	VIn.label.color = Plotter.Color.lightblue;
+	VIn.valueString.color = Plotter.Color.lightblue;
+	
+	//diagram.showGrid = true;
+	diagram.paint();
+}
+
+function setTimeGraph()
+{
+	var lticks = 1;
+	var sticks = 0.5;
+	//x axis
+	timeGraph.xText = xLab;
+	timeGraph.yText = "V_{MAX} (Volts)";	
+	timeGraph.xmin = 0;
+	timeGraph.xmax = maxTime;
+	timeGraph.xspan = maxTime;
+	timeGraph.xShortTickMin = 0;
+	timeGraph.xShortTickMax = maxTime;
+	timeGraph.xShortTickStep = maxTime/20;
+	timeGraph.xLongTickMin = 0;
+	timeGraph.xLongTickMax = maxTime;
+	timeGraph.xLongTickStep = maxTime/10;
+	timeGraph.xLabelMin = 0;
+	timeGraph.xLabelMax = maxTime;
+	timeGraph.xLabelStep = maxTime/10;
+	timeGraph.xGridMin = 0;
+	timeGraph.xGridMax = maxTime;
+	timeGraph.xGridStep = maxTime/10;
+	//y axis
+	timeGraph.ymin = -maxVolt;
+	timeGraph.ymax = maxVolt;
+	timeGraph.yspan = 2*maxVolt;
+	timeGraph.yShortTickMin = -maxVolt + (maxVolt % sticks);
+	timeGraph.yShortTickMax = maxVolt - (maxVolt % sticks);
+	timeGraph.yShortTickStep = sticks;
+	timeGraph.yLongTickMin = -maxVolt + (maxVolt % lticks);
+	timeGraph.yLongTickMax = maxVolt - (maxVolt % lticks);
+	timeGraph.yLongTickStep = lticks;
+	timeGraph.yLabelMin = -maxVolt + (maxVolt % lticks);
+	timeGraph.yLabelMax = maxVolt - (maxVolt % lticks);
+	timeGraph.yLabelStep = lticks;
+	timeGraph.yGridMin = -maxVolt + (maxVolt % lticks);
+	timeGraph.yGridMax = maxVolt - (maxVolt % lticks);
+	timeGraph.yGridStep = lticks;
+}
+
+function setMagGraph()
+{
+	var lticks = 1;
+	var sticks = 0.5;
+	//x axis
+	magGraph.xText = "f (Hz)";
+	magGraph.yText = "Magnitude (dB)";	
+	magGraph.xmin = -1;
+	magGraph.xmax = 5;
+	magGraph.xspan = 6;
+	magGraph.xPowerMin = -1;
+	magGraph.xPowerMax = 5;
+		
+	//y axis
+	magGraph.ymin = -100;
+	magGraph.ymax = 10;
+	magGraph.yspan = 110;
+	magGraph.yShortTickMin = -100;
+	magGraph.yShortTickMax = 10;
+	magGraph.yShortTickStep = 5;
+	magGraph.yLongTickMin = -100;
+	magGraph.yLongTickMax = 10;
+	magGraph.yLongTickStep = 10;
+	magGraph.yLabelMin = -100;
+	magGraph.yLabelMax = 10;
+	magGraph.yLabelStep = 10;
+	magGraph.yGridMin = -100;
+	magGraph.yGridMax = 10;
+	magGraph.yGridStep = 10;
+	magGraph.x0 = magGraph.xPowerMin;
+	magGraph.y0 = magGraph.ymin;	
+	magGraph.hasxLog = true;
+	magGraph.hasxPowers = true;
+	magGraph.hasyLog = false;
+	magGraph.hasyPowers = false;
+}
+
+function setPhaseGraph()
+{
+	var lticks = 1;
+	var sticks = 0.5;
+	//x axis
+	phaseGraph.xText = "f (Hz)";
+	phaseGraph.yText = "Phase (degrees)";	
+	phaseGraph.xmin = -1;
+	phaseGraph.xmax = 5;
+	phaseGraph.xspan = 6;
+	phaseGraph.xPowerMin = -1;
+	phaseGraph.xPowerMax = 5;
+	
+	//y axis
+	phaseGraph.ymin = -100;
+	phaseGraph.ymax = 100;
+	phaseGraph.yspan = 200;
+	phaseGraph.yShortTickMin = -100;
+	phaseGraph.yShortTickMax = 100;
+	phaseGraph.yShortTickStep = 5;
+	phaseGraph.yLongTickMin = -100;
+	phaseGraph.yLongTickMax = 100;
+	phaseGraph.yLongTickStep = 10;
+	phaseGraph.yLabelMin = -100;
+	phaseGraph.yLabelMax = 100;
+	phaseGraph.yLabelStep = 10;
+	phaseGraph.yGridMin = -100;
+	phaseGraph.yGridMax = 100;
+	phaseGraph.yGridStep = 10;
+	phaseGraph.x0 = phaseGraph.xPowerMin;
+	phaseGraph.y0 = phaseGraph.ymin;	
+	phaseGraph.hasxLog = true;
+	phaseGraph.hasxPowers = true;
+	phaseGraph.hasyLog = false;
+	phaseGraph.hasyPowers = false;
+}
+	
+function generateBuffer()
+{
+	timeGraph.paintOn("buffer"); 
+	timeGraph.paint();
+	magGraph.paintOn("buffer"); 
+	magGraph.paint();
+	phaseGraph.paintOn("buffer"); 
+	phaseGraph.paint();
+}
+
+function draw()
+{	
+	//Paint buffer on canvas
+	timeGraph.paintBuffer();
+	
+	//Draw on canvas
+	timeGraph.paintOn("canvas"); //Draw on screen image
+	
+	if (vinChecked)	
+		timeGraph.drawArray(time, insig, Plotter.Color.lightblue);
+	if (vcChecked)
+		timeGraph.drawArray(time, csig, Plotter.Color.lightyellow);
+	if (vrChecked)
+		timeGraph.drawArray(time, rsig, Plotter.Color.lightgreen);
+		
+	magGraph.paintBuffer();
+	magGraph.paintOn("canvas");
+	if (vcChecked)
+		magGraph.drawArray(frequencies, cmag, Plotter.Color.lightyellow);
+	if (vrChecked)
+		magGraph.drawArray(frequencies, rmag, Plotter.Color.lightgreen);
+	
+	phaseGraph.paintBuffer();
+	phaseGraph.paintOn("canvas");
+	if (vcChecked)
+		phaseGraph.drawArray(frequencies, cphase, Plotter.Color.lightyellow);
+	if (vrChecked)
+		phaseGraph.drawArray(frequencies, rphase, Plotter.Color.lightgreen);	
+}
+
+function initSound()
+{
+	sp = new Sound.Player();
+	sp.soundStarted = function()
+	{
+		$('#playButton').prop('value', "Stop");
+	}	
+	
+	sp.soundStopped = function()
+	{
+		$('#playButton').prop('value', "Play");
+	}
+}		
+	
+function communSlide()
+{
+	if (labEnabled)
+	{
+		if (sp.isPlaying)
+			sp.stopTone();
+		calculateSignals();
+		draw();
+		diagram.paint();
+		fc = getfCutoff(r, c);
+		$("#fc").html("f<sub>C</sub> = " + fc.toFixed(0) + " Hz");
+	}	
+}		
+
+$(function()
+{
+	fc = getfCutoff(r, c);
+	$("#fc").html("f<sub>C</sub> = " + fc.toFixed(0) + " Hz");
+	$("#vinSlider").slider({value: vIn, min: 0, max: 5, step: 0.01,
+					slide: function(event, ui)
+					{
+						$("#vin").html("v<sub>IN</sub> = " + ui.value + " V");
+						vIn = ui.value;
+						VIn.value = vIn;
+						communSlide();
+					}
+				});
+	$("#vin").html("v<sub>IN</sub> = " + $("#vinSlider").slider("value") + " V");
+
+	$("#freqSlider").slider({value: freq, min: 100, max: 5000, step: 100,
+					slide: function(event, ui)
+					{
+						$("#freq").html("Frequency = " + ui.value + " Hz");
+						freq = ui.value;
+						communSlide();
+					}
+				});
+	$("#freq").html("Frequency = " + $("#freqSlider").slider("value") + " Hz");
+
+	$("#vbiasSlider").slider({value: vBias, min: -5, max: 5, step: 0.01,
+					slide: function(event, ui)
+					{
+						$("#vbias").html("V<sub>BIAS</sub> = " + ui.value + " V");
+						vBias = ui.value;
+						communSlide();
+					}
+				});
+	$("#vbias").html("V<sub>BIAS</sub> = " + $("#vbiasSlider").slider("value") + " V");
+
+	$("#rSlider").slider({value: 1, min: 0.1, max: 10, step: 0.01,
+					slide: function(event, ui)
+					{
+						//Values of slider are in Kilo Ohms
+						var val = getResistance(ui.value);
+						$(this).slider("value", val);
+						if (val >= 1.0) //kOhms
+						{
+							$("#r").html("R = " +  val + " k&Omega;");
+							R.value = val;
+							R.valueString.suffix = "k\u03A9";
+						}	
+						else
+						{
+							$("#r").html("R = " +  kiloToUnit(val) + " &Omega;");
+							R.value = kiloToUnit(val);
+							R.valueString.suffix = "\u03A9";  
+						}	
+						
+						r = kiloToUnit(val);
+						communSlide();
+						//return false; //Blocks keystrokes if enabled
+					}
+				});
+	$("#r").html("R = " + $("#rSlider").slider("value") + " k&Omega;");
+	
+	$("#vc0Slider").slider({value: vC0, min: 0, max: 5, step: 0.01,
+					slide: function(event, ui)
+					{
+						$("#vc0").html("v<sub>C</sub>(0) = " + ui.value + " V");
+						vC0 = ui.value;
+						communSlide();
+					}
+				});
+	$("#vc0").html("v<sub>C</sub>(0) = " + $("#vc0Slider").slider("value") + " V");
+
+	$("#cSlider").slider({value: 110, min: 0, max: 1000, step: 1,
+					slide: function(event, ui)
+					{
+						//Values of slider are in nano Farad
+						var val = getCapacitance(ui.value);
+						$(this).slider("value", val);
+						if (val >= 1000)
+						{
+							$("#c").html("C = " +  nanoToMicro(val) + " &mu;F");
+							C.value = nanoToMicro(val);
+							C.valueString.suffix = "\u03BCF";
+						}	
+						else
+						{
+							$("#c").html("C = " +  val + " nF");  
+							C.value = val;
+							C.valueString.suffix = "nF";
+						}	
+						
+						c = nanoToUnit(val);
+						communSlide();
+						//return false; //Blocks keystrokes if enabled
+					}
+				});
+	$("#c").html("C = " + $("#cSlider").slider("value") + " nF");
+	$("#vmaxSlider" ).slider({value: vMax, min: 1, max: 20, step: 0.1,
+					slide: function(event, ui)
+					{
+						$("#vmax").html("V<sub>MAX</sub> = " + ui.value + " V");
+						maxVolt = ui.value;
+						if (labEnabled)
+						{
+							if (sp.isPlaying)
+								sp.stopTone();
+							setTimeGraph();
+							generateBuffer();
+							calculateSignals();
+							draw();	
+						}	
+					}
+				});
+	$("#vmax").html("V<sub>MAX</sub> = " + $("#vmaxSlider").slider("value") + " V");
+});
+
+function getCheckboxesState()
+{
+	if($('#vinCheckbox').prop('checked')) 
+		vinChecked = true;
+	else
+		vinChecked = false;
+	if($('#vcCheckbox').prop('checked')) 
+		vcChecked = true;
+	else
+		vcChecked = false;
+	if($('#vrCheckbox').prop('checked')) 
+		vrChecked = true;
+	else
+		vrChecked = false;
+}
+
+function getRadioButtonsState()
+{
+	if($('#vinRadioButton').prop('checked')) 
+		sp.inSignal.listen = true;
+	else
+		sp.inSignal.listen = false;
+	if($('#vcRadioButton').prop('checked')) 
+		sp.outSignals[0].listen = true;
+	else
+		sp.outSignals[0].listen = false;
+	if($('#vrRadioButton').prop('checked')) 
+		sp.outSignals[1].listen = true;
+	else
+		sp.outSignals[1].listen = false;
+}
+
+function onSelectChange()
+{
+	if (labEnabled)
+	{
+		musicType = $("#musicTypeSelect").val();
+		sp.stopTone();
+		if (musicType == 0) //Zero Input
+		{
+			$("#vinSlider").slider( "option", "disabled", true);
+			$("#freqSlider").slider( "option", "disabled", true);
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}
+		else if (musicType == 1) //Unit Impulse
+		{
+			$("#vinSlider").slider( "option", "disabled", true);
+			$("#freqSlider").slider( "option", "disabled", true);	
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}
+		else if (musicType == 2) //Unit Step
+		{
+			$("#vinSlider").slider( "option", "disabled", true);
+			$("#freqSlider").slider( "option", "disabled", true);	
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}	
+		if (musicType == 3) //Sine Wave
+		{
+			$("#vinSlider").slider( "option", "disabled", false);
+			$("#freqSlider").slider( "option", "disabled", false);		
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}
+		else if (musicType == 4) //Square Wave
+		{
+			$("#vinSlider").slider( "option", "disabled", false);
+			$("#freqSlider").slider( "option", "disabled", false);		
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}		
+		else if (musicType == 5 || musicType == 6 || musicType == 7 || musicType == 8) //Music
+		{		
+			$("#vinSlider").slider( "option", "disabled", false);
+			$("#freqSlider").slider( "option", "disabled", true);		
+			maxTime = 20; //s
+			xLab = "t (s)";
+			
+			if (musicType == 5)
+				sp.load("classical.wav", musicLoaded);
+			else if (musicType == 6)
+				sp.load("folk.wav", musicLoaded);
+			else if (musicType == 7)
+				sp.load("jazz.wav", musicLoaded);
+			else
+				sp.load("reggae.wav", musicLoaded);
+		}	
+	}	
+}
+
+function tabSelected(event, ui)
+{
+	if (ui.index == 0)
+	{
+		 //Time, renable all sliders
+		$("#vinSlider").slider("option", "disabled", false);
+		$("#freqSlider").slider("option", "disabled", false);
+		$("#vbiasSlider").slider("option", "disabled", false);
+		$("#vc0Slider").slider("option", "disabled", false);
+		$("#vmaxSlider" ).slider("option", "disabled", false);
+		//And vinCheckbox
+		$('#vinCheckbox').attr("disabled", false);
+
+	}
+	else if (ui.index == 1 || ui.index == 2)
+	{
+		 //Magnitude or phase, disable elements that have no effect on graphs
+		$("#vinSlider").slider("option", "disabled", true);
+		$("#freqSlider").slider("option", "disabled", true);
+		$("#vbiasSlider").slider("option", "disabled", true);
+		$("#vc0Slider").slider("option", "disabled", true);
+		$("#vmaxSlider" ).slider("option", "disabled", true);
+		$('#vinCheckbox').attr("disabled", true);
+	}
+	
+}
+
+function musicLoaded()
+{
+	setTimeGraph();
+	generateBuffer();
+	calculateSignals();
+	draw();
+}	
+
+function checkboxClicked()
+{
+	if (labEnabled)
+	{
+		getCheckboxesState();
+		draw();
+	}	
+}
+
+function radioButtonClicked()
+{
+	if (labEnabled)
+	{
+		if (sp.isPlaying)
+			sp.stopTone();
+		getRadioButtonsState();
+	}	
+}
+
+function playButtonClicked()
+{
+	if (labEnabled)
+	{
+		if (sp.isPlaying)
+			sp.stopTone();
+		else
+			sp.playTone();
+	}	
+}
+
+//TO DO: PUT ALL THE FOLLOWING GLOBAL VARIABLES IN A NAMESPACE
+var labEnabled = true;
+//Graph
+var timeGraph, magGraph, phaseGraph;
+var maxTime = 10; //In ms
+var xLab = "t (ms)";
+var maxVolt = 2;
+var time;
+var insig, csig, rsig, frequencies, cmag, rmag, cphase, rphase;
+//Sound Player
+var sp;
+
+//Drop variable down for Type of Input
+var musicType = 3;
+//Checkboxes variables for Graph
+var vinChecked = true;
+var vcChecked = true;
+var vrChecked = false;
+//Slider variables
+var vIn = 3.0;
+var vInMax = 5.0;
+var freq = 1000;
+var vBias = 0.0;
+var r = kiloToUnit(1);
+var vC0 = 0.0;
+var c = nanoToUnit(110);
+var vMax = 2;
+var fc;
+
+function calculateSignals()
+{
+	if (musicType == 0 || musicType == 1 || musicType == 2 || musicType == 3) 
+	{	
+		sp.soundLength = 1;		
+		sp.sampleRate = 50000;
+	}
+	else if (musicType == 4)
+	{
+		sp.soundLength = 1;		
+		sp.sampleRate = 88200;
+	}
+	else if (musicType == 5 || musicType == 6 || musicType == 7 || musicType == 8) //Classical, Folk, Jazz, Reggae
+	{
+		sp.soundLength = 20;
+		sp.sampleRate = 22050;
+	} 
+
+	sp.createBuffers(2); //We have two outputs, first one is the voltage across capacitor C, the second across resistor R
+	getRadioButtonsState(); //Set what we are listening to, input, or one of the above
+	
+	if (musicType == 0) //Zero Input
+		sp.generateZero();
+	else if (musicType == 1) //Unit Impulse
+		sp.generateUnitImpulse();
+	else if (musicType == 2) //Unit Step
+		sp.generateUnitStep();
+	else if (musicType == 3) //Sine Wave
+		sp.generateSineWave(vIn, freq, vBias);	
+	else if (musicType == 4) //Square Wave
+		sp.generateSquareWave(vIn, freq, vBias);
+	else if (musicType == 5 || musicType == 6 || musicType == 7 || musicType == 8) //Classical, Folk, Jazz, Reggae
+	{
+		//TO DO: MOVE OUT		
+		var max = Number.NEGATIVE_INFINITY;
+		var amp = 0.0;
+			
+		//Find the max and normalize
+		for (var i = 0, l = sp.inSignal.data.length; i < l; i++)
+		{
+			amp = Math.abs(sp.audioData[i]);
+			if (amp > max)
+				max = amp;
+		}
+		max /= 0.5;
+		if (vBias != 0.0)
+		{
+			if (max != 0.0)
+			{	
+				for (var i = 0, l = sp.inSignal.data.length; i < l; i++)
+				{
+					sp.inSignal.data[i] = vBias + vIn*sp.audioData[i] / max;	
+				}
+			}
+			else //Fill in with vBias
+			{
+				for (var i = 0, l = sp.inSignal.data.length; i < l; i++)
+				{
+					sp.inSignal.data[i] = vBias;	
+				}
+			}
+		}
+		else
+		{
+			if (max != 0.0)
+			{	
+				for (var i = 0, l = sp.inSignal.data.length; i < l; i++)
+				{
+					sp.inSignal.data[i] = vIn*sp.audioData[i] / max;	
+				}
+			}
+			else //Fill in with zeros
+			{
+				for (var i = 0, l = sp.inSignal.data.length; i < l; i++)
+				{
+					sp.inSignal.data[i] = 0.0;	
+				}
+			}
+		}		
+	}
+	getVRVC(sp.inSignal.data, sp.outSignals[0].data, sp.outSignals[1].data, r, c, vC0, sp.sampleRate);
+      
+	time = [];
+	insig = [];
+	csig = [];
+	rsig = [];
+	frequencies = [];
+	cmag = [];
+	rmag = [];
+	cphase = [];
+	rphase = [];
+	var i = 0;
+	var ii;
+	var imult;
+	var imax;
+	var x = 0;
+	var xinc;
+	
+	//Scale of graph is 500 px
+	//All generated sound (sine wave etc.) except square wave have sampling rate of 50000 Hz, length 1s. We will plot the first 10 ms. That's 500 samples for 10 ms and 500 px
+	if (musicType == 0 || musicType == 1 || musicType == 2 || musicType == 3)
+	{
+		xinc = 10/500;
+		imax = 500;
+		imult = 1;
+	}
+	else if (musicType == 4) //At 50000 Hz, square wave plays very poorly, we use 88200 Hz
+	{
+		xinc = 10/882;
+		imax = 882;
+		imult = 1;
+	}
+	else if (musicType == 5 || musicType == 6 || musicType == 7 || musicType == 8) //All music files have a sampling rate 22050 Hz, length 20s. 20s/500px --> get value every 0.04 s ie every 882 samples.
+	{
+		xinc = 20/500;
+		imax = 500;		
+		imult = 882;	
+	}
+
+	while (i <= imax)
+	{
+		ii = imult*i;		
+		time[i] = x;
+		insig[i] = sp.inSignal.data[ii];
+		csig[i] = sp.outSignals[0].data[ii];
+		rsig[i] = sp.outSignals[1].data[ii];
+		x += xinc;
+		i++;	
+	}
+
+	sp.normalizeAllSounds();
+	
+	//Bode plots
+	fc = getfCutoff(r, c);
+	var df = magGraph.xspan / 500; //magGraph is 500 pix large
+	var fp = magGraph.xmin;
+	var f;
+		
+	//Scale of magGraph is 500 px
+	for (var i = 0; i <= 500; i++)
+	{
+		frequencies[i] = fp;
+		f = Math.pow(10, fp);
+		cmag[i] = getGainC_DB(f, fc);
+		rmag[i] = getGainR_DB(f, fc);
+		cphase[i] = getPhaseC(f, fc);
+		rphase[i] = getPhaseR(f, fc);
+		fp += df;
+	}
+}
+
+//Constants
+var TWO_PI = 2.0*Math.PI;
+var PI_DIV_2 = Math.PI/2.0;
+//var tau = R*C; //tau: Time constant
+
+var resistance = [0.1, 0.11, 0.12, 0.13, 0.15, 0.16, 0.18, 0.2, 0.22, 0.24, 0.27, 0.3, 0.33, 0.36, 0.39, 0.43, 0.47, 0.51, 0.56, 0.62, 0.68, 0.75, 0.82, 0.91, 1, 1.1, 1.2, 1.3, 1.50, 1.6, 1.8, 2, 2.2, 2.4, 2.7, 3, 3.3, 3.6, 3.9, 4.3, 4.7, 5.1, 5.6, 6.2, 6.8, 7.5, 8.2, 9.1, 10];
+
+var capacitance = [10, 11, 12, 13, 15, 16, 18, 20, 22, 24, 27, 30, 33, 36, 39, 43, 47, 51, 56, 62, 68, 75, 82, 91, 100, 110, 120, 130, 150, 160, 180, 200, 220, 240, 270, 300, 330, 360, 390, 430, 470, 510, 560, 620, 680, 750, 820, 910, 1000];
+
+function getResistance(value)
+{
+	var distance;
+	var minDistance = Number.POSITIVE_INFINITY;
+	var minIndex;
+   	
+   	for (var i = 0, l = resistance.length; i < l; i++)
+   	{
+		distance = Math.abs(value - resistance[i]);
+		if (distance < minDistance)
+		{
+			minDistance = distance;
+			minIndex = i;
+		}
+   	}
+	return resistance[minIndex];	
+}
+
+function getCapacitance(value)
+{
+	var distance;
+	var minDistance = Number.POSITIVE_INFINITY;
+	var minIndex;
+   	
+   	for (var i = 0, l = capacitance.length; i < l; i++)
+   	{
+		distance = Math.abs(value - capacitance[i]);
+		if (distance < minDistance)
+		{
+			minDistance = distance;
+			minIndex = i;
+		}
+   	}
+	return capacitance[minIndex];	
+}
+
+function unitToKilo(u)
+{
+	return u/1000;
+}
+
+function unitToMicro(u)
+{
+	return u*1000000;
+}
+
+function unitToNano(u)
+{
+	return u*1000000000;
+}
+
+function unitToPico(u)
+{
+	return u*1000000000000;
+}
+
+function kiloToUnit(k)
+{
+	return k*1000;
+}
+
+function microToUnit(m)
+{
+	return m/1000000;
+}
+
+function nanoToUnit(n)
+{
+	return n/1000000000;
+}
+
+function picoToUnit(p)
+{
+	return p/1000000000000;
+}
+
+function nanoToMicro(p)
+{
+	return p/1000;
+}		
+
+//vIN - vOut = RC dvOUT/dt
+//xi = vIN
+//yi = vOUT
+
+//yi = alpha*x[i] + (1 - alpha)y[i-1] with alpha = dt/(RC + dt). dt is the sampling period. 0 <= alpha <= 1 is the smoothing factor. Exponentially-weighted moving average
+
+function getVRVC(inData, outData, rData, R, C, VC0, sampleRate)
+{
+	var dt = 1.0 / sampleRate;
+	var alpha = dt/(R*C + dt);
+	
+	if (musicType != 1)
+	{
+		outData[0] = VC0;
+		rData[0] = inData[0] - outData[0]; 
+	}	
+	else //Unit Impulse
+	{
+		outData[0] =  inData[0];
+		rData[0] = -inData[0];
+	}	
+
+	for (var i = 1, l = outData.length; i < l; i++)
+	{
+		outData[i] = outData[i-1] + alpha * (inData[i] - outData[i-1]);
+		rData[i] = inData[i] - outData[i]; 
+	}
+}
+
+function getfCutoff(R, C)
+{
+	return 1.0/(TWO_PI*R*C);
+}
+
+function radToDeg(angle)
+{
+	return angle*180.0/Math.PI;
+}
+
+function degToRad(angle)
+{
+	return angle*Math.PI/180.0;
+}
+
+//db for voltages: 20*log(|gain|)
+
+//LOW PASS FILTER: vC
+//Complex Gain is 1/(1+j(f/fc)) 
+function getGainC(f, fc)
+{
+	var frac = f/fc;
+	return 1.0/Math.sqrt(1.0 + frac*frac);
+}
+
+function getGainC_DB(f, fc)
+{
+	var frac = f/fc;
+	return -20.0*Plotter.Utils.log10(Math.sqrt(1.0 + frac*frac));
+}
+
+function getPhaseC(f, fc)
+{
+	return radToDeg(-Math.atan2(f/fc, 1.0));
+}
+
+//HIGH PASS FILTER: vR
+//Complex Gain is j(f/fc)/(1+j(f/fc))
+function getGainR(f, fc)
+{
+	var frac = f/fc;
+	return frac/Math.sqrt(1.0 + frac*frac);
+}
+
+function getGainR_DB(f, fc)
+{
+	var frac = f/fc;
+	return 20.0*(Plotter.Utils.log10(frac) - Plotter.Utils.log10(Math.sqrt(1.0 + frac*frac)));
+}
+
+function getPhaseR(f, fc)
+{
+	return radToDeg(PI_DIV_2 - Math.atan2(f/fc, 1.0));
+}
diff --git a/common/test/data/full/static/js/sound_labs/series_rlc.js b/common/test/data/full/static/js/sound_labs/series_rlc.js
new file mode 100644
index 0000000000..a5e1b02e38
--- /dev/null
+++ b/common/test/data/full/static/js/sound_labs/series_rlc.js
@@ -0,0 +1,1150 @@
+$(document).ready(function()
+{
+	//The try catch block checks if canvas and audio libraries are present. If not, we exit and alert the user.
+	try
+	{
+		//Add corresponding listener to various UI elements		
+		$('#musicTypeSelect').change(onSelectChange);		
+		$('input:checkbox').click(checkboxClicked);
+		$('input:radio').click(radioButtonClicked);
+		$('#playButton').click(playButtonClicked);
+		initSound();
+		initDiagram();
+		initGraphs();
+		setTimeGraph();
+		setMagGraph();
+		setPhaseGraph();
+		generateBuffer();
+		calculateSignals();
+		draw();
+		labEnabled = true;
+		$("#graphTabs").tabs();
+		$("#graphTabs").bind("tabsselect", tabSelected);
+	}
+	catch(err)
+	{
+		labEnabled = false;
+		alert(err + " The tool is disabled.");
+	}	
+});
+
+function initGraphs()
+{
+	//Test if canvas is supported. If not, exit.
+	var testCanvas = document.createElement("canvas")
+	if (!testCanvas.getContext)
+		throw "Canvas element is not supported in this browser."
+	
+	//Time graph
+	//Get canvas
+	var timeCanvas = $('#time')[0];
+	//To disable text selection outside the canvas
+	timeCanvas.onselectstart = function(){return false;};
+	//Create an offscreen buffer
+	var timeBuffer = document.createElement('canvas');
+	timeBuffer.width = timeCanvas.width;
+	timeBuffer.height = timeCanvas.height;
+	timeGraph = new Plotter.Graph(50, 50, 400, 400, timeCanvas, timeBuffer);
+	
+	//Magnitude graph
+	//Get canvas
+	var magCanvas = $('#magnitude')[0];
+	//To disable text selection outside the canvas
+	magCanvas.onselectstart = function(){return false;};
+	//Create an offscreen buffer
+	var magBuffer = document.createElement('canvas');
+	magBuffer.width = magCanvas.width;
+	magBuffer.height = magCanvas.height;
+	magGraph = new Plotter.Graph(50, 50, 400, 400, magCanvas, magBuffer);
+	
+	//Phase graph
+	//Get canvas
+	var phaseCanvas = $('#phase')[0];
+	//To disable text selection outside the canvas
+	phaseCanvas.onselectstart = function(){return false;};
+	//Create an offscreen buffer
+	var phaseBuffer = document.createElement('canvas');
+	phaseBuffer.width = phaseCanvas.width;
+	phaseBuffer.height = phaseCanvas.height;
+	phaseGraph = new Plotter.Graph(50, 50, 400, 400, phaseCanvas, phaseBuffer);
+}
+
+var diagram, VIn, R, L, C;
+
+function initDiagram()
+{
+	//Test if canvas is supported. If not, exit.
+	var testCanvas = document.createElement("canvas")
+	if (!testCanvas.getContext)
+		throw "Canvas element is not supported in this browser."
+	
+	var element = $('#diag3');
+	diagram = new Circuit.Diagram(element, true);
+
+	//Lines
+	var wirev1 = diagram.addWire(100, 295, 100, 325);
+	var wirev2 = diagram.addWire(100, 140, 100, 170);
+	var wirev3 = diagram.addWire(380, 295, 380, 325);
+	var wirev4 = diagram.addWire(380, 140, 380, 170);
+	var wireh1 = diagram.addWire(100, 140, 115, 140);
+	var wireh2 = diagram.addWire(225, 140, 240, 140);
+	var wireh3 = diagram.addWire(350, 140, 365, 140);
+	var wireh4 = diagram.addWire(100, 355, 240, 355);
+		
+	var rLabel = diagram.addLabel(145, 75, "\u002B  v_{R}  \u2212", "left"); 
+	var lLabel = diagram.addLabel(275, 75, "\u002B  v_{L}  \u2212", "left"); 
+	var cLabelPlus = diagram.addLabel(305, 225, "\u002B", "left");
+	var cLabel = diagram.addLabel(305, 250, "v_{C}", "left");
+	var cLabelMinus = diagram.addLabel(305, 270, "\u2212", "left");
+	rLabel.color = Plotter.Color.lightgreen;
+	lLabel.color = Plotter.Color.lightmagenta;
+	cLabelPlus.color = Plotter.Color.lightyellow;
+	cLabel.color = Plotter.Color.lightyellow;
+	cLabelMinus.color = Plotter.Color.lightyellow;
+	
+	//Ground
+	var ground = diagram.addGround(240, 355);
+		
+	//Resistor
+	R = diagram.addResistor(130, 140, 1);
+	R.rotation = Math.PI/2;
+	R.label.str = "R";
+	R.valueString.suffix = "k\u03A9";
+	
+	//Inductor
+	L = diagram.addInductor(255, 140, 10);
+	L.rotation =  Math.PI/2;
+	L.label.str = "L";
+	L.valueString.suffix = "mH"
+			
+	//Capacitor
+	C = diagram.addCapacitor(380, 200, 110);
+	C.label.str = "C";
+	C.valueString.suffix = "nF";
+	
+	//Voltage source
+	VIn = diagram.addSource(100, 200, 3.0, "v");
+	VIn.label.str = "v_{IN}";
+	VIn.valueString.decimal = 2;
+	VIn.valueString.suffix = "V";
+	VIn.label.color = Plotter.Color.lightblue;
+	VIn.valueString.color = Plotter.Color.lightblue;
+	
+	//diagram.showGrid = true;
+	diagram.paint();
+}
+
+function setTimeGraph()
+{
+	var lticks = 1;
+	var sticks = 0.5;
+	//x axis
+	timeGraph.xText = xLab;
+	timeGraph.yText = "V_{MAX} (Volts)";	
+	timeGraph.xmin = 0;
+	timeGraph.xmax = maxTime;
+	timeGraph.xspan = maxTime;
+	timeGraph.xShortTickMin = 0;
+	timeGraph.xShortTickMax = maxTime;
+	timeGraph.xShortTickStep = maxTime/20;
+	timeGraph.xLongTickMin = 0;
+	timeGraph.xLongTickMax = maxTime;
+	timeGraph.xLongTickStep = maxTime/10;
+	timeGraph.xLabelMin = 0;
+	timeGraph.xLabelMax = maxTime;
+	timeGraph.xLabelStep = maxTime/10;
+	timeGraph.xGridMin = 0;
+	timeGraph.xGridMax = maxTime;
+	timeGraph.xGridStep = maxTime/10;
+	//y axis
+	timeGraph.ymin = -maxVolt;
+	timeGraph.ymax = maxVolt;
+	timeGraph.yspan = 2*maxVolt;
+	timeGraph.yShortTickMin = -maxVolt + (maxVolt % sticks);
+	timeGraph.yShortTickMax = maxVolt - (maxVolt % sticks);
+	timeGraph.yShortTickStep = sticks;
+	timeGraph.yLongTickMin = -maxVolt + (maxVolt % lticks);
+	timeGraph.yLongTickMax = maxVolt - (maxVolt % lticks);
+	timeGraph.yLongTickStep = lticks;
+	timeGraph.yLabelMin = -maxVolt + (maxVolt % lticks);
+	timeGraph.yLabelMax = maxVolt - (maxVolt % lticks);
+	timeGraph.yLabelStep = lticks;
+	timeGraph.yGridMin = -maxVolt + (maxVolt % lticks);
+	timeGraph.yGridMax = maxVolt - (maxVolt % lticks);
+	timeGraph.yGridStep = lticks;
+}
+
+function setMagGraph()
+{
+	var lticks = 1;
+	var sticks = 0.5;
+	//x axis
+	magGraph.xText = "f (Hz)";
+	magGraph.xPowerMin = -1;
+	magGraph.xPowerMax = 9;
+	magGraph.xspan = 10;
+		
+	//y axis
+	magGraph.yText = "Magnitude (dB)";
+	magGraph.ymin = -300;
+	magGraph.ymax = 40;
+	magGraph.yspan = 340;
+	magGraph.yShortTickMin = -300;
+	magGraph.yShortTickMax = 40;
+	magGraph.yShortTickStep = 10;
+	magGraph.yLongTickMin = -300;
+	magGraph.yLongTickMax = 40;
+	magGraph.yLongTickStep = 20;
+	magGraph.yLabelMin = -300;
+	magGraph.yLabelMax = 40;
+	magGraph.yLabelStep = 20;
+	magGraph.yGridMin = -300;
+	magGraph.yGridMax = 40;
+	magGraph.yGridStep = 20;
+	magGraph.x0 = magGraph.xPowerMin;
+	magGraph.y0 = magGraph.ymin;	
+	magGraph.hasxLog = true;
+	magGraph.hasxPowers = true;
+	magGraph.hasyLog = false;
+	magGraph.hasyPowers = false;
+	magGraph.yLabelDecimalDigits = 0;
+}
+
+function setPhaseGraph()
+{
+	var lticks = 1;
+	var sticks = 0.5;
+	//x axis
+	phaseGraph.xText = "f (Hz)";
+	phaseGraph.yText = "Phase (degrees)";	
+	phaseGraph.xmin = -1;
+	phaseGraph.xmax = 5;
+	phaseGraph.xspan = 6;
+	phaseGraph.xPowerMin = -1;
+	phaseGraph.xPowerMax = 5;
+	
+	//y axis
+	phaseGraph.ymin = -200;
+	phaseGraph.ymax = 200;
+	phaseGraph.yspan = 400;
+	phaseGraph.yShortTickMin = -180;
+	phaseGraph.yShortTickMax = 180;
+	phaseGraph.yShortTickStep = 10;
+	phaseGraph.yLongTickMin = -180;
+	phaseGraph.yLongTickMax = 180;
+	phaseGraph.yLongTickStep = 45;
+	phaseGraph.yLabelMin = -180;
+	phaseGraph.yLabelMax = 180;
+	phaseGraph.yLabelStep = 45;
+	phaseGraph.yGridMin = -180;
+	phaseGraph.yGridMax = 180;
+	phaseGraph.yGridStep = 10;
+	phaseGraph.x0 = phaseGraph.xPowerMin;
+	phaseGraph.y0 = phaseGraph.ymin;	
+	phaseGraph.hasxLog = true;
+	phaseGraph.hasxPowers = true;
+	phaseGraph.hasyLog = false;
+	phaseGraph.hasyPowers = false;
+	phaseGraph.yLabelDecimalDigits = 0;
+}	
+	
+function generateBuffer()
+{
+	timeGraph.paintOn("buffer"); 
+	timeGraph.paint();
+	magGraph.paintOn("buffer"); 
+	magGraph.paint();
+	phaseGraph.paintOn("buffer"); 
+	phaseGraph.paint();
+}
+
+function draw()
+{	
+	//Paint buffer on canvas
+	timeGraph.paintBuffer();
+	
+	//Draw on canvas
+	timeGraph.paintOn("canvas"); //Draw on screen image
+	
+	if (vinChecked)	
+		timeGraph.drawArray(time, insig, Plotter.Color.lightblue);
+	if (vrChecked)
+		timeGraph.drawArray(time, rsig, Plotter.Color.lightgreen);
+	if (vlChecked)
+		timeGraph.drawArray(time, lsig, Plotter.Color.lightmagenta);
+	if (vcChecked)
+		timeGraph.drawArray(time, csig, Plotter.Color.lightyellow);
+		
+			
+	magGraph.paintBuffer();
+	magGraph.paintOn("canvas");
+	if (vrChecked)
+		magGraph.drawArray(frequencies, rmag, Plotter.Color.lightgreen);
+	if (vlChecked)
+		magGraph.drawArray(frequencies, lmag, Plotter.Color.lightmagenta);
+	if (vcChecked)
+		magGraph.drawArray(frequencies, cmag, Plotter.Color.lightyellow);
+		
+	phaseGraph.paintBuffer();
+	phaseGraph.paintOn("canvas");
+	if (vrChecked)
+		phaseGraph.drawArray(frequencies, rphase, Plotter.Color.lightgreen);
+	if (vlChecked)
+		phaseGraph.drawArray(frequencies, lphase, Plotter.Color.lightmagenta);
+	if (vcChecked)
+		phaseGraph.drawArray(frequencies, cphase, Plotter.Color.lightyellow);
+}
+
+function initSound()
+{
+	sp = new Sound.Player();
+	sp.soundStarted = function()
+	{
+		$('#playButton').prop('value', "Stop");
+	}	
+	
+	sp.soundStopped = function()
+	{
+		$('#playButton').prop('value', "Play");
+	}
+}		
+	
+function communSlide()
+{
+	if (labEnabled)
+	{
+		if (sp.isPlaying)
+			sp.stopTone();
+		calculateSignals();
+		draw();
+		diagram.paint();
+		//fc = getfCutoff(r, c);
+		//$("#fc").html("f<sub>C</sub> = " + fc.toFixed(0) + " Hz");
+	}	
+}		
+
+$(function()
+{
+	//fc = getfCutoff(r, c);
+	//$("#fc").html("f<sub>C</sub> = " + fc.toFixed(0) + " Hz");
+	$("#vinSlider").slider({value: vIn, min: 0, max: 5, step: 0.01,
+					slide: function(event, ui)
+					{
+						$("#vin").html("v<sub>IN</sub> = " + ui.value + " V");
+						vIn = ui.value;
+						VIn.value = vIn;
+						VIn.valueString.decimal = -1; //Bug?????
+						communSlide();
+					}
+				});
+	$("#vin").html("v<sub>IN</sub> = " + $("#vinSlider").slider("value") + " V");
+
+	$("#freqSlider").slider({value: freq, min: 100, max: 5000, step: 100,
+					slide: function(event, ui)
+					{
+						$("#freq").html("Frequency = " + ui.value + " Hz");
+						freq = ui.value;
+						communSlide();
+					}
+				});
+	$("#freq").html("Frequency = " + $("#freqSlider").slider("value") + " Hz");
+
+	$("#vbiasSlider").slider({value: vBias, min: -5, max: 5, step: 0.01,
+					slide: function(event, ui)
+					{
+						$("#vbias").html("V<sub>BIAS</sub> = " + ui.value + " V");
+						vBias = ui.value;
+						communSlide();
+					}
+				});
+	$("#vbias").html("V<sub>BIAS</sub> = " + $("#vbiasSlider").slider("value") + " V");
+
+	$("#rSlider").slider({value: 10, min: 10, max: 1000, step: 1,
+					slide: function(event, ui)
+					{
+						//Values of slider are in Ohms
+						var val = getResistance(ui.value);
+						$(this).slider("value", val);
+						if (val >= 1000.0) //kOhms
+						{
+							$("#r").html("R = " +  unitToKilo(val) + " k&Omega;");
+							R.value = unitToKilo(val);
+							R.valueString.suffix = "k\u03A9";
+						}	
+						else
+						{
+							$("#r").html("R = " +  val + " &Omega;");
+							R.value = val;
+							R.valueString.suffix = "\u03A9";
+						}	
+						
+						r = val;
+						communSlide();
+						//return false; //Blocks keystrokes
+					}
+				});
+	$("#r").html("R = " + $("#rSlider").slider("value") + " &Omega;");
+	
+	$("#lSlider").slider({value: 10, min: 0, max: 1000, step: 1,
+					slide: function(event, ui)
+					{
+						//Values of slider are in milli Henry
+						var val = getInductance(ui.value);
+						$(this).slider("value", val);
+						if (val >= 1000.0) //H
+						{
+							$("#l").html("L = " +  milliToUnit(val) + " H"); 
+							L.value = milliToUnit(val);
+							L.valueString.suffix = "H";
+						}	
+						else
+						{
+							$("#l").html("L = " +  val + " mH");  
+							L.value = val;
+							L.valueString.suffix = "mH";
+						}	
+						
+						l = milliToUnit(val);
+						communSlide();
+					}
+				});
+	$("#l").html("L = " + $("#lSlider").slider("value") + " mH");
+	
+	$("#cSlider").slider({value: 10, min: 10, max: 1000, step: 1,
+					slide: function(event, ui)
+					{
+						//Values of slider are in micro Farad
+						var val = getCapacitance(ui.value);
+						$(this).slider("value", val);
+						if (val >= 1000)
+						{
+							$("#c").html("C = " +  val + " F");
+							C.value = microToUnit(val);
+							C.valueString.suffix = "F";
+						}	
+						else
+						{
+							$("#c").html("C = " +  val + " &mu;F");  
+							C.value = val;
+							C.valueString.suffix = "\u03BCF";
+						}	
+						
+						c = microToUnit(val);
+						communSlide();
+					}
+				});
+	$("#c").html("C = " + $("#cSlider").slider("value") + "  &mu;F");
+  $("#vc0Slider").slider({value: vC0, min: 0, max: 5, step: 0.01,
+					slide: function(event, ui)
+					{
+						$("#vc0").html("v<sub>C</sub>(0) = " + ui.value + " V");
+						vC0 = ui.value;
+						communSlide();
+					}
+				});
+	$("#vc0").html("v<sub>C</sub>(0) = " + $("#vc0Slider").slider("value") + " V");
+	$("#i0Slider").slider({value: i0, min: 0, max: 1, step: 0.01,
+					slide: function(event, ui)
+					{
+						$("#i0").html("i(0) = " + ui.value + " A");
+						i0 = ui.value;
+						communSlide();
+					}
+				});
+	$("#i0").html("i(0) = " + $("#i0Slider").slider("value") + " A");
+	$("#vmaxSlider" ).slider({value: vMax, min: 1, max: 20, step: 0.1,
+					slide: function(event, ui)
+					{
+						$("#vmax").html("V<sub>MAX</sub> = " + ui.value + " V");
+						maxVolt = ui.value;
+						if (labEnabled)
+						{
+							if (sp.isPlaying)
+								sp.stopTone();
+							setTimeGraph();
+							generateBuffer();
+							calculateSignals();
+							draw();	
+						}	
+					}
+				});
+	$("#vmax").html("V<sub>MAX</sub> = " + $("#vmaxSlider").slider("value") + " V");
+});
+
+function getCheckboxesState()
+{
+	if($('#vinCheckbox').prop('checked')) 
+		vinChecked = true;
+	else
+		vinChecked = false;
+	if($('#vrCheckbox').prop('checked')) 
+		vrChecked = true;
+	else
+		vrChecked = false;
+	if($('#vlCheckbox').prop('checked')) 
+		vlChecked = true;
+	else
+		vlChecked = false;
+	if($('#vcCheckbox').prop('checked')) 
+		vcChecked = true;
+	else
+		vcChecked = false;
+}
+
+function getRadioButtonsState()
+{
+	if($('#vinRadioButton').prop('checked')) 
+		sp.inSignal.listen = true;
+	else
+		sp.inSignal.listen = false;
+	if($('#vrRadioButton').prop('checked')) 
+		sp.outSignals[1].listen = true;
+	else
+		sp.outSignals[1].listen = false;
+	if($('#vlRadioButton').prop('checked')) 
+		sp.outSignals[2].listen = true;
+	else
+		sp.outSignals[2].listen = false;
+	if($('#vcRadioButton').prop('checked')) 
+		sp.outSignals[3].listen = true;
+	else
+		sp.outSignals[3].listen = false;	
+}
+
+function onSelectChange()
+{
+	if (labEnabled)
+	{
+		musicType = $("#musicTypeSelect").val();
+		sp.stopTone();
+		if (musicType == 0) //Zero Input
+		{
+			$("#vinSlider").slider( "option", "disabled", true);
+			$("#freqSlider").slider( "option", "disabled", true);
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}
+		else if (musicType == 1) //Unit Impulse
+		{
+			$("#vinSlider").slider( "option", "disabled", true);
+			$("#freqSlider").slider( "option", "disabled", true);	
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}
+		else if (musicType == 2) //Unit Step
+		{
+			$("#vinSlider").slider( "option", "disabled", true);
+			$("#freqSlider").slider( "option", "disabled", true);	
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}	
+		if (musicType == 3) //Sine Wave
+		{
+			$("#vinSlider").slider( "option", "disabled", false);
+			$("#freqSlider").slider( "option", "disabled", false);		
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}
+		else if (musicType == 4) //Square Wave
+		{
+			$("#vinSlider").slider( "option", "disabled", false);
+			$("#freqSlider").slider( "option", "disabled", false);		
+			maxTime = 10; //ms
+			xLab = "t (ms)";
+			musicLoaded();
+		}		
+		else if (musicType == 5 || musicType == 6 || musicType == 7 || musicType == 8) //Music
+		{		
+			$("#vinSlider").slider( "option", "disabled", false);
+			$("#freqSlider").slider( "option", "disabled", true);		
+			maxTime = 20; //s
+			xLab = "t (s)";
+			
+			if (musicType == 5)
+				sp.load("classical.wav", musicLoaded);
+			else if (musicType == 6)
+				sp.load("folk.wav", musicLoaded);
+			else if (musicType == 7)
+				sp.load("jazz.wav", musicLoaded);
+			else
+				sp.load("reggae.wav", musicLoaded);
+		}	
+	}	
+}
+
+function tabSelected(event, ui)
+{
+	if (ui.index == 0)
+	{
+		 //Time, renable all sliders
+		$("#vinSlider").slider("option", "disabled", false);
+		$("#freqSlider").slider("option", "disabled", false);
+		$("#vbiasSlider").slider("option", "disabled", false);
+		$("#vc0Slider").slider("option", "disabled", false);
+		$("#i0Slider").slider("option", "disabled", false);
+		$("#vmaxSlider" ).slider("option", "disabled", false);
+		//And vinCheckbox
+		$('#vinCheckbox').attr("disabled", false);
+
+	}
+	else if (ui.index == 1 || ui.index == 2)
+	{
+		 //Magnitude or phase, disable elements that have no effect on graphs
+		$("#vinSlider").slider("option", "disabled", true);
+		$("#freqSlider").slider("option", "disabled", true);
+		$("#vbiasSlider").slider("option", "disabled", true);
+		$("#vc0Slider").slider("option", "disabled", true);
+		$("#i0Slider").slider("option", "disabled", true);
+		$("#vmaxSlider" ).slider("option", "disabled", true);
+		$('#vinCheckbox').attr("disabled", true);
+	}
+}
+
+function musicLoaded()
+{
+	setTimeGraph();
+	generateBuffer();
+	calculateSignals();
+	draw();
+}	
+
+function checkboxClicked()
+{
+	if (labEnabled)
+	{
+		getCheckboxesState();
+		draw();
+	}	
+}
+
+function radioButtonClicked()
+{
+	if (labEnabled)
+	{
+		if (sp.isPlaying)
+			sp.stopTone();
+		getRadioButtonsState();
+	}	
+}
+
+function playButtonClicked()
+{
+	if (labEnabled)
+	{
+		if (sp.isPlaying)
+			sp.stopTone();
+		else
+			sp.playTone();
+	}	
+}
+
+//TO DO: PUT ALL THE FOLLOWING GLOBAL VARIABLES IN A NAMESPACE
+var labEnabled = true;
+//Graph
+var graph;
+var maxTime = 10; //In ms
+var xLab = "t (ms)";
+var maxVolt = 2;
+var time;
+var insig, rsig, lsig, csig, frequencies, rmag, lmag, cmag, rphase, lphase, cphase;
+
+//Sound Player
+var sp;
+
+//Drop variable down for Type of Input
+var musicType = 3;
+//Checkboxes variables for Graph
+var vinChecked = true, vrChecked = false, vlChecked = false, vcChecked = true;
+//Slider variables
+var vIn = 3.0;
+var vInMax = 5.0;
+var freq = 1000;
+var vBias = 0.0;
+var r = 10;
+var l = milliToUnit(10);
+var c = microToUnit(10);
+var vC0 = 0.0;
+var i0 = 0.0;
+var vMax = 2;
+var fc;
+
+function calculateSignals()
+{
+	if (musicType == 0 || musicType == 1 || musicType == 2 || musicType == 3) 
+	{	
+		sp.soundLength = 1;		
+		sp.sampleRate = 50000;
+	}
+	else if (musicType == 4)
+	{
+		sp.soundLength = 1;		
+		sp.sampleRate = 88200;
+	}
+	else if (musicType == 5 || musicType == 6 || musicType == 7 || musicType == 8) //Classical, Folk, Jazz, Reggae
+	{
+		sp.soundLength = 20;
+		sp.sampleRate = 22050;
+	} 
+
+	 //We have 4 outputs, 1: current, 2: vR, 3: vL, 4: vC
+	sp.createBuffers(4);
+	
+	if (musicType == 0) //Zero Input
+		sp.generateZero();
+	else if (musicType == 1) //Unit Impulse
+		sp.generateUnitImpulse();
+	else if (musicType == 2) //Unit Step
+		sp.generateUnitStep();
+	else if (musicType == 3) //Sine Wave
+		sp.generateSineWave(vIn, freq, vBias);	
+	else if (musicType == 4) //Square Wave
+		sp.generateSquareWave(vIn, freq, vBias);
+	else if (musicType == 5 || musicType == 6 || musicType == 7 || musicType == 8) //Classical, Folk, Jazz, Reggae
+	{
+		//TO DO: MOVE OUT		
+		var max = Number.NEGATIVE_INFINITY;
+		var amp = 0.0;
+			
+		//Find the max and normalize
+		for (var i = 0, len = sp.inSignal.data.length; i < len; i++)
+		{
+			amp = Math.abs(sp.audioData[i]);
+			if (amp > max)
+				max = amp;
+		}
+		max /= 0.5;
+		if (vBias != 0.0)
+		{
+			if (max != 0.0)
+			{	
+				for (var i = 0, len = sp.inSignal.data.length; i < len; i++)
+				{
+					sp.inSignal.data[i] = vBias + vIn*sp.audioData[i] / max;	
+				}
+			}
+			else //Fill in with vBias
+			{
+				for (var i = 0, len = sp.inSignal.data.length; i < len; i++)
+				{
+					sp.inSignal.data[i] = vBias;	
+				}
+			}
+		}
+		else
+		{
+			if (max != 0.0)
+			{	
+				for (var i = 0, len = sp.inSignal.data.length; i < len; i++)
+				{
+					sp.inSignal.data[i] = vIn*sp.audioData[i] / max;	
+				}
+			}
+			else //Fill in with zeros
+			{
+				for (var i = 0, len = sp.inSignal.data.length; i < len; i++)
+				{
+					sp.inSignal.data[i] = 0.0;	
+				}
+			}
+		}		
+	}
+	
+	getSeriesRLC(sp.inSignal.data, sp.outSignals[0].data, sp.outSignals[1].data, sp.outSignals[2].data, sp.outSignals[3].data, r, l, c, vC0, i0, sp.sampleRate);
+	
+	time = [];
+	insig = [];
+	rsig = [];
+	lsig = [];
+	csig = [];
+	frequencies = [];
+	rmag = [];
+	lmag = [];
+	cmag = [];
+	rphase = [];
+	lphase = [];
+	cphase = [];
+	
+	var i = 0;
+	var ii;
+	var imult;
+	var imax;
+	var x = 0;
+	var xinc;
+	
+	
+	//Scale of graph is 500 px
+	//All generated sound (sine wave etc.) except square wave have sampling rate of 50000 Hz, length 1s. We will plot the first 10 ms. That's 500 samples for 10 ms and 500 px
+	if (musicType == 0 || musicType == 1 || musicType == 2 || musicType == 3)
+	{
+		xinc = 10/500;
+		imax = 500;
+		imult = 1;
+	}
+	else if (musicType == 4) //At 50000 Hz, square wave plays very poorly, we use 88200 Hz
+	{
+		xinc = 10/882;
+		imax = 882;
+		imult = 1;
+	}
+	else if (musicType == 5 || musicType == 6 || musicType == 7 || musicType == 8) //All music files have a sampling rate 22050 Hz, length 20s. 20s/500px --> get value every 0.04 s ie every 882 samples.
+	{
+		xinc = 20/500;
+		imax = 500;		
+		imult = 882;	
+	}
+
+	while (i <= imax)
+	{
+		ii = imult*i;		
+		time[i] = x;
+		insig[i] = sp.inSignal.data[ii];
+		//MISSING I PLOT
+		rsig[i] = sp.outSignals[1].data[ii];
+		lsig[i] = sp.outSignals[2].data[ii];
+		csig[i] = sp.outSignals[3].data[ii];
+		
+		x += xinc;
+		i++;	
+	}
+
+	sp.normalizeAllSounds();
+	
+	//Bode plots
+	var df = magGraph.xspan / 500; //magGraph is 500 pix large
+	var fp = magGraph.xmin;
+	var f;
+	var w;
+		
+	//Scale of magGraph is 500 px
+	for (var i = 0; i <= 500; i++)
+	{
+		frequencies[i] = fp;
+		f = Math.pow(10, fp);
+		w = Plotter.Utils.TWO_PI*f;
+		rmag[i] = getGainR(w, r, l, c);
+		lmag[i] = getGainL(w, r, l, c);
+		cmag[i] = getGainC(w, r, l, c);
+		rphase[i] = getPhaseR(w, r, l, c);
+		lphase[i] = getPhaseL(w, r, l, c);
+		cphase[i] = getPhaseC(w, r, l, c);
+		fp += df;
+	}
+}
+
+var resistance = [10, 11, 12, 13, 15, 16, 18, 20, 22, 24, 27, 30, 33, 36, 39, 43, 47, 51, 56, 62, 68, 75, 82, 91, 100, 110, 120, 130, 150, 160, 180, 200, 220, 240, 270, 300, 330, 360, 390, 430, 470, 510, 560, 620, 680, 750, 820, 910, 1000];
+
+var inductance = [10, 11, 12, 13, 15, 16, 18, 20, 22, 24, 27, 30, 33, 36, 39, 43, 47, 51, 56, 62, 68, 75, 82, 87, 91, 100, 110, 120, 130, 150, 160, 180, 200, 220, 240, 270, 300, 330, 360, 390, 430, 470, 510, 560, 620, 680, 750, 820, 870, 910, 1000];  //Note: 87 and 870?
+
+var capacitance = [10, 11, 12, 13, 15, 16, 18, 20, 22, 24, 27, 30, 33, 36, 39, 43, 47, 51, 56, 62, 68, 75, 82, 91, 100, 110, 120, 130, 150, 160, 180, 200, 220, 240, 270, 300, 330, 360, 390, 430, 470, 510, 560, 620, 680, 750, 820, 910, 1000];
+
+function getResistance(value)
+{
+	var distance;
+	var minDistance = Number.POSITIVE_INFINITY;
+	var minIndex;
+   	
+  for (var i = 0, l = resistance.length; i < l; i++)
+  {
+		distance = Math.abs(value - resistance[i]);
+		if (distance < minDistance)
+		{
+			minDistance = distance;
+			minIndex = i;
+		}
+  }
+	return resistance[minIndex];	
+}
+
+function getInductance(value)
+{
+	var distance;
+	var minDistance = Number.POSITIVE_INFINITY;
+	var minIndex;
+   	
+  for (var i = 0, l = inductance.length; i < l; i++)
+  {
+		distance = Math.abs(value - inductance[i]);
+		if (distance < minDistance)
+		{
+			minDistance = distance;
+			minIndex = i;
+		}
+  }
+	return inductance[minIndex];	
+}
+
+function getCapacitance(value)
+{
+	var distance;
+	var minDistance = Number.POSITIVE_INFINITY;
+	var minIndex;
+   	
+  for (var i = 0, l = capacitance.length; i < l; i++)
+  {
+		distance = Math.abs(value - capacitance[i]);
+		if (distance < minDistance)
+		{
+			minDistance = distance;
+			minIndex = i;
+		}
+  }
+	return capacitance[minIndex];	
+}
+
+function radToDeg(angle)
+{
+	return angle*180.0/Math.PI;
+}
+
+function degToRad(angle)
+{
+	return angle*Math.PI/180.0;
+}
+
+function unitToKilo(u)
+{
+	return u/1000;
+}
+
+function unitToMilli(u)
+{
+	return u*1000;
+}
+
+function unitToMicro(u)
+{
+	return u*1000000;
+}
+
+function unitToNano(u)
+{
+	return u*1000000000;
+}
+
+function unitToPico(u)
+{
+	return u*1000000000000;
+}
+
+function kiloToUnit(k)
+{
+	return k*1000;
+}
+
+function milliToUnit(m)
+{
+	return m/1000;
+}
+
+function microToUnit(m)
+{
+	return m/1000000;
+}
+
+function nanoToUnit(n)
+{
+	return n/1000000000;
+}
+
+function picoToUnit(p)
+{
+	return p/1000000000000;
+}
+
+function nanoToMicro(p)
+{
+	return p/1000;
+}
+
+/*
+	Vin = RI + LdI/dt + Vout
+	I = CdVout/dt
+	
+	LCd^2Vout/dt^2 + RCdVout/dt + Vout = Vin
+	
+	leads to, for x[i] array of input, y[i] array out outputs:
+	
+	(dy/dt)[i] = (y[i+1] - y[i])/deltaT
+	(d^2y/dt^2)[i] = (y[i+2]-2y[i+1]+y[i])/(deltaT^2)
+	
+	LC(yi+2 - 2yi+1 + yi)/dt^2 + RC(yi+1 - yi)/dt + yi = xi
+	
+	yi+2 = (2.0*yi+1 - yi) - (R/L)(y[i+1]-y[i])dt + (1/LC)(x[i] - y[i])dt^2;
+	
+	xi = Vin(0)
+	yi = Vc(0)
+	yi+1 = yi + dtI(0)/C
+	
+	beta = [dt*dt - RCdt + LC]/C(Rdt-2L)
+*/
+
+/*NECESSARY?
+if (musicType != 1)
+	{
+		outData[0] = VC0;
+		rData[0] = inData[0] - outData[0]; 
+	}	
+	else //Unit Impulse
+	{
+		outData[0] =  inData[0];
+		rData[0] = -inData[0];
+	}
+*/
+/*
+function getVR(x, y)
+{
+	for (var i = 0, l = y.length; i < l; i++)
+	{
+		y[i] = x[i];
+	}
+}
+
+function getVL(x, y)
+{
+	for (var i = 0, l = y.length; i < l; i++)
+	{
+		y[i] = x[i];
+	}
+}
+
+function getVC(x, y, R, L, C, VC0, I0, sampleRate)
+{
+	var dt = 1.0 / sampleRate;
+	var A1 = dt*R/L;
+	var A2 = dt*dt/(L*C);
+		
+	y[0] = VC0;
+	y[1] = y[0] + dt*I0/C;
+	
+	for (var i = 2, l = y.length; i < l; i++)
+	{
+		y[i+2] = (2.0*y[i+1] - y[i]) - A1*(y[i+1]-y[i]) + A2*(x[i] - y[i]);
+	}
+}
+*/
+//###########################################################################
+/*
+vR + vL + vC = vIn
+Ldi/dt + Ri + q/C = vIn
+
+System of ODE, use improved Euler method.
+i = q'
+i' = (1/L)(vIn - Ri - q/C)
+
+Initial conditions given by vC(0) and i0
+
+Then 
+q0 = C vC(0)
+i0
+i'0 = (1/L)(vIn - Ri0 - q0/C)
+
+qnew = qold + q'old dt = qold + i'olddt
+inew = iold + i'old dt
+i'new = (1/L)(vIn(n) - Rinew - qnew/C)
+
+qnew = qold + (q'old + q'new)dt/2 = qold + (iold + inew)dt/2
+inew = iold + (i'old + i'new)dt/2
+i'new = (1/L)(vIn(n) - Rinew - qnew/C) 
+*/
+
+function getSeriesRLC(x, yi, yr, yl, yc, R, L, C, VC0, I0, sampleRate) //x input, yi, yr, yl, yc outputs
+{
+	var dt = 1.0/sampleRate;
+	var dtdiv2 = dt/2.0;
+	var cte = 1.0/L;
+	var qold = C*VC0;
+	var qnew;
+	var iold = I0;
+	var inew;
+	var diold = cte*(x[0] - R*iold - qold/C);
+	var dinew;
+	//Fill out our initial conditions on all 4 outputs
+	yc[0] = qold/C;
+	yi[0] = iold;
+	yr[0] = R*iold;
+	yl[0] = L*diold;
+	 
+	for (var k = 1, l = x.length; k < l; k++)
+	{
+		qnew = qold + iold*dt;
+	  inew = iold + diold*dt;
+	  dinew = cte*(x[k] - R*inew - qnew/C);
+	  //Improved Euler method follows
+	  qnew = qold + (iold + inew)*dtdiv2;
+		inew = iold + (diold + dinew)*dtdiv2;
+		dinew = cte*(x[k] - R*inew - qnew/C); 
+	  //Got all we need, fill up our 4 outputs
+	  yc[k] = qnew/C;
+		yi[k] = inew;
+		yr[k] = R*inew;
+		yl[k] = L*dinew;
+		
+		qold = qnew;
+		iold = inew;
+		diold = dinew;
+	}
+}	
+	
+function radToDeg(angle)
+{
+	return angle*180.0/Math.PI;
+}
+
+function degToRad(angle)
+{
+	return angle*Math.PI/180.0;
+}
+
+//db for voltages: 20*log(|gain|)
+
+//Gain and phase for vR
+//Complex Gain is R/(R +j(Lw - 1/(Cw)))
+function getGainR(w, R, L, C)
+{
+	var re = R;
+	var im = L*w - 1.0/(C*w);
+	return 20.0*(Plotter.Utils.log10(R) - Plotter.Utils.log10(Math.sqrt(re*re + im*im)));
+}
+
+function getPhaseR(w, R, L, C)
+{
+	var re = R;
+	var im = L*w - 1.0/(C*w);
+	return radToDeg(-Math.atan2(im, re));
+}
+
+//Gain and phase for vL
+//Complex Gain is jLw/(R +j(Lw - 1/(Cw)))
+function getGainL(w, R, L, C)
+{
+	var re = R;
+	var im = L*w - 1.0/(C*w);
+	return 20.0*(Plotter.Utils.log10(L*w) - Plotter.Utils.log10(Math.sqrt(re*re + im*im)));
+}
+
+function getPhaseL(w, R, L, C)
+{
+	var re = R;
+	var im = L*w - 1.0/(C*w);
+	return radToDeg(Plotter.Utils.PI_DIV_2 - Math.atan2(im, re));
+}
+
+//Gain and phase for vC
+//Complex Gain is (-j/Cw)/(R +j(Lw - 1/(Cw)))
+function getGainC(w, R, L, C)
+{
+	var re = R;
+	var im = L*w - 1.0/(C*w);
+	return 20.0*(-Plotter.Utils.log10(C*w) - Plotter.Utils.log10(Math.sqrt(re*re + im*im)));
+}
+
+function getPhaseC(w, R, L, C)
+{
+	var re = R;
+	var im = L*w - 1.0/(C*w);
+	return radToDeg(-Plotter.Utils.PI_DIV_2 - Math.atan2(im, re));
+}	
diff --git a/common/test/data/full/static/js/sound_labs/sound.js b/common/test/data/full/static/js/sound_labs/sound.js
new file mode 100644
index 0000000000..a3bca38092
--- /dev/null
+++ b/common/test/data/full/static/js/sound_labs/sound.js
@@ -0,0 +1,407 @@
+var Sound = (function() {
+
+	//////////PRIVATE FIELDS AND METHODS//////////
+	var TWO_PI = 2.0*Math.PI;
+	var PI_DIV_2 = Math.PI/2.0;
+	
+	function Player()
+	{
+		this.isChrome = false;
+		this.isMoz = false;
+		this.audioChrome;
+		this.audioMoz;
+		this.dir = "/static/courses/6002/sounds/";
+		this.inSignal;
+		this.outSignals = [];
+		this.numberChannels = 1;
+		this.soundLength = 1; //In seconds
+		this.sampleRate = 44100; //In Hertz
+		this.numberSamples = 44100;
+		this.isPlaying = false;
+		this.chromeTimer;
+		this.mozTimer;
+		this.audioData ;
+		this.playAudio;
+		this.outSrc;
+
+		//Test for Web Audio API --> Webkit browsers ie Chrome & Safari	
+		//https://dvcs.w3.org/hg/audio/raw-file/tip/webaudio/specification.html
+		if (!!window.webkitAudioContext)
+		{
+			this.audioChrome = new webkitAudioContext();
+			this.isChrome = true;
+		}
+		//Test for Audio Data API --> Firefox 4 and ulterior
+		//https://wiki.mozilla.org/Audio_Data_API
+		else if (!!new Audio().mozSetup)
+		{
+			this.audioMoz = new Audio();
+			this.isMoz = true;
+		}
+		else //Sound libraries are not supported, exit.
+			throw "Neither Web Audio API nor Audio Data API is supported in this browser.";
+
+		//To be overriden	
+		this.soundStarted = function()
+		{
+		}	
+	
+		this.soundStopped = function()
+		{
+		}
+	
+		this.load = function(url, callback)
+		{
+			var request;
+			var file =  this.dir + url;
+			var self = this;
+			request = new XMLHttpRequest();
+  			request.open('GET', file, true); //Asynchronous
+  			request.responseType = 'arraybuffer';
+  	
+			request.onload = function()
+			{
+				var arrayBuffer = request.response;
+   			if (arrayBuffer)
+				{ 
+					var audioDataTmp = new Int16Array(arrayBuffer, 44);
+					self.audioData = new Float32Array(audioDataTmp);
+					//The music has been loaded, continue execution
+					callback();
+				}
+  		}
+			request.send();
+		}        
+
+		this.getAudioHeader = function(audioHeaderData)
+		{
+			//44 first bytes of file are the header
+			return {					                               // OFFS SIZE NOTES
+					chunkId      : bytesToStr(audioHeaderData, 0, 4),  // 0    4    "RIFF" = 0x52494646
+    				chunkSize    : bytesToNum(audioHeaderData, 4, 4),  // 4    4    36+SubChunk2Size = 4+(8+SubChunk1Size)+(8+SubChunk2Size)
+    				format       : bytesToStr(audioHeaderData, 8, 4),  // 8    4    "WAVE" = 0x57415645
+    				subChunk1Id  : bytesToStr(audioHeaderData, 12, 4), // 12   4    "fmt " = 0x666d7420
+    				subChunk1Size: bytesToNum(audioHeaderData, 16, 4), // 16   4    16 for PCM
+    				audioFormat  : bytesToNum(audioHeaderData, 20, 2), // 20   2    PCM = 1
+    				numChannels  : bytesToNum(audioHeaderData, 22, 2), // 22   2    Mono = 1, Stereo = 2, etc.
+    				sampleRate   : bytesToNum(audioHeaderData, 24, 4), // 24   4    8000, 44100, etc
+    				byteRate     : bytesToNum(audioHeaderData, 28, 4), // 28   4    SampleRate*NumChannels*BitsPerSample/8
+    				blockAlign   : bytesToNum(audioHeaderData, 32, 2), // 32   2    NumChannels*BitsPerSample/8
+    				bitsPerSample: bytesToNum(audioHeaderData, 34, 2), // 34   2    8 bits = 8, 16 bits = 16, etc...
+    				subChunk2Id  : bytesToStr(audioHeaderData, 36, 4), // 36   4    "data" = 0x64617461
+    				subChunk2Size: bytesToNum(audioHeaderData, 40, 4)  // 40   4    data size = NumSamples*NumChannels*BitsPerSample/8
+			};	
+		}
+
+		this.bytesToStr = function(arr, offset, len)
+		{
+			var result = "";
+			var l = 0;
+			var i = offset;	
+	
+			while (l < len)
+			{
+				result += String.fromCharCode(arr[i]);
+				i++;
+				l++;
+			}
+
+			return result;
+		}
+
+		//Bytes are stored as little endians
+		this.bytesToNum = function(arr, offset, len)
+		{
+			var result = 0;
+			var l = 0;;
+			var i = offset + len - 1;
+			var hexstr = "0x";
+			var tmpstr;
+	 
+			while (l < len)
+			{
+				if (arr[i] >= 0  && arr[i] <= 15) 
+					tmpstr = "0" + arr[i].toString(16);
+				else
+					tmpstr = arr[i].toString(16);
+   
+				hexstr += tmpstr;
+				i--;
+				l++;
+			}
+	
+			return parseInt(hexstr, 16);
+		}
+
+		this.createBuffers = function(nOut)
+		{
+			this.numberSamples = this.sampleRate*this.soundLength;
+					
+			if (this.isChrome)
+			{	
+				var b, d;
+				
+				b = this.audioChrome.createBuffer(this.numberChannels, this.numberSamples, this.sampleRate);
+				d = b.getChannelData(0); //Float32Array
+				this.inSignal = {buffer: b, data: d, listen: true};
+				
+				for (var i = 0; i < nOut; i++)
+				{
+					
+					b = this.audioChrome.createBuffer(this.numberChannels, this.numberSamples, this.sampleRate);
+					d = b.getChannelData(0); //Float32Array
+					this.outSignals[i] = {buffer: b, data: d, listen: false};
+				}
+			}
+			else if (this.isMoz)
+			{
+				this.inSignal = {data: new Float32Array(this.numberSamples), listen: true};
+				for (var i = 0; i < nOut; i++)
+				{
+					this.outSignals[i] = {data: new Float32Array(this.numberSamples), listen: false};
+				}
+				this.audioMoz.mozSetup(this.numberChannels, this.sampleRate);
+			}
+		}
+
+		this.generateZero = function()
+		{
+			for (var i = 0, l = this.inSignal.data.length; i < l; i++)
+			{
+				this.inSignal.data[i] = 0;
+			}
+		}
+
+		this.generateUnitImpulse = function()
+		{
+			this.inSignal.data[0] = 1000;		
+			for (var i = 1, l = this.inSignal.data.length; i < l; i++)
+			{
+				this.inSignal.data[i] = 0.0;
+			}
+		}
+
+		this.generateUnitStep = function()
+		{
+			for (var i = 0, l = this.inSignal.data.length; i < l; i++)
+			{
+				this.inSignal.data[i] = 1.0;
+			}
+		}
+
+		this.generateSineWave = function(peakToPeak, frequency, vOffset)
+		{
+			var amp = 0.5*peakToPeak;
+			
+			if (vOffset != 0)
+			{		
+				for (var i = 0, l = this.inSignal.data.length; i < l; i++)
+				{
+					this.inSignal.data[i] = amp * Math.sin(TWO_PI*frequency*i/this.sampleRate) + vOffset;
+				}
+			}
+			else
+			{
+				for (var i = 0, l = this.inSignal.data.length; i < l; i++)
+				{
+					this.inSignal.data[i] = amp * Math.sin(TWO_PI*frequency*i/this.sampleRate);
+				}
+			}		
+		}
+	
+		this.generateSquareWave = function(peakToPeak, frequency, vOffset)
+		{
+			var amp = 0.5*peakToPeak;		
+			var period = 1/frequency;
+			var halfPeriod = period/2;
+			var itmp, sgn;
+		
+			
+			if (vOffset != 0)
+			{
+				for (var i = 0, l = this.inSignal.data.length; i < l; i++)
+				{
+					itmp = (i/this.sampleRate) % period;
+					if (itmp < halfPeriod)
+						sgn = sgn = 1;
+					else
+						sgn = -1;
+					this.inSignal.data[i] = amp * sgn + vOffset;
+				}
+			}
+			else
+			{
+				for (var i = 0, l = this.inSignal.data.length; i < l; i++)
+				{
+					itmp = (i/this.sampleRate) % period;
+					if (itmp < halfPeriod)
+						sgn = sgn = 1;
+					else
+						sgn = -1;
+					this.inSignal.data[i] = amp * sgn;
+				}
+			}	
+		}
+
+		this.normalizeSound = function(arr)
+		{
+			var min = Number.POSITIVE_INFINITY;
+			var max = Number.NEGATIVE_INFINITY;
+			var vInMaxLocal = 10.0;
+			var maxVol = 1/vInMaxLocal;
+					
+			//Find the min and max
+			for (var i = 0, l = arr.length; i < l; i++)
+			{
+				if (arr[i] > max)
+					max = arr[i];
+				if (arr[i] < min)
+					min = arr[i];
+			}
+	
+			var vPeakToPeak = Math.abs(max - min);
+			var maxVol = vPeakToPeak / vInMaxLocal;  //If we have a peak to peak voltage of 10 V, we want max sound, normalize to [-1, 1]
+			var norm = Math.max(Math.abs(min), Math.abs(max));
+	
+			if (max != 0.0)		
+			{
+				for (var i = 0, l = arr.length; i < l; i++)
+				{
+					arr[i] = maxVol*arr[i] / norm;	
+				}
+			}
+			else  //Fill in with zeros
+			{
+				for (var i = 0, l = arr.length; i < l; i++)
+				{
+					arr[i] = 0.0;	
+				}
+			}
+		}
+
+		this.normalizeAllSounds = function()
+		{
+			//Normalize the sound buffer that will be heard		
+			this.normalizeSound(this.inSignal.data);
+			for (var i = 0; i < this.outSignals.length; i++)
+			{
+				this.normalizeSound(this.outSignals[i].data);
+			}		
+		}
+
+		this.playTone = function()
+		{
+			this.soundStarted();		
+			var self = this;		
+			if (this.isChrome)
+			{	
+				this.outSrc = this.audioChrome.createBufferSource();
+
+				if (this.inSignal.listen)
+					this.outSrc.buffer = this.inSignal.buffer;
+				else
+				{
+					for (var i = 0; i < this.outSignals.length; i++)
+					{
+						if (this.outSignals[i].listen)	
+							this.outSrc.buffer = this.outSignals[i].buffer;
+					}		
+				}				
+  				
+				this.outSrc.connect(this.audioChrome.destination);
+				this.outSrc.noteOn(0);
+				this.isPlaying = true;
+				this.chromeTimer = setTimeout(function(){
+					self.isPlaying = false;
+					self.soundStopped();
+				}, this.outSrc.buffer.duration * 1000);
+		
+			}
+			else if (this.isMoz)
+			{
+				var playedAudioData;
+				var currentWritePosition = 0;
+				var currentPlayPosition = 0;
+				var prebufferSize = 22050 / 2; // buffer 500ms
+				var tail = null;
+								
+				if (this.inSignal.listen)
+					playedAudioData = this.inSignal.data;
+				else
+				{
+					for (var i = 0; i < this.outSignals.length; i++)
+					{
+						if (this.outSignals[i].listen)	
+							playedAudioData = this.outSignals[i].data;
+					}
+				}
+
+				this.isPlaying = true;
+				
+				// The function called with regular interval to populate the audio output buffer.		
+				this.playAudio = setInterval(function()
+				{
+					var written;					
+					currentPlayPosition = self.audioMoz.mozCurrentSampleOffset();
+					
+					// Check if some data was not written in previous attempts.
+					if (tail)
+					{
+						written = self.audioMoz.mozWriteAudio(tail);
+						currentWritePosition += written;
+						if (written < tail.length)
+						{
+							// Not all the data was written, saving the tail...
+            	tail = tail.subarray(written); 
+							return; //... and exit the function.
+						}
+						tail = null;
+					}
+
+					// Check if we need add some data to the audio output
+					var available = Math.floor(currentPlayPosition + prebufferSize - currentWritePosition);
+					if (available > 0)
+					{
+						var data = playedAudioData.subarray(currentWritePosition); 
+						// Writting the data
+						written = self.audioMoz.mozWriteAudio(data);
+						// Not all the data was written, saving the tail
+						if(written <= data.length)
+							tail = data.subarray(written);
+						currentWritePosition += written;
+					}
+				}, 100);
+				
+				this.mozTimer = setTimeout(function(){
+		  		clearInterval(self.playAudio);
+					self.isPlaying = false;
+					self.soundStopped();
+				}, this.soundLength*1000);	
+			}
+		}
+
+		this.stopTone = function()
+		{
+			if (this.isPlaying)
+			{	
+				if (this.isChrome)
+				{
+					clearTimeout(this.chromeTimer);
+					this.outSrc.noteOff(0);
+				}	
+				else if (this.isMoz)
+				{
+					clearTimeout(this.mozTimer);
+					clearInterval(this.playAudio);
+				}
+				this.isPlaying = false;
+			}
+			this.soundStopped();
+		}
+	}
+	
+	//////////PUBLIC FIELDS AND METHODS//////////
+	return {
+		Player: Player
+	};
+}());
diff --git a/common/test/data/full/subs/3NIegrCmA5k.srt.sjson b/common/test/data/full/subs/3NIegrCmA5k.srt.sjson
new file mode 100644
index 0000000000..bc505bb0d1
--- /dev/null
+++ b/common/test/data/full/subs/3NIegrCmA5k.srt.sjson
@@ -0,0 +1,5 @@
+{
+  "start": [], 
+  "end": [], 
+  "text": []
+}
\ No newline at end of file
diff --git a/common/test/data/full/subs/4cLA-IME32w.srt.sjson b/common/test/data/full/subs/4cLA-IME32w.srt.sjson
new file mode 100644
index 0000000000..bc505bb0d1
--- /dev/null
+++ b/common/test/data/full/subs/4cLA-IME32w.srt.sjson
@@ -0,0 +1,5 @@
+{
+  "start": [], 
+  "end": [], 
+  "text": []
+}
\ No newline at end of file
diff --git a/common/test/data/full/subs/8kARlsUt9lM.srt.sjson b/common/test/data/full/subs/8kARlsUt9lM.srt.sjson
new file mode 100644
index 0000000000..bc505bb0d1
--- /dev/null
+++ b/common/test/data/full/subs/8kARlsUt9lM.srt.sjson
@@ -0,0 +1,5 @@
+{
+  "start": [], 
+  "end": [], 
+  "text": []
+}
\ No newline at end of file
diff --git a/common/test/data/full/subs/8rK9vnpystQ.srt.sjson b/common/test/data/full/subs/8rK9vnpystQ.srt.sjson
new file mode 100644
index 0000000000..bc505bb0d1
--- /dev/null
+++ b/common/test/data/full/subs/8rK9vnpystQ.srt.sjson
@@ -0,0 +1,5 @@
+{
+  "start": [], 
+  "end": [], 
+  "text": []
+}
\ No newline at end of file
diff --git a/common/test/data/full/subs/BGU1poJDgOY.srt.sjson b/common/test/data/full/subs/BGU1poJDgOY.srt.sjson
new file mode 100644
index 0000000000..1039ea92c6
--- /dev/null
+++ b/common/test/data/full/subs/BGU1poJDgOY.srt.sjson
@@ -0,0 +1,275 @@
+{
+  "start": [
+    0, 
+    410, 
+    2390, 
+    5510, 
+    7110, 
+    10400, 
+    13120, 
+    15150, 
+    18850, 
+    20800, 
+    25570, 
+    27950, 
+    32870, 
+    36560, 
+    38920, 
+    40850, 
+    43130, 
+    46690, 
+    48640, 
+    50910, 
+    54260, 
+    56872, 
+    59590, 
+    63370, 
+    66290, 
+    68000, 
+    71320, 
+    74130, 
+    77880, 
+    80860, 
+    81900, 
+    85380, 
+    89890, 
+    93550, 
+    97980, 
+    100960, 
+    104010, 
+    105450, 
+    107320, 
+    110600, 
+    114310, 
+    116940, 
+    118800, 
+    122550, 
+    124950, 
+    127000, 
+    129479, 
+    131740, 
+    133570, 
+    137170, 
+    141410, 
+    143740, 
+    146820, 
+    148870, 
+    152620, 
+    157640, 
+    162970, 
+    164060, 
+    167630, 
+    168680, 
+    171890, 
+    173700, 
+    177560, 
+    181850, 
+    185390, 
+    189290, 
+    191550, 
+    196470, 
+    197780, 
+    202150, 
+    204550, 
+    208200, 
+    210910, 
+    213870, 
+    218830, 
+    222090, 
+    225070, 
+    229290, 
+    233580, 
+    236700, 
+    239510, 
+    242110, 
+    243770, 
+    246990, 
+    247950, 
+    251740, 
+    255340, 
+    256500, 
+    258759
+  ], 
+  "end": [
+    410, 
+    2390, 
+    5510, 
+    7109, 
+    10400, 
+    13120, 
+    15149, 
+    18850, 
+    20800, 
+    25570, 
+    27950, 
+    32870, 
+    36559, 
+    38920, 
+    40850, 
+    43130, 
+    46690, 
+    48640, 
+    50910, 
+    54260, 
+    56872, 
+    59590, 
+    63370, 
+    66289, 
+    68000, 
+    71320, 
+    74130, 
+    77880, 
+    80860, 
+    81900, 
+    85380, 
+    89890, 
+    93550, 
+    97979, 
+    100960, 
+    104009, 
+    105450, 
+    107320, 
+    110600, 
+    114309, 
+    116940, 
+    118800, 
+    122550, 
+    124950, 
+    127000, 
+    129479, 
+    131740, 
+    133570, 
+    137170, 
+    141410, 
+    143740, 
+    146820, 
+    148870, 
+    152620, 
+    157640, 
+    162970, 
+    164060, 
+    167630, 
+    168680, 
+    171890, 
+    173700, 
+    177560, 
+    181850, 
+    185390, 
+    189290, 
+    191549, 
+    196470, 
+    197780, 
+    202150, 
+    204550, 
+    208200, 
+    210910, 
+    213870, 
+    218830, 
+    222090, 
+    225070, 
+    229290, 
+    233579, 
+    236700, 
+    239510, 
+    242109, 
+    243770, 
+    246990, 
+    247950, 
+    251739, 
+    255340, 
+    256500, 
+    258759, 
+    260009
+  ], 
+  "text": [
+    null, 
+    "Let us summarize what we&#39;ve\nlearned so far.", 
+    "So we started out with building\nthis playground, this", 
+    "EECS playground.", 
+    "And within this playground,\nwe&#39;ve all decided that we will", 
+    "abide by the lumped matter\ndiscipline, the LMD.", 
+    "And these are simply constraints\nthat we impose", 
+    "upon ourselves to simplify\nour analysis.", 
+    "Notice that, you really\ndon&#39;t have to do that.", 
+    "You are welcome to hang out here\nand do whatever you want.", 
+    "But you might have a\nlot of fun as well.", 
+    "But, you will not be able to\nbuild things as simply as you", 
+    "would if you were inside\nthe EECS playground.", 
+    "But, Within this playground\nyou have promised that you", 
+    "will follow the lumped\nmatter discipline.", 
+    "Lumped matter discipline has\nthree components to it.", 
+    "One is that the elements will\nhave del phi b by del t equals", 
+    "zero, outside the elements.", 
+    "In other words, when you build\ncircuits, you want to make", 
+    "sure that the del phi b by del\nt is going to be zero.", 
+    "And inside the elements, we are\ngoing to make sure that", 
+    "when you define something--\ndescribe something as a lumped", 
+    "element, del q by del t,\nfor that element--", 
+    "the net del q by del t for\nthat element inside the", 
+    "element is going to be zero.", 
+    "And that&#39;s going to be true\nfor all your elements,", 
+    "registers, sources,\nwires, and so on.", 
+    "And the third element is that\nyou will only focus on signal", 
+    "speeds of interest that\nwill be way lower than", 
+    "the speed of light.", 
+    "Now one of the interesting facts\nof life is that as our", 
+    "microprocessors get faster and\nfaster, some of the chips", 
+    "inside your iPhones, and your\ndesktops, and so on, are", 
+    "clocking at speeds in excess\nof three to four gigahertz.", 
+    "When signal speeds are that\nfast, we are now getting to a", 
+    "point where the signal speeds\ninside our chips are", 
+    "approaching the speed\nof light.", 
+    "So they&#39;re not all\nthat far off.", 
+    "And so therefore, over the next\ndecade, as people try to", 
+    "push speeds to even higher\nvalues, various things are", 
+    "going to start breaking unless\nwe change things", 
+    "dramatically somehow.", 
+    "What this does is these\ndiscipline elements, the", 
+    "lumped matter discipline,\nenables us to create the", 
+    "lumped circuit abstraction.", 
+    "Look at our lumped elements.", 
+    "Lumped elements will\nbe described", 
+    "by their v-i relation.", 
+    "So each of these lumped elements\nof that sum i, that", 
+    "would be sum function of\nv, the v-i relation.", 
+    "The relation could be linear,\ncould be non-linear.", 
+    "Could be, in general, could be\nanything, just that they have", 
+    "some v-i relation.", 
+    "For the register you saw that\ni was v divided by R.", 
+    "For some other element, it could\nbe that i is 6.7 times v", 
+    "squared plus v divided by\n2 plus some constant 1.", 
+    "I mean, who knows.", 
+    "That could be some function of\nv. Could be linear, could be", 
+    "non-linear.", 
+    "And for this element, the power\nconsumed by the element", 
+    "is given by vi.", 
+    "Finally, we showed that when\nyou make the lumped matter", 
+    "discipline assumptions,\nMaxwell&#39;s equations simplify", 
+    "to extremely simple\nKVL and KCL.", 
+    "So, for example, KVL simply\nsays that the sum of the", 
+    "voltages around a\nloop is zero.", 
+    "While KCL says that the sum of\nthe current that go into a", 
+    "node is zero.", 
+    "You can also say the currents\ncoming out of a node are zero", 
+    "by the same principle.", 
+    "What is amazing about this is\nthat by making the lumped", 
+    "matter discipline, by abiding\nby the lumped matter", 
+    "discipline, we have been able\nto convert the use of", 
+    "Maxwell&#39;s equation into the use\nof very simple algebra.", 
+    "So we replaced our del phi&#39;s and\ndel t&#39;s, and all of that", 
+    "stuff, with extremely\nsimple algebra.", 
+    "And in the next set of segments\nI&#39;m going to show you", 
+    "how we can simplify and analyze\ncircuits extremely", 
+    "easily using very, very\nsimple algebra.", 
+    "And, in fact, for the first half\nof this course, you are", 
+    "not going to see any\nsquigglies at all.", 
+    "It&#39;s going to be very,\nvery simple.", 
+    "And even later, we&#39;re not going\nto be seeing any partial", 
+    "differential equations.", 
+    "We will see some fairly simple\ndifferential equations, but by", 
+    "making the LMD assumptions, we\nhave really gotten rid of a", 
+    "lot of the complexity.", 
+    "And things are going to be\nreally, really, really simple.", 
+    null
+  ]
+}
\ No newline at end of file
diff --git a/common/test/data/full/subs/CcgAYu0n0bg.srt.sjson b/common/test/data/full/subs/CcgAYu0n0bg.srt.sjson
new file mode 100644
index 0000000000..bc505bb0d1
--- /dev/null
+++ b/common/test/data/full/subs/CcgAYu0n0bg.srt.sjson
@@ -0,0 +1,5 @@
+{
+  "start": [], 
+  "end": [], 
+  "text": []
+}
\ No newline at end of file
diff --git a/common/test/data/full/subs/EG-fRTJln_E.srt.sjson b/common/test/data/full/subs/EG-fRTJln_E.srt.sjson
new file mode 100644
index 0000000000..bc505bb0d1
--- /dev/null
+++ b/common/test/data/full/subs/EG-fRTJln_E.srt.sjson
@@ -0,0 +1,5 @@
+{
+  "start": [], 
+  "end": [], 
+  "text": []
+}
\ No newline at end of file
diff --git a/common/test/data/full/subs/G_2F9wivspM.srt.sjson b/common/test/data/full/subs/G_2F9wivspM.srt.sjson
new file mode 100644
index 0000000000..064fc99ed5
--- /dev/null
+++ b/common/test/data/full/subs/G_2F9wivspM.srt.sjson
@@ -0,0 +1,212 @@
+{
+  "start": [
+    0, 
+    1800, 
+    2440, 
+    7270, 
+    11690, 
+    13030, 
+    17060, 
+    21240, 
+    24980, 
+    29930, 
+    33740, 
+    37930, 
+    40340, 
+    46830, 
+    50200, 
+    52890, 
+    56355, 
+    59450, 
+    60430, 
+    66640, 
+    69640, 
+    72148, 
+    73398, 
+    77730, 
+    83080, 
+    84330, 
+    99630, 
+    103660, 
+    110800, 
+    114250, 
+    118220, 
+    121940, 
+    131580, 
+    134300, 
+    137730, 
+    140540, 
+    143860, 
+    146050, 
+    147300, 
+    149850, 
+    157140, 
+    161820, 
+    164460, 
+    165600, 
+    169520, 
+    174040, 
+    176290, 
+    178310, 
+    181070, 
+    182920, 
+    184160, 
+    189960, 
+    192630, 
+    193480, 
+    199020, 
+    201540, 
+    204520, 
+    208180, 
+    211470, 
+    217120, 
+    220790, 
+    224490, 
+    227200, 
+    229150, 
+    232940, 
+    236320, 
+    239070, 
+    242480
+  ], 
+  "end": [
+    1800, 
+    2440, 
+    7270, 
+    11690, 
+    13030, 
+    17060, 
+    21240, 
+    24979, 
+    29930, 
+    33740, 
+    37930, 
+    40340, 
+    46830, 
+    50199, 
+    52890, 
+    56355, 
+    59449, 
+    60430, 
+    66640, 
+    69640, 
+    72148, 
+    73398, 
+    77729, 
+    83080, 
+    84330, 
+    99630, 
+    103660, 
+    110800, 
+    114250, 
+    118220, 
+    121940, 
+    131579, 
+    134300, 
+    137730, 
+    140540, 
+    143859, 
+    146050, 
+    147300, 
+    149850, 
+    157140, 
+    161820, 
+    164459, 
+    165600, 
+    169519, 
+    174040, 
+    176290, 
+    178310, 
+    181070, 
+    182920, 
+    184160, 
+    189960, 
+    192630, 
+    193480, 
+    199019, 
+    201540, 
+    204519, 
+    208180, 
+    211470, 
+    217120, 
+    220790, 
+    224489, 
+    227200, 
+    229149, 
+    232940, 
+    236320, 
+    239070, 
+    242480, 
+    243730
+  ], 
+  "text": [
+    "SPEAKER 1: So I want to show\nyou a simple circuit that", 
+    "looks like this.", 
+    "And let&#39;s go ahead and measure\nsome voltages and currents.", 
+    "In terms of terminology,\nremember", 
+    "this is called a loop.", 
+    "So if I start from the point\nC, and I travel through the", 
+    "voltage source, come to the node\nA, down through R1 and", 
+    "all the way down through R2\nback to C, that&#39;s a loop.", 
+    "Similarly, this point A is a\nnode where the register R1,", 
+    "the voltage source V0 and\nR4 are connected.", 
+    "Just make sure your terminology\nis correct.", 
+    "So what I&#39;ll do is let me make\nsome quick measurements for", 
+    "you, and show you that these KVL\nand KCL are indeed true.", 
+    "So the circuit&#39;s up there.", 
+    "So let me take some\nmeasurements.", 
+    "And why don&#39;t you write down\nwhat I measure on the board.", 
+    null, 
+    "Let me borrow another\npiece of chalk here.", 
+    "What I&#39;ll do is focus on this\nloop here and focus on this", 
+    "node and make some\nmeasurements.", 
+    "So you see the circuit\nup there.", 
+    "[INAUDIBLE]", 
+    null, 
+    "So I get three volts for the\nvoltage from C to A. So why", 
+    "don&#39;t you write down\nthree volts.", 
+    null, 
+    "OK, so the next one\nis minus 1.6.", 
+    null, 
+    "And so that will be\nI&#39;m doing AB, VAB.", 
+    null, 
+    "And then let me do\nthe last one.", 
+    "And it is minus 1.37.", 
+    "Within the bonds of experimental\nerror, notice", 
+    "that if I add up these\nthree voltages, they", 
+    "nicely sum up to zero.", 
+    "OK, next let me focus\non this node here.", 
+    "And at this node, let\nme go ahead and", 
+    "measure some currents.", 
+    null, 
+    "What I&#39;ll do now is change to an\nAC voltage so that I can go", 
+    "ahead and measure the current\nwithout breaking my circuit.", 
+    "This time around, you&#39;ll get to\nsee the measurements that", 
+    "I&#39;m taking as well.", 
+    "What I have here is three wires\nthat I have pulled out", 
+    "from D. And this is the node D.\nSo three wires coming into", 
+    "the node D just to make it a\nlittle bit easier for me to", 
+    "measure stuff.", 
+    "So everybody keep your fingers\ncrossed so I don&#39;t", 
+    "look like a fool here.", 
+    "Hope this works out.", 
+    "So it&#39;s about 10 millivolts\npeak to peak out there.", 
+    "Let&#39;s say that if the wave form\nrises on the left hand", 
+    "side, it&#39;s positive.", 
+    "So it&#39;s positive\n10 millivolts.", 
+    "And another positive\n10 millivolts.", 
+    "So that&#39;s 20 millivolts.", 
+    "And this time it&#39;s a negative,\nroughly 20, I", 
+    "guess, negative 20.", 
+    "So I&#39;m getting, in terms of\ncurrents, I have a positive", 
+    "10, a positive 10 and a negative\n20 that adds up to 0.", 
+    "But more interestingly, I can\nshow you the same thing by", 
+    "holding this current\nmeasuring probe", 
+    "directly across that node.", 
+    "And notice that the net current\nthat is entering into", 
+    "this node here is zero.", 
+    "So that should just show you\nthat KCL does indeed hold in", 
+    "practice, and it is not just a\nfigment of our imaginations.", 
+    null
+  ]
+}
\ No newline at end of file
diff --git a/common/test/data/full/subs/XbDRmF6J0K0.srt.sjson b/common/test/data/full/subs/XbDRmF6J0K0.srt.sjson
new file mode 100644
index 0000000000..7f75406826
--- /dev/null
+++ b/common/test/data/full/subs/XbDRmF6J0K0.srt.sjson
@@ -0,0 +1,266 @@
+{
+  "start": [
+    0, 
+    3780, 
+    5290, 
+    9590, 
+    13370, 
+    13735, 
+    15275, 
+    16740, 
+    19790, 
+    23420, 
+    26470, 
+    28560, 
+    31630, 
+    33770, 
+    35320, 
+    36750, 
+    38390, 
+    41660, 
+    43720, 
+    46740, 
+    47805, 
+    49920, 
+    52170, 
+    53540, 
+    56530, 
+    59350, 
+    63350, 
+    66470, 
+    68440, 
+    69220, 
+    71320, 
+    72870, 
+    78300, 
+    79890, 
+    82470, 
+    85670, 
+    90720, 
+    93660, 
+    97005, 
+    98280, 
+    102090, 
+    103460, 
+    107090, 
+    108040, 
+    110700, 
+    112510, 
+    117400, 
+    121890, 
+    124450, 
+    130229, 
+    133180, 
+    140010, 
+    142500, 
+    143580, 
+    150010, 
+    152720, 
+    159180, 
+    161330, 
+    165510, 
+    171270, 
+    173750, 
+    177000, 
+    179340, 
+    181273, 
+    182400, 
+    188140, 
+    189210, 
+    192730, 
+    199620, 
+    206460, 
+    208220, 
+    211810, 
+    214510, 
+    219790, 
+    221440, 
+    223910, 
+    224950, 
+    226060, 
+    231860, 
+    232940, 
+    237990, 
+    240450, 
+    242470, 
+    244760, 
+    246470, 
+    248420
+  ], 
+  "end": [
+    3780, 
+    5290, 
+    9590, 
+    13370, 
+    13735, 
+    15275, 
+    16740, 
+    19790, 
+    23420, 
+    26470, 
+    28560, 
+    31630, 
+    33770, 
+    35320, 
+    36750, 
+    38390, 
+    41660, 
+    43720, 
+    46740, 
+    47805, 
+    49920, 
+    52170, 
+    53540, 
+    56530, 
+    59350, 
+    63350, 
+    66470, 
+    68440, 
+    69220, 
+    71320, 
+    72870, 
+    78300, 
+    79890, 
+    82470, 
+    85670, 
+    90720, 
+    93660, 
+    97005, 
+    98280, 
+    102090, 
+    103460, 
+    107090, 
+    108040, 
+    110700, 
+    112510, 
+    117400, 
+    121890, 
+    124450, 
+    130229, 
+    133180, 
+    140010, 
+    142500, 
+    143580, 
+    150010, 
+    152720, 
+    159180, 
+    161330, 
+    165510, 
+    171270, 
+    173750, 
+    177000, 
+    179340, 
+    181273, 
+    182400, 
+    188140, 
+    189210, 
+    192730, 
+    196700, 
+    206460, 
+    208220, 
+    211810, 
+    214510, 
+    219790, 
+    221440, 
+    223910, 
+    224950, 
+    226060, 
+    231860, 
+    232940, 
+    237990, 
+    240450, 
+    242470, 
+    244760, 
+    246470, 
+    248420, 
+    249670
+  ], 
+  "text": [
+    "SPEAKER 1: We just learned the fundamental rules of", 
+    "electrical circuits.", 
+    "For example, if we have a circuit like this, which is", 
+    "called a bridge and which has a voltage source and five", 
+    "resistors--", 
+    "SPEAKER 2: And I'll show the circuit in lecture.", 
+    "SPEAKER 1: That's right.", 
+    "We had a bunch of voltage current constraints, one for", 
+    "each of the branches, each of the elements in the network.", 
+    "For example, this one, the voltage across it is the", 
+    "voltage intrinsic to it.", 
+    "And we have Kirchoff's Current Laws, one for each of the", 
+    "possible nodes in the network.", 
+    "So that's four of them here.", 
+    "It turns out one of them is redundant.", 
+    "It can be derived from the others.", 
+    "And we have Kirchoff Voltage Laws, which are some of the", 
+    "voltages around the loop is zero.", 
+    "And I have four of them written down here, and only", 
+    "three of them are independent.", 
+    "But we can have many more because there's a loop I", 
+    "didn't show, which is the one that looks like this, for", 
+    "example, OK?", 
+    "And the other thing we have is that some of the powers on the", 
+    "network entering each the elements is zero.", 
+    "So there's no power gained or lost. This is a general method", 
+    "of solving all circuit problems. Unfortunately, even", 
+    "for a simple circuit like this, we have a mess of", 
+    "equations here.", 
+    "This is not a good idea.", 
+    "SPEAKER 2: So in the next lecture, what Anant will show", 
+    "you is a much more coherent, a much better organized", 
+    "technique for solving these circuits.", 
+    "So again, if we circle this circuit--", 
+    "this is the same brood circuit Anant showed in the lecture--", 
+    "we have six resistors, one, two, three, four nodes.", 
+    "And what we do is we take each of these nodes and for those", 
+    "nodes we'll write Kirchoff's Current Law.", 
+    "And that's called nodal analysis.", 
+    "So step zero is we pick one of these nodes and we label that", 
+    "node as ground.", 
+    "And labeling it ground just says the voltage on", 
+    "that node is zero.", 
+    "SPEAKER 1: The potential on that node is zero.", 
+    "Voltages are differences of potential.", 
+    "SPEAKER 2: Then we take a node, such as b.", 
+    "And for that node, b, we write down an equation that says the", 
+    "currents going into that node are o0.", 
+    "So IR1 is plus IR2 plus IR3 is equal to zero.", 
+    "We take this node, d, where we also write down Kirchoff's", 
+    "Current Law, IR3 plus IR4 plus IR5 is equal to zero.", 
+    "And at that point, we substitute", 
+    "in for those voltages.", 
+    "So when we have IR3, that's just b minus d over R3.", 
+    "That's the current going into it.", 
+    "For R5 over here, we have just d--", 
+    "IS is 0 minus d.", 
+    "So that's just minus d over R5.", 
+    "And for IR4, we have a minus d over R4.", 
+    "So we have an equation like this.", 
+    "SPEAKER 1: So these labels, a, b and d, are within node", 
+    "potentials, OK?", 
+    "SPEAKER 2: We do the same thing over here for--", 
+    "SPEAKER 1: Right, yes.", 
+    "SPEAKER 2: We do the same thing over here for IR2 is--", 
+    "SPEAKER 1: It's IR1.", 
+    "SPEAKER 2: IR1 is a minus b over R1.", 
+    "IR3 is d minus b over R3.", 
+    "And finally, IR2 is minus b over R2.", 
+    "So now we have two equations.", 
+    "And the last thing that we do is we label this node a to", 
+    "have the voltage v. We say a is equal to v.", 
+    "Since this is a zero, instead of a, it's v, we make that", 
+    "substitution everywhere here.", 
+    "We have two equations, two unknowns.", 
+    "We solve it.", 
+    "And that gives us our answer.", 
+    "SPEAKER 1: So the equations are b and d because all the", 
+    "A's are substituted for.", 
+    "And all of the KCLs that were written with the KCLs for some", 
+    "of the currents entering the node is zero.", 
+    "You could have equally written them as some of the currents", 
+    "leaving the node as zero and get the same answer because", 
+    "that would just multiply everything by minus 1.", 
+    "SPEAKER 2: So you'll see this next week.", 
+    "That's just a preview of coming attractions."
+  ]
+}
\ No newline at end of file
diff --git a/common/test/data/full/subs/eLAyO33baQ8.srt.sjson b/common/test/data/full/subs/eLAyO33baQ8.srt.sjson
new file mode 100644
index 0000000000..a6cd4edabd
--- /dev/null
+++ b/common/test/data/full/subs/eLAyO33baQ8.srt.sjson
@@ -0,0 +1,335 @@
+{
+  "start": [
+    0, 
+    430, 
+    3070, 
+    5680, 
+    9120, 
+    12590, 
+    13280, 
+    17280, 
+    20200, 
+    23630, 
+    26720, 
+    29450, 
+    32700, 
+    35920, 
+    39280, 
+    43310, 
+    44850, 
+    46400, 
+    48270, 
+    52110, 
+    54140, 
+    57570, 
+    61600, 
+    63040, 
+    64410, 
+    66980, 
+    69920, 
+    72490, 
+    75110, 
+    77540, 
+    80680, 
+    84430, 
+    87190, 
+    91790, 
+    94420, 
+    97830, 
+    101030, 
+    104180, 
+    106960, 
+    108320, 
+    110885, 
+    113180, 
+    115630, 
+    119930, 
+    122740, 
+    129590, 
+    131000, 
+    134200, 
+    138470, 
+    142200, 
+    145410, 
+    150500, 
+    153590, 
+    158000, 
+    160290, 
+    164600, 
+    167370, 
+    169272, 
+    173420, 
+    176650, 
+    180460, 
+    183390, 
+    185200, 
+    188940, 
+    190750, 
+    194040, 
+    196510, 
+    198060, 
+    202670, 
+    206860, 
+    209980, 
+    213620, 
+    219130, 
+    221760, 
+    222700, 
+    227050, 
+    230340, 
+    234810, 
+    236930, 
+    239030, 
+    241390, 
+    246630, 
+    248200, 
+    252220, 
+    255370, 
+    257160, 
+    258709, 
+    263370, 
+    264280, 
+    266840, 
+    270190, 
+    275640, 
+    277790, 
+    280880, 
+    282680, 
+    283930, 
+    285990, 
+    287870, 
+    290740, 
+    294140, 
+    299760, 
+    305270, 
+    308230, 
+    310160, 
+    311540, 
+    314150, 
+    316160, 
+    316440, 
+    318500
+  ], 
+  "end": [
+    430, 
+    3070, 
+    5680, 
+    9120, 
+    12590, 
+    13280, 
+    17280, 
+    20200, 
+    23630, 
+    26720, 
+    29450, 
+    32700, 
+    35920, 
+    39280, 
+    43310, 
+    44850, 
+    46400, 
+    48269, 
+    52110, 
+    54140, 
+    57570, 
+    61600, 
+    63040, 
+    64410, 
+    66979, 
+    69920, 
+    72490, 
+    75110, 
+    77540, 
+    80680, 
+    84430, 
+    87190, 
+    91789, 
+    94420, 
+    97830, 
+    101030, 
+    104180, 
+    106960, 
+    108320, 
+    110884, 
+    113180, 
+    115630, 
+    119929, 
+    122740, 
+    129590, 
+    131000, 
+    134200, 
+    138470, 
+    142200, 
+    145410, 
+    150500, 
+    153590, 
+    158000, 
+    160290, 
+    164600, 
+    167370, 
+    169272, 
+    173420, 
+    176649, 
+    180460, 
+    183390, 
+    185200, 
+    188940, 
+    190750, 
+    194040, 
+    196510, 
+    198060, 
+    202670, 
+    206859, 
+    209980, 
+    213619, 
+    219130, 
+    221760, 
+    222700, 
+    227049, 
+    230340, 
+    234810, 
+    236930, 
+    239030, 
+    241390, 
+    246630, 
+    248200, 
+    252220, 
+    255370, 
+    257160, 
+    258709, 
+    263370, 
+    264280, 
+    266840, 
+    270190, 
+    275640, 
+    277789, 
+    280880, 
+    282680, 
+    283930, 
+    285990, 
+    287870, 
+    290740, 
+    294140, 
+    299760, 
+    305270, 
+    308229, 
+    310160, 
+    311540, 
+    314150, 
+    316159, 
+    316440, 
+    318500, 
+    319750
+  ], 
+  "text": [
+    null, 
+    "SPEAKER 1: In this sequence, are\ngoing to look at a whole", 
+    "bunch of techniques for\nanalyzing circuits.", 
+    "Think of these as your tool\nchest. So you are embarking on", 
+    "6.002 and going on to build\nlots of useful electronic", 
+    "systems.", 
+    "But before we go and build these\nsystems, much like a", 
+    "carpenter who needs to go build\na house, much like a", 
+    "carpenter has to go and buy a\nset of tools from the local", 
+    "store, we need to go and make\nsure that you have the tools", 
+    "in your tool chest to analyze\nthese circuits.", 
+    "This tool chest will include\nthings like the KVL KCL", 
+    "method, the Node method\nand so on.", 
+    "But before I begin talking about\nthese techniques for", 
+    "your tool chest, I&#39;d like to do\na extremely quick review--", 
+    "as is my usual practice--", 
+    "of what you&#39;ve covered so far.", 
+    "So remember our EECS\nplayground.", 
+    "We&#39;ve gotten into this place by\npromising that we are going", 
+    "to observe the lumped\nmatter discipline.", 
+    "By observing the discipline\nrecall that the complexities", 
+    "of Maxwell&#39;s equations and the\ndifferential equations that", 
+    "you have to solve-- the\npartial differential", 
+    "equations-- goes away.", 
+    "And you&#39;re left with very\nsimple linear equations.", 
+    "And you will see a lot\nof that today.", 
+    "As you make the lumped matter\ndiscipline, you end up with", 
+    "these lumped elements, like\nresistors and voltage", 
+    "sources and so on.", 
+    "And what you do with these\nlumped elements is we can", 
+    "label what are called the\nbranch variables or the", 
+    "terminal variables for these\nlumped elements, OK?", 
+    "So for example, v is the voltage\nacross the element.", 
+    "And i is the current through\nthe element.", 
+    "The power consumed by the\nelement is given by vi.", 
+    "Continuing with our review, the\nlumped matter discipline", 
+    "enables us to create the lumped\ncircuit abstraction.", 
+    "So you take these lumped\nelements and you connect them", 
+    "with ideal wires.", 
+    "So in this case, I have a\nresistor which is a lumped", 
+    "element, a voltage source.", 
+    "And I connect them with\nthese ideal wires.", 
+    "And what you end up with is\ncalled a lumped circuit.", 
+    "But this is your lumped\ncircuit abstraction.", 
+    "Well as we made the transition\nfrom physics to EECS by", 
+    "adhering to the lumped\nmatter discipline.", 
+    "I had discussed in the last\nsequence that Maxwell&#39;s", 
+    "equations turn into very simple\nalgebraic equations.", 
+    "And these are captured by\nKirchoff&#39;s voltage and current", 
+    "laws, called KVL and KCL.", 
+    "So KVL says that for all loops\nin your circuit, the sum of", 
+    "the voltages around the\nloops add up to zero.", 
+    "Similarly for all the nodes in\nthe circuit, the currents that", 
+    "enter into a node\nadd up to zero.", 
+    "And in the same matter, if I\njust summed the currents", 
+    "leaving a node, they also\nadd up to zero.", 
+    "So whether you sum the currents\nentering the node or", 
+    "currents leaving a node, they\nwould add up to zero by KCL.", 
+    "And the beauty of this was by\nadhering to lump matter", 
+    "discipline, recall the\ncomplexities Maxwell&#39;s", 
+    "equations whether an\nintegral form or", 
+    "differential form went away.", 
+    "And we were now left with\nextremely simple algebraic", 
+    "expressions of the sort.", 
+    "And you will see shortly that\nyou will end up solving", 
+    "extremely simple linear\nequations", 
+    "as we analyze circuits.", 
+    "So as one example here\nis a linear circuit.", 
+    "It has one, two, three, four,\nfive, six elements.", 
+    "It&#39;s got a voltage source\nof a voltage v zero.", 
+    "It&#39;s got a resistor, r one\nand so on and so forth.", 
+    "So for this circuit according\nto our abstraction and the", 
+    "laws of KVL and KCL,\nthe following", 
+    "are going to be true.", 
+    "So for instance if I look at\nnode a, then according to KCL,", 
+    "the currents entering the\nnode must be zero.", 
+    "So in other words, the\ncurrent here is ica.", 
+    "And I can sum to that\nthe current", 
+    "entering from the d direction.", 
+    "So that would be plus ida.", 
+    "And then there is a current from\nthe ba direction and iba.", 
+    "Those are going to\nsum to zero.", 
+    "Now I can multiply the whole\nthing by minus 1.", 
+    "And that would give me the sum\nof the currents leaving the", 
+    "node are also going\nto be zero.", 
+    "So that is KCL.", 
+    "Now I can also write KVL in this\ncase for this loop, for", 
+    "instance, here.", 
+    "For this loop I can add up the\nvoltages around the loop.", 
+    "And by KVL they must\nadd up to zero.", 
+    "So for example if I look at\nthe voltage vca, I can add", 
+    "that to the next voltage here.", 
+    "That is to vab and then\nadd that to the", 
+    "final voltage, vbc.", 
+    "And by KCL--", 
+    null, 
+    "so all of those must\nadd up to be zero.", 
+    "Now if you go back to our\ncircuit here that you see on", 
+    "the left hand side, I am going\nto show you a little demo that", 
+    "will look at these currents,\nica, ida, and iba, and also", 
+    "look at the voltages, vcabab\nand bbc and actually go and", 
+    "look at the circuit, make the\nmeasurements, and show that", 
+    "they indeed sum up to zero.", 
+    "Not surprising.", 
+    "KVL and KCL really work.", 
+    "And so the demo should\nalso work.", 
+    "OK.", 
+    "So let&#39;s go and do our demo.", 
+    null
+  ]
+}
\ No newline at end of file
diff --git a/common/test/data/full/subs/p2Q6BrNhdh8.srt.sjson b/common/test/data/full/subs/p2Q6BrNhdh8.srt.sjson
new file mode 100644
index 0000000000..5168cbab01
--- /dev/null
+++ b/common/test/data/full/subs/p2Q6BrNhdh8.srt.sjson
@@ -0,0 +1,155 @@
+{
+  "start": [
+    0, 
+    6830, 
+    9040, 
+    11810, 
+    15030, 
+    19420, 
+    21690, 
+    24880, 
+    29850, 
+    32409, 
+    35430, 
+    37550, 
+    40240, 
+    44050, 
+    47470, 
+    50910, 
+    52750, 
+    55340, 
+    57870, 
+    59920, 
+    62450, 
+    66320, 
+    70470, 
+    72100, 
+    82700, 
+    84820, 
+    86550, 
+    88890, 
+    93560, 
+    94810, 
+    98620, 
+    100040, 
+    102740, 
+    105880, 
+    108470, 
+    111550, 
+    112830, 
+    116190, 
+    117410, 
+    120620, 
+    122310, 
+    125810, 
+    129720, 
+    132900, 
+    135170, 
+    138020, 
+    141350, 
+    143230, 
+    144480
+  ], 
+  "end": [
+    6830, 
+    9040, 
+    11809, 
+    15030, 
+    19419, 
+    21690, 
+    24880, 
+    29849, 
+    32409, 
+    35430, 
+    37550, 
+    40239, 
+    44050, 
+    47470, 
+    50910, 
+    52750, 
+    55340, 
+    57870, 
+    59919, 
+    62450, 
+    66320, 
+    70470, 
+    72100, 
+    82699, 
+    84820, 
+    86550, 
+    88890, 
+    93560, 
+    94810, 
+    98620, 
+    100040, 
+    102740, 
+    105880, 
+    108470, 
+    111550, 
+    112830, 
+    116190, 
+    117410, 
+    120619, 
+    122310, 
+    125810, 
+    129720, 
+    132900, 
+    135170, 
+    138019, 
+    141350, 
+    143230, 
+    144480, 
+    152786
+  ], 
+  "text": [
+    null, 
+    "PROFESSOR ANANT AGARWAL:\nWelcome to MITx, MIT&#39;s", 
+    "worldwide online learning\ninitiative.", 
+    "We are delighted to have you\njoin us for 6.002x: Circuits", 
+    "and Electronics, the inaugural\ncourse of MITx.", 
+    "OK, welcome to 6.002.", 
+    "6.002x is the same as Electronic\nCircuits course", 
+    "taken by MIT students as the\nfirst course in an EE or EECS", 
+    "major at MIT.", 
+    "This course will help you make\nthe transition from physics to", 
+    "electrical engineering.", 
+    "In this course, you will learn\nabout a lot of fun things,", 
+    "including the foundations behind\nmany cool devices, such", 
+    "as the smartphone.", 
+    "The course will be hard and we\nwant you to stick with us.", 
+    "It is our hope that you\nwill have a lot", 
+    "of fun in this course.", 
+    "Let me start by introducing\nyou to our team.", 
+    "I am Anant Agarwal.", 
+    "I am the director of MIT&#39;s\nComputer Science and", 
+    "Artificial Intelligence\nLaboratory or CSAIL.", 
+    "Like most MIT faculty, I have\na wide range of interests,", 
+    "including a fascination\naround chainsaws.", 
+    null, 
+    "GERRY SUSSMAN: Hello, I&#39;m Gerry\nSussman, professor of", 
+    "electrical engineering at MIT.", 
+    "Been a faculty member\nhere since 1973.", 
+    "I build electronics, optics,\ncomputer software, and I", 
+    "repair watches as a hobby.", 
+    null, 
+    "PIOTR MITROS: I&#39;m\nPiotr Mitros.", 
+    "I&#39;m a research scientist at MIT,\nand I was in charge of", 
+    "developing the software\ninfrastructure for MITx.", 
+    "As a graduate student, I spent a\nlot of time traveling around", 
+    "India, Nigeria, and China,\nmostly as part of educational", 
+    "technology projects.", 
+    "So I&#39;m very excited to be\nhelping out with this course.", 
+    "PROFESSOR ANANT AGARWAL: Whether\nwe like chainsaws or", 
+    "watches, we are all passionate\neducators.", 
+    "This course is free.", 
+    "You will have the opportunity\nto earn an MITx pilot", 
+    "certificate with your grade\nat the end of this course.", 
+    "In this experimental first\ncourse of MITx, the", 
+    "certificates are also free.", 
+    "Now, this is a prototype course\nand we welcome your", 
+    "participation and any feedback\nyou might have to improving", 
+    "the learning experience.", 
+    "Let&#39;s get started.", 
+    null
+  ]
+}
\ No newline at end of file
diff --git a/common/test/data/full/subs/pFOrD8k9_p4.srt.sjson b/common/test/data/full/subs/pFOrD8k9_p4.srt.sjson
new file mode 100644
index 0000000000..fabe43c22d
--- /dev/null
+++ b/common/test/data/full/subs/pFOrD8k9_p4.srt.sjson
@@ -0,0 +1,101 @@
+{
+  "start": [
+    0, 
+    360, 
+    2460, 
+    6080, 
+    11270, 
+    12700, 
+    16210, 
+    18460, 
+    22750, 
+    26140, 
+    30360, 
+    31480, 
+    35370, 
+    37170, 
+    40710, 
+    43190, 
+    46980, 
+    49050, 
+    52590, 
+    55170, 
+    57100, 
+    59330, 
+    60950, 
+    65450, 
+    69710, 
+    73480, 
+    75100, 
+    77600, 
+    78790, 
+    81330, 
+    82580
+  ], 
+  "end": [
+    360, 
+    2460, 
+    6080, 
+    11270, 
+    12700, 
+    16210, 
+    18460, 
+    22750, 
+    26140, 
+    30360, 
+    31480, 
+    35370, 
+    37169, 
+    40710, 
+    43190, 
+    46980, 
+    49050, 
+    52589, 
+    55170, 
+    57100, 
+    59330, 
+    60949, 
+    65450, 
+    69710, 
+    73479, 
+    75100, 
+    77600, 
+    78789, 
+    81330, 
+    82580, 
+    83340
+  ], 
+  "text": [
+    null, 
+    "SPEAKER 1: In this next segment,\nI&#39;d like to show you", 
+    "a little demo of a set of lumped\nelements that you will", 
+    "find in 6002x and in building\nelectronic circuits and", 
+    "systems in general.", 
+    "And these lumped elements have\nbehavior that is completely", 
+    "captured by their V-I\nrelationship.", 
+    "I also want to point out that\nthe behavior of these lumped", 
+    "elements is captured by the\nV-I relationship only for", 
+    "those sorts of questions that\nwe, as electrical engineers,", 
+    "would like to ask.", 
+    "Understand that the V-I relation\ndoesn&#39;t capture all", 
+    "the possible behaviors\nof the element.", 
+    "It only captures those possible\nbehaviors that we, as", 
+    "EEs, generally like to ask.", 
+    "Once I&#39;ve shown you these basic\nV-I relationships, we", 
+    "will do some other fun stuff.", 
+    "I&#39;m going to show you some\nexamples of behavior that the", 
+    "V-I relationship will\nnot capture.", 
+    "We&#39;ll show you what\nwe can predict.", 
+    "For example, we&#39;ll\nshow you how the", 
+    "resistors don&#39;t work sometimes.", 
+    "And sometimes we will show you\nanother example of a cucumber", 
+    "pickle that may behave in ways\nthat you don&#39;t quite expect", 
+    "and whose behavior need not\nnecessarily be captured by", 
+    "your V-I relationship.", 
+    "So I don&#39;t want you to go around\nsaying that you don&#39;t", 
+    "have any fun in this course.", 
+    "So hopefully, you will\nenjoy what you are", 
+    "going to see ahead.", 
+    null
+  ]
+}
\ No newline at end of file
diff --git a/common/test/data/full/to_delete b/common/test/data/full/to_delete
new file mode 100644
index 0000000000..e36b7d8744
--- /dev/null
+++ b/common/test/data/full/to_delete
@@ -0,0 +1,339 @@
+chapter/Week_10
+chapter/Week_11
+chapter/Week_12
+chapter/Week_4
+chapter/Week_5
+chapter/Week_6
+chapter/Week_7
+chapter/Week_8
+chapter/Week_9
+html/Lab_10B_RC_Filters_Experiment
+html/Lab_5B_Mosfet_Amplifier_Experiment
+html/Week_10_Tutorials
+html/Week_11_Tutorials
+html/Week_12_Tutorials
+html/Week_4_Tutorials
+html/Week_5_Tutorials
+html/Week_6_Tutorials
+html/Week_7_Tutorials
+html/Week_8_Tutorials
+html/Week_9_Tutorials
+problem/Capacitors_and_Energy_Storage
+problem/Curve_Tracer
+problem/H10P1_Magnitude_and_Angle
+problem/H10P2_Impedances
+problem/H10P3_An_L_Network
+problem/H11P1_LC_Tank
+problem/H11P2_Scope_Probe
+problem/H11P3_A_Step_in_Time
+problem/H12P1_Current_Source
+problem/H12P2_Measuring_Light_
+problem/H12P3_Opamps_and_Filter_Design
+problem/H4P0_Vacuum_Diode
+problem/H4P1_Zener_Regulator
+problem/H5P1_Source_Follower_Large_Signal
+problem/H5P2_Source_Follower_Small_Signal
+problem/H6P1_The_NewFET_device
+problem/H6P2_Phase_Inverter
+problem/H6P3_Series_and_Parallel_Capacitors
+problem/H6P4_Switched_RC
+problem/H7P1_Series_and_Parallel_Inductors
+problem/H7P2_The_Curse_of_Lead_Inductance
+problem/H8P1_Charging_an_Inductor
+problem/H8P2_Physiological_Model
+problem/H8P3_Memory
+problem/H9P1_Response_to_a_Delayed_Impulse
+problem/H9P2_An_L_Network
+problem/H9P3_Designing_a_Shock_Absorber
+problem/Impedance_Frequency_Response
+problem/Mosfet_Amplifier
+problem/Op_Amps
+problem/Propagation_Delay
+problem/Resonance
+problem/S10E1_Incremental_Voltage
+problem/S10E2_two_terminal_connection
+problem/S10E3_Small_Signal_Amplifier
+problem/S14E1_Response_to_step_down
+problem/S14E2_Rise_Time
+problem/S14E3_Fall_Time_Constant
+problem/S14E4_Fall_Time
+problem/S15E1_Review_A_Step_Up
+problem/S15E2_Review_A_Step_Down
+problem/S15E3_Review_A_Pulse_is_Step_Up_then_Step_Down
+problem/S15E4_Area
+problem/S15E5_Initial_Conditions
+problem/S16E1_Charging_and_Discharging
+problem/S16E2_Time_to_Decay
+problem/S19E1_Trigonometry_Isn_t_So_Bad
+problem/S19E2_Exponentials_are_Nice
+problem/S19E3_Complex_Numbers
+problem/S19E4_Magnitudes_and_Angles
+problem/S20E1_Inductor_Impedance
+problem/S20E2_RC_voltage_divider
+problem/S20E3_LCR_voltage_divider
+problem/S20E4_LCR_voltage_divider_frequency_limits
+problem/S21E2_LR_filter
+problem/S21E3_Thevenin_Tank
+problem/S21E4_AM_Radio_Tuning
+problem/S22E1_Which_output_
+problem/S22E2_The_filter_is_ringing
+problem/S23E2_Inverting_Amplifier_analysis
+problem/S23E3_L23AmplifierInputResistance
+problem/S24E1_Summing_Amplifier
+problem/S24E2_Difference_Amplifier
+problem/S24E3_Inverting_Amplifier_Generalized
+problem/S24E4_Generalization_to_impedances
+problem/S24E5_Generalization_to_nonlinear_elements
+problem/S7E1_Linearization
+problem/S7E2_Graphs
+problem/S7E3_Linearization
+problem/S8E0_Dependent_Source
+problem/S8E1_Dependent_Current_Source
+problem/S8E2_Dependent_Voltage_Source
+problem/S9E1_MOSFET_model
+problem/S9E2_Amplifier_1
+problem/S9E3_MOSFET_Amplifier_2
+sequential/Dependent_Sources_and_Amplifiers
+sequential/Filters
+sequential/Incremental_Analysis
+sequential/MOSFET_Amplifiers_Small_signal_model
+sequential/MOSFETs_Large_Signals
+sequential/Operational_Amplifier_Circuits
+sequential/Ramps_Steps_and_Impulses
+sequential/Sinusoidal_Steady_State
+sequential/Speed_of_Digital_Circuits
+sequential/State_and_Memory
+sequential/The_Impedance_Model
+sequential/The_Operational_Amplifier_Abstraction
+sequential/Time_Domain_Versus_Frequency_Domain_Analysis
+vertical/vertical_1002
+vertical/vertical_1006
+vertical/vertical_1010
+vertical/vertical_1014
+vertical/vertical_1018
+vertical/vertical_1022
+vertical/vertical_1026
+vertical/vertical_1030
+vertical/vertical_1034
+vertical/vertical_1038
+vertical/vertical_1042
+vertical/vertical_1046
+vertical/vertical_1050
+vertical/vertical_1054
+vertical/vertical_1058
+vertical/vertical_1062
+vertical/vertical_1069
+vertical/vertical_1073
+vertical/vertical_1077
+vertical/vertical_1081
+vertical/vertical_1085
+vertical/vertical_1089
+vertical/vertical_1093
+vertical/vertical_1097
+vertical/vertical_1100
+vertical/vertical_1104
+vertical/vertical_1108
+vertical/vertical_1112
+vertical/vertical_1320
+vertical/vertical_1324
+vertical/vertical_1328
+vertical/vertical_1332
+vertical/vertical_1336
+vertical/vertical_1340
+vertical/vertical_1344
+vertical/vertical_1348
+vertical/vertical_1352
+vertical/vertical_1356
+vertical/vertical_1360
+vertical/vertical_1364
+vertical/vertical_1368
+vertical/vertical_1373
+vertical/vertical_1377
+vertical/vertical_1381
+vertical/vertical_1385
+vertical/vertical_1389
+vertical/vertical_1393
+vertical/vertical_1403
+vertical/vertical_1407
+vertical/vertical_1411
+vertical/vertical_1415
+vertical/vertical_1419
+vertical/vertical_1423
+vertical/vertical_1427
+vertical/vertical_1431
+vertical/vertical_1435
+vertical/vertical_1439
+vertical/vertical_1443
+vertical/vertical_1447
+vertical/vertical_1451
+vertical/vertical_1455
+vertical/vertical_1459
+vertical/vertical_1463
+vertical/vertical_1467
+vertical/vertical_1471
+vertical/vertical_1479
+vertical/vertical_1483
+vertical/vertical_1487
+vertical/vertical_1491
+vertical/vertical_1495
+vertical/vertical_1499
+vertical/vertical_1503
+vertical/vertical_1507
+vertical/vertical_1511
+vertical/vertical_1515
+vertical/vertical_1519
+vertical/vertical_1523
+vertical/vertical_1527
+vertical/vertical_1531
+vertical/vertical_1535
+vertical/vertical_1539
+vertical/vertical_1543
+vertical/vertical_1547
+vertical/vertical_1551
+vertical/vertical_1555
+vertical/vertical_1559
+vertical/vertical_1563
+vertical/vertical_1566
+vertical/vertical_1570
+vertical/vertical_1574
+vertical/vertical_1578
+vertical/vertical_1582
+vertical/vertical_1586
+vertical/vertical_1590
+vertical/vertical_1594
+vertical/vertical_1598
+vertical/vertical_1603
+vertical/vertical_1607
+vertical/vertical_1611
+vertical/vertical_1615
+vertical/vertical_1619
+vertical/vertical_1623
+vertical/vertical_1627
+vertical/vertical_1631
+vertical/vertical_1635
+vertical/vertical_1639
+vertical/vertical_1643
+vertical/vertical_1647
+vertical/vertical_1651
+vertical/vertical_1655
+vertical/vertical_1659
+vertical/vertical_1663
+vertical/vertical_1667
+vertical/vertical_1671
+vertical/vertical_1675
+vertical/vertical_1679
+vertical/vertical_1683
+vertical/vertical_1687
+vertical/vertical_1691
+vertical/vertical_1695
+vertical/vertical_1699
+vertical/vertical_1703
+vertical/vertical_1707
+vertical/vertical_1711
+vertical/vertical_1715
+vertical/vertical_1719
+vertical/vertical_1723
+vertical/vertical_1727
+vertical/vertical_1731
+vertical/vertical_1735
+vertical/vertical_1739
+vertical/vertical_1743
+vertical/vertical_1747
+vertical/vertical_1751
+vertical/vertical_1755
+vertical/vertical_1759
+vertical/vertical_1763
+vertical/vertical_1767
+vertical/vertical_431
+vertical/vertical_435
+vertical/vertical_439
+vertical/vertical_443
+vertical/vertical_447
+vertical/vertical_451
+vertical/vertical_455
+vertical/vertical_459
+vertical/vertical_463
+vertical/vertical_469
+vertical/vertical_475
+vertical/vertical_479
+vertical/vertical_483
+vertical/vertical_487
+vertical/vertical_491
+vertical/vertical_495
+vertical/vertical_504
+vertical/vertical_508
+vertical/vertical_512
+vertical/vertical_516
+vertical/vertical_520
+vertical/vertical_524
+vertical/vertical_530
+vertical/vertical_534
+vertical/vertical_538
+vertical/vertical_542
+vertical/vertical_546
+vertical/vertical_550
+vertical/vertical_554
+vertical/vertical_558
+vertical/vertical_562
+vertical/vertical_566
+vertical/vertical_570
+vertical/vertical_577
+vertical/vertical_581
+vertical/vertical_585
+vertical/vertical_589
+vertical/vertical_593
+vertical/vertical_597
+vertical/vertical_601
+vertical/vertical_605
+vertical/vertical_609
+vertical/vertical_613
+vertical/vertical_617
+vertical/vertical_621
+vertical/vertical_625
+vertical/vertical_629
+vertical/vertical_633
+vertical/vertical_637
+vertical/vertical_641
+vertical/vertical_645
+vertical/vertical_649
+vertical/vertical_653
+vertical/vertical_660
+vertical/vertical_664
+vertical/vertical_668
+vertical/vertical_672
+vertical/vertical_676
+vertical/vertical_680
+vertical/vertical_684
+vertical/vertical_688
+vertical/vertical_692
+vertical/vertical_696
+vertical/vertical_700
+vertical/vertical_704
+vertical/vertical_886
+vertical/vertical_890
+vertical/vertical_894
+vertical/vertical_898
+vertical/vertical_902
+vertical/vertical_906
+vertical/vertical_910
+vertical/vertical_914
+vertical/vertical_918
+vertical/vertical_922
+vertical/vertical_926
+vertical/vertical_930
+vertical/vertical_938
+vertical/vertical_942
+vertical/vertical_946
+vertical/vertical_950
+vertical/vertical_954
+vertical/vertical_958
+vertical/vertical_962
+vertical/vertical_966
+vertical/vertical_970
+vertical/vertical_974
+vertical/vertical_978
+vertical/vertical_982
+vertical/vertical_986
+vertical/vertical_990
+vertical/vertical_994
+vertical/vertical_998
diff --git a/common/test/data/full/vertical/vertical_58.xml b/common/test/data/full/vertical/vertical_58.xml
new file mode 100644
index 0000000000..7eba0f9dad
--- /dev/null
+++ b/common/test/data/full/vertical/vertical_58.xml
@@ -0,0 +1,12 @@
+<sequential>
+  <video youtube="1.50:8kARlsUt9lM,1.25:4cLA-IME32w,1.0:pFOrD8k9_p4,0.75:CcgAYu0n0bg" slug="S1V9_Demo_Setup_-_Lumped_Elements" name="S1V9: Demo Setup - Lumped Elements"/>
+  <customtag tag="S1" slug="discuss_59">
+    <impl>discuss</impl>
+  </customtag>
+  <customtag page="29" slug="book_60">
+    <impl>book</impl>
+  </customtag>
+  <customtag lecnum="1" slug="slides_61">
+    <impl>slides</impl>
+  </customtag>
+</sequential>
diff --git a/common/test/data/full/vertical/vertical_89.xml b/common/test/data/full/vertical/vertical_89.xml
new file mode 100644
index 0000000000..06b13846d2
--- /dev/null
+++ b/common/test/data/full/vertical/vertical_89.xml
@@ -0,0 +1,15 @@
+<sequential>
+  <html slug="html_90">
+    <h1> </h1>
+  </html>
+  <video youtube="1.50:vl9xrfxcr38,1.25:qxNX4REGqx4,1.0:BGU1poJDgOY,0.75:8rK9vnpystQ" slug="S1V14_Summary" name="S1V14: Summary"/>
+  <customtag tag="S1" slug="discuss_91">
+    <impl>discuss</impl>
+  </customtag>
+  <customtag page="70" slug="book_92">
+    <impl>book</impl>
+  </customtag>
+  <customtag lecnum="1" slug="slides_93">
+    <impl>slides</impl>
+  </customtag>
+</sequential>
diff --git a/common/test/data/full/vertical/vertical_94.xml b/common/test/data/full/vertical/vertical_94.xml
new file mode 100644
index 0000000000..59fe9ddb07
--- /dev/null
+++ b/common/test/data/full/vertical/vertical_94.xml
@@ -0,0 +1,12 @@
+<sequential>
+  <video youtube="0.75:3NIegrCmA5k,1.0:eLAyO33baQ8,1.25:m1zWi_sh4Aw,1.50:EG-fRTJln_E" slug="S2V1_Review_KVL_KCL" name="S2V1: Review KVL, KCL"/>
+  <customtag tag="S2" slug="discuss_95">
+    <impl>discuss</impl>
+  </customtag>
+  <customtag page="54" slug="book_96">
+    <impl>book</impl>
+  </customtag>
+  <customtag lecnum="2" slug="slides_97">
+    <impl>slides</impl>
+  </customtag>
+</sequential>
diff --git a/common/test/data/full/vertical/vertical_98.xml b/common/test/data/full/vertical/vertical_98.xml
new file mode 100644
index 0000000000..b91f3caaaa
--- /dev/null
+++ b/common/test/data/full/vertical/vertical_98.xml
@@ -0,0 +1,12 @@
+<sequential>
+  <video youtube="0.75:S_1NaY5te8Q,1.0:G_2F9wivspM,1.25:b-r7dISY-Uc,1.50:jjxHom0oXWk" slug="S2V2_Demo-_KVL_KCL" name="S2V2: Demo- KVL, KCL"/>
+  <customtag tag="S2" slug="discuss_99">
+    <impl>discuss</impl>
+  </customtag>
+  <customtag page="56" slug="book_100">
+    <impl>book</impl>
+  </customtag>
+  <customtag lecnum="2" slug="slides_101">
+    <impl>slides</impl>
+  </customtag>
+</sequential>