diff --git a/_config.yml b/_config.yml
index 9f79ab513..1ae7288d6 100644
--- a/_config.yml
+++ b/_config.yml
@@ -90,8 +90,8 @@ pcjs:
     - /modules/pcx86/lib/ram.js
     - /modules/pcx86/lib/keyboard.js
     - /modules/pcx86/lib/video.js
-    - /modules/pcx86/lib/parallelport.js
-    - /modules/pcx86/lib/serialport.js
+    - /modules/pcx86/lib/parallel.js
+    - /modules/pcx86/lib/serial.js
     - /modules/pcx86/lib/mouse.js
     - /modules/pcx86/lib/disk.js
     - /modules/pcx86/lib/fdc.js
@@ -127,7 +127,7 @@ pcjs:
     - /modules/pc8080/lib/ram.js
     - /modules/pc8080/lib/keyboard.js
     - /modules/pc8080/lib/video.js
-    - /modules/pc8080/lib/serialport.js
+    - /modules/pc8080/lib/serial.js
     - /modules/shared/es6/debugger.js
     - /modules/pc8080/lib/debugger.js
     - /modules/pc8080/lib/computer.js
@@ -156,7 +156,7 @@ pcjs:
     - /modules/pdp11/lib/rom.js
     - /modules/pdp11/lib/ram.js
     - /modules/pdp11/lib/keyboard.js
-    - /modules/pdp11/lib/serialport.js
+    - /modules/pdp11/lib/serial.js
     - /modules/pdp11/lib/pc11.js
     - /modules/pdp11/lib/disk.js
     - /modules/pdp11/lib/rk11.js
diff --git a/_includes/machine-engines.html b/_includes/machine-engines.html
index 48ba4975f..d0c17cc56 100644
--- a/_includes/machine-engines.html
+++ b/_includes/machine-engines.html
@@ -26,7 +26,7 @@ The following optional machine properties will be added to the 'parms' property:
     'drives' (eg, '[{name:"68Mb Hard Disk",type:4,path:"http://archive.pcjs.org/disks/pc/fixed/68mb/win95.json"}]')
     'state' (eg, "state.json")
     'messages' (eg, "fault")
-    'connection' (eg, "serialPort=vt100a.serialPort")
+    'connection' (eg, "serialPort->vt100a.serialPort")
 
 Finally, all our JavaScript components expect multi-word property names to use camelCase, so we automatically convert
 any lower-case forms to camelCase, both here and in markout.js and components.xsl, in case we've gotten sloppy in any
@@ -102,7 +102,8 @@ of our Markdown or XML documents.  Examples: 'automount' becomes 'autoMount', 'a
   {% endunless %}
   {% capture machine_parms %}{{ site.left_brace }}autoMount:{{ machine_autoMount }}{{ machine_autoPower }}{{ machine_autoStart }}{{ machine_drives }},state:"{{ machine.state }}",messages:"{{ machine.messages }}",connection:"{{ machine.connection }}"{{ site.right_brace }}{% endcapture %}
   {% if site.pcjs.compiled == true and machine.uncompiled != true %}
-    {% capture machine_script %}<script type="text/javascript" src="{{ site.baseurl }}/versions/{{ machine_app }}/{{ site.pcjs.version }}/{{ machine_file }}.js"></script>{% endcapture %}
+    {% capture machine_script %}<!--suppress BadExpressionStatementJS -->
+<script type="text/javascript" src="{{ site.baseurl }}/versions/{{ machine_app }}/{{ site.pcjs.version }}/{{ machine_file }}.js"></script>{% endcapture %}
     {% unless machine_scripts contains machine_script %}
       {{ machine_script }}
     {% endunless %}
@@ -143,6 +144,37 @@ of our Markdown or XML documents.  Examples: 'automount' becomes 'autoMount', 'a
     {% endif %}
   {% endif %}
   <script type="text/javascript">{{ machine_embed }}('{{ machine.id }}','{{ machine_config }}','{{ machine_template }}','{{ machine_parms }}');</script>
+  {% if machine.cling == "top" }
+    <script type="text/javascript">
+      var startMachinePos=-1;
+      window.onscroll=function(){
+          var machine = document.getElementById('{{ machine.id }}');
+          if (startMachinePos < 0) {
+              startMachinePos = findTop(machine);
+          }
+          if (window.pageYOffset > startMachinePos) {
+              machine.style.position = 'fixed';
+              machine.style.top = 0;
+          } else {
+              machine.style.position = 'relative';
+          }
+      };
+      function findTop(obj) {
+          var curTop = 0;
+          if (typeof (obj.offsetParent) != 'undefined' && obj.offsetParent) {
+              while (obj.offsetParent) {
+                  curTop += obj.offsetTop;
+                  obj = obj.offsetParent;
+              }
+              curTop += obj.offsetTop;
+          }
+          else if (obj.y) {
+              curTop += obj.y;
+          }
+          return curTop;
+      }
+    </script>
+  {% endif }
   {% if page.build %}
     <script type="text/javascript" src="{{ site.baseurl }}/modules/build/lib/build.js"></script>
     <script type="text/javascript">buildPC("{{ page.build }}");</script>
diff --git a/_posts/2016-10-06-introducing-pdpjs-a-pdp-11-emulator.md b/_posts/2016-10-06-introducing-pdpjs-a-pdp-11-emulator.md
index 7581e1506..68c7adc69 100644
--- a/_posts/2016-10-06-introducing-pdpjs-a-pdp-11-emulator.md
+++ b/_posts/2016-10-06-introducing-pdpjs-a-pdp-11-emulator.md
@@ -13,6 +13,7 @@ machines:
     type: pc8080
     config: /devices/pc8080/machine/vt100/machine.xml
     connection: serialPort->test1170.dl11
+    cling: top
 ---
 
 [PDPjs](/devices/pdp11/machine/) is the newest addition to the PCjs family of emulators, joining PCx86, PC8080, and C1Pjs.
diff --git a/modules/pc8080/lib/bus.js b/modules/pc8080/lib/bus.js
index 2abc23d21..0bcf8af2b 100644
--- a/modules/pc8080/lib/bus.js
+++ b/modules/pc8080/lib/bus.js
@@ -28,12 +28,14 @@
 
 "use strict";
 
-var Str          = require("../../shared/es6/strlib");
-var Usr          = require("../../shared/es6/usrlib");
-var Component    = require("../../shared/es6/component");
-var State        = require("../../shared/es6/state");
-var Memory8080   = require("./memory");
-var Messages8080 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Usr = require("../../shared/es6/usrlib");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var Memory8080 = require("./memory");
+    var Messages8080 = require("./messages");
+}
 
 /**
  * TODO: The Closure Compiler treats ES6 classes as 'struct' rather than 'dict' by default,
@@ -1057,4 +1059,4 @@ Bus8080.BlockInfo = Usr.defineBitFields({num:20, count:8, btmod:1, type:3});
  */
 var BusInfo8080;
 
-module.exports = Bus8080;
+if (NODE) module.exports = Bus8080;
diff --git a/modules/pc8080/lib/chipset.js b/modules/pc8080/lib/chipset.js
index 7b2b0d7b9..8e7d5a53e 100644
--- a/modules/pc8080/lib/chipset.js
+++ b/modules/pc8080/lib/chipset.js
@@ -28,14 +28,16 @@
 
 "use strict";
 
-var Str          = require("../../shared/es6/strlib");
-var Usr          = require("../../shared/es6/usrlib");
-var Web          = require("../../shared/es6/weblib");
-var Component    = require("../../shared/es6/component");
-var State        = require("../../shared/es6/state");
-var PC8080       = require("./defines");
-var CPUDef8080   = require("./cpudef");
-var Messages8080 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Usr = require("../../shared/es6/usrlib");
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var PC8080 = require("./defines");
+    var CPUDef8080 = require("./cpudef");
+    var Messages8080 = require("./messages");
+}
 
 /**
  * TODO: The Closure Compiler treats ES6 classes as 'struct' rather than 'dict' by default,
@@ -1135,4 +1137,4 @@ ChipSet8080.VT100.portsOutput = {
  */
 Web.onInit(ChipSet8080.init);
 
-module.exports = ChipSet8080;
+if (NODE) module.exports = ChipSet8080;
diff --git a/modules/pc8080/lib/computer.js b/modules/pc8080/lib/computer.js
index 418430586..816b57512 100644
--- a/modules/pc8080/lib/computer.js
+++ b/modules/pc8080/lib/computer.js
@@ -28,16 +28,18 @@
 
 "use strict";
 
-var Str          = require("../../shared/es6/strlib");
-var Usr          = require("../../shared/es6/usrlib");
-var Web          = require("../../shared/es6/weblib");
-var UserAPI      = require("../../shared/es6/userapi");
-var ReportAPI    = require("../../shared/es6/reportapi");
-var Component    = require("../../shared/es6/component");
-var State        = require("../../shared/es6/state");
-var PC8080       = require("./defines");
-var Bus8080      = require("./bus");
-var Messages8080 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Usr = require("../../shared/es6/usrlib");
+    var Web = require("../../shared/es6/weblib");
+    var UserAPI = require("../../shared/es6/userapi");
+    var ReportAPI = require("../../shared/es6/reportapi");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var PC8080 = require("./defines");
+    var Bus8080 = require("./bus");
+    var Messages8080 = require("./messages");
+}
 
 /**
  * TODO: The Closure Compiler treats ES6 classes as 'struct' rather than 'dict' by default,
@@ -1640,4 +1642,4 @@ Web.onInit(Computer8080.init);
 Web.onShow(Computer8080.show);
 Web.onExit(Computer8080.exit);
 
-module.exports = Computer8080;
+if (NODE) module.exports = Computer8080;
diff --git a/modules/pc8080/lib/cpu.js b/modules/pc8080/lib/cpu.js
index f47f54cd3..e3fc4accb 100644
--- a/modules/pc8080/lib/cpu.js
+++ b/modules/pc8080/lib/cpu.js
@@ -28,10 +28,12 @@
 
 "use strict";
 
-var Str          = require("../../shared/es6/strlib");
-var Usr          = require("../../shared/es6/usrlib");
-var Component    = require("../../shared/es6/component");
-var Messages8080 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Usr = require("../../shared/es6/usrlib");
+    var Component = require("../../shared/es6/component");
+    var Messages8080 = require("./messages");
+}
 
 /**
  * TODO: The Closure Compiler treats ES6 classes as 'struct' rather than 'dict' by default,
@@ -1247,4 +1249,4 @@ CPU8080.YIELDS_PER_STATUS       = 15;           // every 15 yields (ie, twice pe
 
 CPU8080.BUTTONS = ["power", "reset"];
 
-module.exports = CPU8080;
+if (NODE) module.exports = CPU8080;
diff --git a/modules/pc8080/lib/cpudef.js b/modules/pc8080/lib/cpudef.js
index 624e85bbd..334382897 100644
--- a/modules/pc8080/lib/cpudef.js
+++ b/modules/pc8080/lib/cpudef.js
@@ -124,4 +124,4 @@ CPUDef8080.PS.RESULT    =   (CPUDef8080.PS.CF | CPUDef8080.PS.PF | CPUDef8080.PS
  */
 CPUDef8080.PS.SET       =   (CPUDef8080.PS.BIT1);
 
-module.exports = CPUDef8080;
+if (NODE) module.exports = CPUDef8080;
diff --git a/modules/pc8080/lib/cpuops.js b/modules/pc8080/lib/cpuops.js
index b7c54c557..8e13bdebf 100644
--- a/modules/pc8080/lib/cpuops.js
+++ b/modules/pc8080/lib/cpuops.js
@@ -28,8 +28,10 @@
 
 "use strict";
 
-var CPUDef8080   = require("./CPUDef");
-var Messages8080 = require("./messages");
+if (NODE) {
+    var CPUDef8080 = require("./CPUDef");
+    var Messages8080 = require("./messages");
+}
 
 /**
  * op=0x00 (NOP)
diff --git a/modules/pc8080/lib/cpustate.js b/modules/pc8080/lib/cpustate.js
index 77fa76c92..ed9ef1789 100644
--- a/modules/pc8080/lib/cpustate.js
+++ b/modules/pc8080/lib/cpustate.js
@@ -28,14 +28,16 @@
 
 "use strict";
 
-var Web          = require("../../shared/es6/weblib");
-var Component    = require("../../shared/es6/component");
-var State        = require("../../shared/es6/state");
-var PC8080       = require("./defines");
-var CPUDef8080   = require("./cpudef");
-var CPU8080      = require("./cpu");
-var Memory8080   = require("./memory");
-var Messages8080 = require("./messages");
+if (NODE) {
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var PC8080 = require("./defines");
+    var CPUDef8080 = require("./cpudef");
+    var CPU8080 = require("./cpu");
+    var Memory8080 = require("./memory");
+    var Messages8080 = require("./messages");
+}
 
 /**
  * TODO: The Closure Compiler treats ES6 classes as 'struct' rather than 'dict' by default,
@@ -1174,4 +1176,4 @@ class CPUState8080 extends CPU8080 {
  */
 Web.onInit(CPUState8080.init);
 
-module.exports = CPUState8080;
+if (NODE) module.exports = CPUState8080;
diff --git a/modules/pc8080/lib/debugger.js b/modules/pc8080/lib/debugger.js
index 715f17dbb..70b189591 100644
--- a/modules/pc8080/lib/debugger.js
+++ b/modules/pc8080/lib/debugger.js
@@ -28,18 +28,20 @@
 
 "use strict";
 
-var Str          = require("../../shared/es6/strlib");
-var Usr          = require("../../shared/es6/usrlib");
-var Web          = require("../../shared/es6/weblib");
-var Component    = require("../../shared/es6/component");
-var Debugger     = require("../../shared/es6/debugger");
-var Keys         = require("../../shared/es6/keys");
-var State        = require("../../shared/es6/state");
-var PC8080       = require("./defines");
-var CPUDef8080   = require("./cpudef");
-var CPU8080      = require("./cpu");
-var Memory8080   = require("./memory");
-var Messages8080 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Usr = require("../../shared/es6/usrlib");
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+    var Debugger = require("../../shared/es6/debugger");
+    var Keys = require("../../shared/es6/keys");
+    var State = require("../../shared/es6/state");
+    var PC8080 = require("./defines");
+    var CPUDef8080 = require("./cpudef");
+    var CPU8080 = require("./cpu");
+    var Memory8080 = require("./memory");
+    var Messages8080 = require("./messages");
+}
 
 /**
  * Debugger8080 Address Object
@@ -4366,4 +4368,4 @@ if (DEBUGGER) {
 
 }   // endif DEBUGGER
 
-module.exports = Debugger8080;
+if (NODE) module.exports = Debugger8080;
diff --git a/modules/pc8080/lib/keyboard.js b/modules/pc8080/lib/keyboard.js
index 3d4e587fd..c880dd38b 100644
--- a/modules/pc8080/lib/keyboard.js
+++ b/modules/pc8080/lib/keyboard.js
@@ -28,14 +28,16 @@
 
 "use strict";
 
-var Str          = require("../../shared/es6/strlib");
-var Web          = require("../../shared/es6/weblib");
-var Component    = require("../../shared/es6/component");
-var Keys         = require("../../shared/es6/keys");
-var State        = require("../../shared/es6/state");
-var PC8080       = require("./defines");
-var ChipSet8080  = require("./chipset");
-var Messages8080 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+    var Keys = require("../../shared/es6/keys");
+    var State = require("../../shared/es6/state");
+    var PC8080 = require("./defines");
+    var ChipSet8080 = require("./chipset");
+    var Messages8080 = require("./messages");
+}
 
 /**
  * TODO: The Closure Compiler treats ES6 classes as 'struct' rather than 'dict' by default,
@@ -1134,4 +1136,4 @@ Keyboard8080.VT100.portsOutput = {
  */
 Web.onInit(Keyboard8080.init);
 
-module.exports = Keyboard8080;
+if (NODE) module.exports = Keyboard8080;
diff --git a/modules/pc8080/lib/memory.js b/modules/pc8080/lib/memory.js
index ce45022a9..375f0606d 100644
--- a/modules/pc8080/lib/memory.js
+++ b/modules/pc8080/lib/memory.js
@@ -28,10 +28,12 @@
 
 "use strict";
 
-var Str          = require("../../shared/es6/strlib");
-var Component    = require("../../shared/es6/component");
-var CPUDef8080   = require("./cpudef");
-var Messages8080 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Component = require("../../shared/es6/component");
+    var CPUDef8080 = require("./cpudef");
+    var Messages8080 = require("./messages");
+}
 
 /**
  * @class DataView
@@ -915,4 +917,4 @@ if (TYPEDARRAYS) {
     ];
 }
 
-module.exports = Memory8080;
+if (NODE) module.exports = Memory8080;
diff --git a/modules/pc8080/lib/messages.js b/modules/pc8080/lib/messages.js
index ba64deddc..c8cc82d30 100644
--- a/modules/pc8080/lib/messages.js
+++ b/modules/pc8080/lib/messages.js
@@ -91,4 +91,4 @@ Messages8080.CATEGORIES = {
     "halt":     Messages8080.HALT
 };
 
-module.exports = Messages8080;
+if (NODE) module.exports = Messages8080;
diff --git a/modules/pc8080/lib/panel.js b/modules/pc8080/lib/panel.js
index ee63a0faa..f62a8dbfd 100644
--- a/modules/pc8080/lib/panel.js
+++ b/modules/pc8080/lib/panel.js
@@ -28,12 +28,14 @@
 
 "use strict";
 
-var Web        = require("../../shared/es6/weblib");
-var Component  = require("../../shared/es6/component");
-var PC8080     = require("./defines");
-var Bus8080    = require("./bus");
-var CPUDef8080 = require("./cpudef");
-var Memory8080 = require("./memory");
+if (NODE) {
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+    var PC8080 = require("./defines");
+    var Bus8080 = require("./bus");
+    var CPUDef8080 = require("./cpudef");
+    var Memory8080 = require("./memory");
+}
 
 /**
  * TODO: The Closure Compiler treats ES6 classes as 'struct' rather than 'dict' by default,
@@ -181,4 +183,4 @@ class Panel8080 extends Component {
  */
 Web.onInit(Panel8080.init);
 
-module.exports = Panel8080;
+if (NODE) module.exports = Panel8080;
diff --git a/modules/pc8080/lib/ram.js b/modules/pc8080/lib/ram.js
index 019d92821..2b14e1687 100644
--- a/modules/pc8080/lib/ram.js
+++ b/modules/pc8080/lib/ram.js
@@ -28,14 +28,16 @@
 
 "use strict";
 
-var Str        = require("../../shared/es6/strlib");
-var Web        = require("../../shared/es6/weblib");
-var DumpAPI    = require("../../shared/es6/dumpapi");
-var Component  = require("../../shared/es6/component");
-var State      = require("../../shared/es6/state");
-var PC8080     = require("./defines");
-var CPUDef8080 = require("./cpudef");
-var Memory8080 = require("./memory");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var DumpAPI = require("../../shared/es6/dumpapi");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var PC8080 = require("./defines");
+    var CPUDef8080 = require("./cpudef");
+    var Memory8080 = require("./memory");
+}
 
 /**
  * TODO: The Closure Compiler treats ES6 classes as 'struct' rather than 'dict' by default,
@@ -396,4 +398,4 @@ RAM8080.CPM.VECTORS = [RAM8080.CPM.BIOS.VECTOR, RAM8080.CPM.BDOS.VECTOR];
  */
 Web.onInit(RAM8080.init);
 
-module.exports = RAM8080;
+if (NODE) module.exports = RAM8080;
diff --git a/modules/pc8080/lib/rom.js b/modules/pc8080/lib/rom.js
index bfb346d68..b56e6b3dd 100644
--- a/modules/pc8080/lib/rom.js
+++ b/modules/pc8080/lib/rom.js
@@ -28,12 +28,14 @@
 
 "use strict";
 
-var Str        = require("../../shared/es6/strlib");
-var Web        = require("../../shared/es6/weblib");
-var DumpAPI    = require("../../shared/es6/dumpapi");
-var Component  = require("../../shared/es6/component");
-var PC8080     = require("./defines");
-var Memory8080 = require("./memory");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var DumpAPI = require("../../shared/es6/dumpapi");
+    var Component = require("../../shared/es6/component");
+    var PC8080 = require("./defines");
+    var Memory8080 = require("./memory");
+}
 
 /**
  * TODO: The Closure Compiler treats ES6 classes as 'struct' rather than 'dict' by default,
@@ -377,4 +379,4 @@ class ROM8080 extends Component {
  */
 Web.onInit(ROM8080.init);
 
-module.exports = ROM8080;
+if (NODE) module.exports = ROM8080;
diff --git a/modules/pc8080/lib/serial.js b/modules/pc8080/lib/serial.js
index 5501050fb..ca8df8056 100644
--- a/modules/pc8080/lib/serial.js
+++ b/modules/pc8080/lib/serial.js
@@ -28,12 +28,14 @@
 
 "use strict";
 
-var Str          = require("../../shared/es6/strlib");
-var Web          = require("../../shared/es6/weblib");
-var Component    = require("../../shared/es6/component");
-var State        = require("../../shared/es6/state");
-var PC8080       = require("./defines");
-var Messages8080 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var PC8080 = require("./defines");
+    var Messages8080 = require("./messages");
+}
 
 /**
  * TODO: The Closure Compiler treats ES6 classes as 'struct' rather than 'dict' by default,
@@ -971,4 +973,4 @@ SerialPort8080.aPortOutput = {
  */
 Web.onInit(SerialPort8080.init);
 
-module.exports = SerialPort8080;
+if (NODE) module.exports = SerialPort8080;
diff --git a/modules/pc8080/lib/video.js b/modules/pc8080/lib/video.js
index 087fadd51..861699000 100644
--- a/modules/pc8080/lib/video.js
+++ b/modules/pc8080/lib/video.js
@@ -28,15 +28,17 @@
 
 "use strict";
 
-var Str          = require("../../shared/es6/strlib");
-var Web          = require("../../shared/es6/weblib");
-var DumpAPI      = require("../../shared/es6/dumpapi");
-var Component    = require("../../shared/es6/component");
-var State        = require("../../shared/es6/state");
-var PC8080       = require("./defines");
-var ChipSet8080  = require("./chipset");
-var Memory8080   = require("./memory");
-var Messages8080 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var DumpAPI = require("../../shared/es6/dumpapi");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var PC8080 = require("./defines");
+    var ChipSet8080 = require("./chipset");
+    var Memory8080 = require("./memory");
+    var Messages8080 = require("./messages");
+}
 
 /**
  * TODO: The Closure Compiler treats ES6 classes as 'struct' rather than 'dict' by default,
@@ -1501,4 +1503,4 @@ Video8080.VT100 = {
  */
 Web.onInit(Video8080.init);
 
-module.exports = Video8080;
+if (NODE) module.exports = Video8080;
diff --git a/modules/pdp11/lib/bus.js b/modules/pdp11/lib/bus.js
index 969f42e8b..52ad8e981 100644
--- a/modules/pdp11/lib/bus.js
+++ b/modules/pdp11/lib/bus.js
@@ -32,13 +32,15 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Usr = require("../../shared/es6/usrlib");
-var Component = require("../../shared/es6/component");
-var State = require("../../shared/es6/state");
-var PDP11 = require("./defines");
-var MemoryPDP11 = require("./memory");
-var MessagesPDP11 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Usr = require("../../shared/es6/usrlib");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var PDP11 = require("./defines");
+    var MemoryPDP11 = require("./memory");
+    var MessagesPDP11 = require("./messages");
+}
 
 /*
  * Data types used by scanMemory()
@@ -1422,4 +1424,4 @@ BusPDP11.IOController = {
     }
 };
 
-module.exports = BusPDP11;
+if (NODE) module.exports = BusPDP11;
diff --git a/modules/pdp11/lib/computer.js b/modules/pdp11/lib/computer.js
index ce9195492..c60ab9e0a 100644
--- a/modules/pdp11/lib/computer.js
+++ b/modules/pdp11/lib/computer.js
@@ -32,16 +32,18 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Usr = require("../../shared/es6/usrlib");
-var Web = require("../../shared/es6/weblib");
-var UserAPI = require("../../shared/es6/userapi");
-var ReportAPI = require("../../shared/es6/reportapi");
-var Component = require("../../shared/es6/component");
-var State = require("../../shared/es6/state");
-var PDP11 = require("./defines");
-var BusPDP11 = require("./bus");
-var MessagesPDP11 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Usr = require("../../shared/es6/usrlib");
+    var Web = require("../../shared/es6/weblib");
+    var UserAPI = require("../../shared/es6/userapi");
+    var ReportAPI = require("../../shared/es6/reportapi");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var PDP11 = require("./defines");
+    var BusPDP11 = require("./bus");
+    var MessagesPDP11 = require("./messages");
+}
 
 class ComputerPDP11 extends Component {
     /**
@@ -1632,4 +1634,4 @@ Web.onInit(ComputerPDP11.init);
 Web.onShow(ComputerPDP11.show);
 Web.onExit(ComputerPDP11.exit);
 
-module.exports = ComputerPDP11;
+if (NODE) module.exports = ComputerPDP11;
diff --git a/modules/pdp11/lib/cpu.js b/modules/pdp11/lib/cpu.js
index 2e4f98cb4..4caecbad7 100644
--- a/modules/pdp11/lib/cpu.js
+++ b/modules/pdp11/lib/cpu.js
@@ -32,10 +32,12 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Usr = require("../../shared/es6/usrlib");
-var Component = require("../../shared/es6/component");
-var MessagesPDP11 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Usr = require("../../shared/es6/usrlib");
+    var Component = require("../../shared/es6/component");
+    var MessagesPDP11 = require("./messages");
+}
 
 /*
  * A word (or more) about PDP-11 speeds:
@@ -1246,4 +1248,4 @@ CPUPDP11.YIELDS_PER_STATUS      = 15;           // every 15 yields (ie, twice pe
 
 CPUPDP11.BUTTONS = ["power", "reset"];
 
-module.exports = CPUPDP11;
+if (NODE) module.exports = CPUPDP11;
diff --git a/modules/pdp11/lib/cpuops.js b/modules/pdp11/lib/cpuops.js
index 4db24ddf2..ccc445282 100644
--- a/modules/pdp11/lib/cpuops.js
+++ b/modules/pdp11/lib/cpuops.js
@@ -32,7 +32,9 @@
 
 "use strict";
 
-var PDP11 = require("./defines");
+if (NODE) {
+    var PDP11 = require("./defines");
+}
 
 /*
  * Decoding starts at the bottom of this file, in op1120() and op1145().
diff --git a/modules/pdp11/lib/cpustate.js b/modules/pdp11/lib/cpustate.js
index d13ac429d..dc55e389a 100644
--- a/modules/pdp11/lib/cpustate.js
+++ b/modules/pdp11/lib/cpustate.js
@@ -32,15 +32,17 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Web = require("../../shared/es6/weblib");
-var Component = require("../../shared/es6/component");
-var State = require("../../shared/es6/state");
-var PDP11 = require("./defines");
-var BusPDP11 = require("./bus");
-var CPUPDP11 = require("./cpu");
-var MessagesPDP11 = require("./messages");
-var MemoryPDP11 = require("./memory");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var PDP11 = require("./defines");
+    var BusPDP11 = require("./bus");
+    var CPUPDP11 = require("./cpu");
+    var MessagesPDP11 = require("./messages");
+    var MemoryPDP11 = require("./memory");
+}
 
 /*
  * Overview of Device Interrupt Support
@@ -2969,4 +2971,4 @@ class CPUStatePDP11 extends CPUPDP11 {
  */
 Web.onInit(CPUStatePDP11.init);
 
-module.exports = CPUStatePDP11;
+if (NODE) module.exports = CPUStatePDP11;
diff --git a/modules/pdp11/lib/debugger.js b/modules/pdp11/lib/debugger.js
index ad6fb7add..2c6add3ab 100644
--- a/modules/pdp11/lib/debugger.js
+++ b/modules/pdp11/lib/debugger.js
@@ -32,17 +32,19 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Usr = require("../../shared/es6/usrlib");
-var Web = require("../../shared/es6/weblib");
-var Component = require("../../shared/es6/component");
-var Debugger = require("../../shared/es6/debugger");
-var Keys = require("../../shared/es6/keys");
-var State = require("../../shared/es6/state");
-var PDP11 = require("./defines");
-var BusPDP11 = require("./bus");
-var MemoryPDP11 = require("./memory");
-var MessagesPDP11 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Usr = require("../../shared/es6/usrlib");
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+    var Debugger = require("../../shared/es6/debugger");
+    var Keys = require("../../shared/es6/keys");
+    var State = require("../../shared/es6/state");
+    var PDP11 = require("./defines");
+    var BusPDP11 = require("./bus");
+    var MemoryPDP11 = require("./memory");
+    var MessagesPDP11 = require("./messages");
+}
 
 /**
  * DebuggerPDP11 Address Object
@@ -4376,4 +4378,4 @@ if (DEBUGGER) {
 
 }   // endif DEBUGGER
 
-module.exports = DebuggerPDP11;
+if (NODE) module.exports = DebuggerPDP11;
diff --git a/modules/pdp11/lib/device.js b/modules/pdp11/lib/device.js
index ec9aaf173..91b67aa25 100644
--- a/modules/pdp11/lib/device.js
+++ b/modules/pdp11/lib/device.js
@@ -32,16 +32,18 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Web = require("../../shared/es6/weblib");
-var Component = require("../../shared/es6/component");
-var PDP11 = require("./defines");
-var BusPDP11 = require("./bus");
-var MemoryPDP11 = require("./memory");
-var MessagesPDP11 = require("./messages");
-var PC11 = require("./pc11");
-var RL11 = require("./rl11");
-var RK11 = require("./rk11");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+    var PDP11 = require("./defines");
+    var BusPDP11 = require("./bus");
+    var MemoryPDP11 = require("./memory");
+    var MessagesPDP11 = require("./messages");
+    var PC11 = require("./pc11");
+    var RL11 = require("./rl11");
+    var RK11 = require("./rk11");
+}
 
 class DevicePDP11 extends Component {
     /**
@@ -1188,4 +1190,4 @@ DevicePDP11.UNIBUS_IOTABLE = {
  */
 Web.onInit(DevicePDP11.init);
 
-module.exports = DevicePDP11;
+if (NODE) module.exports = DevicePDP11;
diff --git a/modules/pdp11/lib/disk.js b/modules/pdp11/lib/disk.js
index 2070a7927..a54759875 100644
--- a/modules/pdp11/lib/disk.js
+++ b/modules/pdp11/lib/disk.js
@@ -45,12 +45,14 @@
  *  to further reduce some of the duplication between them, but the above functionality is a good start.
  */
 
-var Str = require("../../shared/es6/strlib");
-var Web = require("../../shared/es6/weblib");
-var DiskAPI = require("../../shared/es6/diskapi");
-var DumpAPI = require("../../shared/es6/dumpapi");
-var Component = require("../../shared/es6/component");
-var MessagesPDP11 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var DiskAPI = require("../../shared/es6/diskapi");
+    var DumpAPI = require("../../shared/es6/dumpapi");
+    var Component = require("../../shared/es6/component");
+    var MessagesPDP11 = require("./messages");
+}
 
 /**
  * Every Sector object (once loaded, parsed, and "normalized") should have ALL of the following named properties:
@@ -1238,4 +1240,4 @@ class DiskPDP11 extends Component {
  */
 DiskPDP11.nDisks = 0;
 
-module.exports = DiskPDP11;
+if (NODE) module.exports = DiskPDP11;
diff --git a/modules/pdp11/lib/keyboard.js b/modules/pdp11/lib/keyboard.js
index 8fa6b85e7..889aecc8e 100644
--- a/modules/pdp11/lib/keyboard.js
+++ b/modules/pdp11/lib/keyboard.js
@@ -32,10 +32,12 @@
 
 "use strict";
 
-var Web = require("../../shared/es6/weblib");
-var Component = require("../../shared/es6/component");
-var PDP11 = require("./defines");
-var MessagesPDP11 = require("./messages");
+if (NODE) {
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+    var PDP11 = require("./defines");
+    var MessagesPDP11 = require("./messages");
+}
 
 class KeyboardPDP11 extends Component {
     /**
@@ -108,4 +110,4 @@ KeyboardPDP11.MINPRESSTIME = 100;            // 100ms
  */
 Web.onInit(KeyboardPDP11.init);
 
-module.exports = KeyboardPDP11;
+if (NODE) module.exports = KeyboardPDP11;
diff --git a/modules/pdp11/lib/memory.js b/modules/pdp11/lib/memory.js
index b2a252552..1b520d14d 100644
--- a/modules/pdp11/lib/memory.js
+++ b/modules/pdp11/lib/memory.js
@@ -32,9 +32,11 @@
 
 "use strict";
 
-var Component = require("../../shared/es6/component");
-var PDP11 = require("./defines");
-var MessagesPDP11 = require("./messages");
+if (NODE) {
+    var Component = require("../../shared/es6/component");
+    var PDP11 = require("./defines");
+    var MessagesPDP11 = require("./messages");
+}
 
 /**
  * @class DataView
@@ -1006,4 +1008,4 @@ var littleEndian = (TYPEDARRAYS? (function() {
     return new Uint16Array(buffer)[0] === 256;
 })() : false);
 
-module.exports = MemoryPDP11;
+if (NODE) module.exports = MemoryPDP11;
diff --git a/modules/pdp11/lib/messages.js b/modules/pdp11/lib/messages.js
index fff8ba6c2..ec2ed2761 100644
--- a/modules/pdp11/lib/messages.js
+++ b/modules/pdp11/lib/messages.js
@@ -117,4 +117,4 @@ MessagesPDP11.CATEGORIES = {
     "halt":     MessagesPDP11.HALT
 };
 
-module.exports = MessagesPDP11;
+if (NODE) module.exports = MessagesPDP11;
diff --git a/modules/pdp11/lib/panel.js b/modules/pdp11/lib/panel.js
index c02ee97d9..4586f270e 100644
--- a/modules/pdp11/lib/panel.js
+++ b/modules/pdp11/lib/panel.js
@@ -32,12 +32,14 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Web = require("../../shared/es6/weblib");
-var Component = require("../../shared/es6/component");
-var PDP11 = require("./defines");
-var BusPDP11 = require("./bus");
-var MessagesPDP11 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+    var PDP11 = require("./defines");
+    var BusPDP11 = require("./bus");
+    var MessagesPDP11 = require("./messages");
+}
 
 class PanelPDP11 extends Component {
     /**
@@ -1148,4 +1150,4 @@ PanelPDP11.UNIBUS_IOTABLE = {
  */
 Web.onInit(PanelPDP11.init);
 
-module.exports = PanelPDP11;
+if (NODE) module.exports = PanelPDP11;
diff --git a/modules/pdp11/lib/pc11.js b/modules/pdp11/lib/pc11.js
index a738aa5b1..56e3c16dc 100644
--- a/modules/pdp11/lib/pc11.js
+++ b/modules/pdp11/lib/pc11.js
@@ -28,13 +28,15 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Web = require("../../shared/es6/weblib");
-var DumpAPI = require("../../shared/es6/dumpapi");
-var Component = require("../../shared/es6/component");
-var State = require("../../shared/es6/state");
-var PDP11 = require("./defines");
-var MessagesPDP11 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var DumpAPI = require("../../shared/es6/dumpapi");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var PDP11 = require("./defines");
+    var MessagesPDP11 = require("./messages");
+}
 
 class PC11 extends Component {
     /**
@@ -945,4 +947,4 @@ PC11.UNIBUS_IOTABLE = {
     [PDP11.UNIBUS.PRB]:     /* 177552 */    [null, null, PC11.prototype.readPRB,    PC11.prototype.writePRB,    "PRB"]
 };
 
-module.exports = PC11;
+if (NODE) module.exports = PC11;
diff --git a/modules/pdp11/lib/ram.js b/modules/pdp11/lib/ram.js
index f55370279..af57b002b 100644
--- a/modules/pdp11/lib/ram.js
+++ b/modules/pdp11/lib/ram.js
@@ -32,13 +32,15 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Web = require("../../shared/es6/weblib");
-var DumpAPI = require("../../shared/es6/dumpapi");
-var Component = require("../../shared/es6/component");
-var PDP11 = require("./defines");
-var MemoryPDP11 = require("./memory");
-var MessagesPDP11 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var DumpAPI = require("../../shared/es6/dumpapi");
+    var Component = require("../../shared/es6/component");
+    var PDP11 = require("./defines");
+    var MemoryPDP11 = require("./memory");
+    var MessagesPDP11 = require("./messages");
+}
 
 class RAMPDP11 extends Component {
     /**
@@ -415,4 +417,4 @@ class RAMPDP11 extends Component {
  */
 Web.onInit(RAMPDP11.init);
 
-module.exports = RAMPDP11;
+if (NODE) module.exports = RAMPDP11;
diff --git a/modules/pdp11/lib/rk11.js b/modules/pdp11/lib/rk11.js
index e8c9a2c57..184063a78 100644
--- a/modules/pdp11/lib/rk11.js
+++ b/modules/pdp11/lib/rk11.js
@@ -28,14 +28,16 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Web = require("../../shared/es6/weblib");
-var DiskAPI = require("../../shared/es6/diskapi");
-var Component = require("../../shared/es6/component");
-var State = require("../../shared/es6/state");
-var PDP11 = require("./defines");
-var MessagesPDP11 = require("./messages");
-var DiskPDP11 = require("./disk");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var DiskAPI = require("../../shared/es6/diskapi");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var PDP11 = require("./defines");
+    var MessagesPDP11 = require("./messages");
+    var DiskPDP11 = require("./disk");
+}
 
 class RK11 extends Component {
     /**
@@ -1437,4 +1439,4 @@ RK11.UNIBUS_IOTABLE = {
     [PDP11.UNIBUS.RKDB]:     /* 177416 */    [null, null, RK11.prototype.readRKDB,  RK11.prototype.writeRKDB,   "RKDB"]
 };
 
-module.exports = RK11;
+if (NODE) module.exports = RK11;
diff --git a/modules/pdp11/lib/rl11.js b/modules/pdp11/lib/rl11.js
index a59c4c0a9..37a608f0b 100644
--- a/modules/pdp11/lib/rl11.js
+++ b/modules/pdp11/lib/rl11.js
@@ -28,14 +28,16 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Web = require("../../shared/es6/weblib");
-var DiskAPI = require("../../shared/es6/diskapi");
-var Component = require("../../shared/es6/component");
-var State = require("../../shared/es6/state");
-var PDP11 = require("./defines");
-var MessagesPDP11 = require("./messages");
-var DiskPDP11 = require("./disk");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var DiskAPI = require("../../shared/es6/diskapi");
+    var Component = require("../../shared/es6/component");
+    var State = require("../../shared/es6/state");
+    var PDP11 = require("./defines");
+    var MessagesPDP11 = require("./messages");
+    var DiskPDP11 = require("./disk");
+}
 
 class RL11 extends Component {
     /**
@@ -1372,4 +1374,4 @@ RL11.UNIBUS_IOTABLE = {
     [PDP11.UNIBUS.RLBE]:     /* 174410 */    [null, null, RL11.prototype.readRLBE,  RL11.prototype.writeRLBE,   "RLBE"]
 };
 
-module.exports = RL11;
+if (NODE) module.exports = RL11;
diff --git a/modules/pdp11/lib/rom.js b/modules/pdp11/lib/rom.js
index 164cd62b5..0b7646120 100644
--- a/modules/pdp11/lib/rom.js
+++ b/modules/pdp11/lib/rom.js
@@ -32,14 +32,16 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Web = require("../../shared/es6/weblib");
-var DumpAPI = require("../../shared/es6/dumpapi");
-var Component = require("../../shared/es6/component");
-var PDP11 = require("./defines");
-var BusPDP11 = require("./bus");
-var MemoryPDP11 = require("./memory");
-var MessagesPDP11 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var DumpAPI = require("../../shared/es6/dumpapi");
+    var Component = require("../../shared/es6/component");
+    var PDP11 = require("./defines");
+    var BusPDP11 = require("./bus");
+    var MemoryPDP11 = require("./memory");
+    var MessagesPDP11 = require("./messages");
+}
 
 class ROMPDP11 extends Component {
     /**
@@ -390,4 +392,4 @@ class ROMPDP11 extends Component {
  */
 Web.onInit(ROMPDP11.init);
 
-module.exports = ROMPDP11;
+if (NODE) module.exports = ROMPDP11;
diff --git a/modules/pdp11/lib/serial.js b/modules/pdp11/lib/serial.js
index 63e2a8f98..06f44ebe9 100644
--- a/modules/pdp11/lib/serial.js
+++ b/modules/pdp11/lib/serial.js
@@ -32,13 +32,15 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Web = require("../../shared/es6/weblib");
-var Component = require("../../shared/es6/component");
-var Keys = require("../../shared/es6/keys");
-var State = require("../../shared/es6/state");
-var PDP11 = require("./defines");
-var MessagesPDP11 = require("./messages");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+    var Keys = require("../../shared/es6/keys");
+    var State = require("../../shared/es6/state");
+    var PDP11 = require("./defines");
+    var MessagesPDP11 = require("./messages");
+}
 
 /**
  * Since the Closure Compiler treats ES6 classes as @struct rather than @dict by default,
@@ -903,4 +905,4 @@ SerialPortPDP11.UNIBUS_IOTABLE = {
  */
 Web.onInit(SerialPortPDP11.init);
 
-module.exports = SerialPortPDP11;
+if (NODE) module.exports = SerialPortPDP11;
diff --git a/modules/shared/es6/component.js b/modules/shared/es6/component.js
index 72e9c7231..49b697993 100644
--- a/modules/shared/es6/component.js
+++ b/modules/shared/es6/component.js
@@ -49,8 +49,10 @@
 
 "use strict";
 
-var Usr = require("../../shared/es6/usrlib");
-var Web = require("../../shared/es6/weblib");
+if (NODE) {
+    var Usr = require("../../shared/es6/usrlib");
+    var Web = require("../../shared/es6/weblib");
+}
 
 /**
  * Since the Closure Compiler treats ES6 classes as @struct rather than @dict by default,
@@ -1062,4 +1064,4 @@ if (!Function.prototype.bind) {
     };
 }
 
-module.exports = Component;
+if (NODE) module.exports = Component;
diff --git a/modules/shared/es6/debugger.js b/modules/shared/es6/debugger.js
index 115e563b1..ddad4d44f 100644
--- a/modules/shared/es6/debugger.js
+++ b/modules/shared/es6/debugger.js
@@ -28,8 +28,10 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Component = require("../../shared/es6/component");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Component = require("../../shared/es6/component");
+}
 
 /**
  * Debugger Address Object
@@ -699,4 +701,4 @@ if (DEBUGGER) {
 
 }   // endif DEBUGGER
 
-module.exports = Debugger;
+if (NODE) module.exports = Debugger;
diff --git a/modules/shared/es6/diskapi.js b/modules/shared/es6/diskapi.js
index 0f6988b13..f06355871 100644
--- a/modules/shared/es6/diskapi.js
+++ b/modules/shared/es6/diskapi.js
@@ -239,4 +239,4 @@ DiskAPI.ATTR = {
     ARCHIVE:        0x20        // PC-DOS 2.0 and up
 };
 
-module.exports = DiskAPI;
+if (NODE) module.exports = DiskAPI;
diff --git a/modules/shared/es6/dumpapi.js b/modules/shared/es6/dumpapi.js
index 691f76318..1a64ae6eb 100644
--- a/modules/shared/es6/dumpapi.js
+++ b/modules/shared/es6/dumpapi.js
@@ -82,4 +82,4 @@ var DumpAPI = {
 DumpAPI.asDiskCommands = [DumpAPI.QUERY.DIR, DumpAPI.QUERY.DISK, DumpAPI.QUERY.PATH];
 DumpAPI.asFileCommands = [DumpAPI.QUERY.FILE];
 
-module.exports = DumpAPI;
+if (NODE) module.exports = DumpAPI;
diff --git a/modules/shared/es6/embed.js b/modules/shared/es6/embed.js
index e25842a46..bacf0cd52 100644
--- a/modules/shared/es6/embed.js
+++ b/modules/shared/es6/embed.js
@@ -28,9 +28,11 @@
 
 "use strict";
 
-var Str = require("../../shared/es6/strlib");
-var Web = require("../../shared/es6/weblib");
-var Component = require("../../shared/es6/component");
+if (NODE) {
+    var Str = require("../../shared/es6/strlib");
+    var Web = require("../../shared/es6/weblib");
+    var Component = require("../../shared/es6/component");
+}
 
 /*
  * We now support asynchronous XML and XSL file loads; simply set fAsync (below) to true.
diff --git a/modules/shared/es6/keys.js b/modules/shared/es6/keys.js
index bdf8a094a..22ac9795a 100644
--- a/modules/shared/es6/keys.js
+++ b/modules/shared/es6/keys.js
@@ -248,4 +248,4 @@ Keys.SHIFTED_KEYCODES[Keys.KEYCODE.FF_DASH]   = Keys.ASCII['_'];
 Keys.SHIFTED_KEYCODES[Keys.KEYCODE.FF_EQUALS] = Keys.ASCII['+'];
 Keys.SHIFTED_KEYCODES[Keys.KEYCODE.FF_SEMI]   = Keys.ASCII[':'];
 
-module.exports = Keys;
+if (NODE) module.exports = Keys;
diff --git a/modules/shared/es6/netlib.js b/modules/shared/es6/netlib.js
index 9b1c62fce..bfe674b1c 100644
--- a/modules/shared/es6/netlib.js
+++ b/modules/shared/es6/netlib.js
@@ -28,11 +28,13 @@
 
 "use strict";
 
-var fs = require("fs");
-var http = require("http");
-var path = require("path");
-var url = require("url");
-var Str = require("../../shared/es6/strlib");
+if (NODE) {
+    var fs = require("fs");
+    var http = require("http");
+    var path = require("path");
+    var url = require("url");
+    var Str = require("../../shared/es6/strlib");
+}
 
 class Net {
     /**
@@ -389,4 +391,4 @@ Net.REVEAL_PDFS     = "pdfs";
 Net.asPropagate     = [Net.GORT_COMMAND, "autostart"];
 Net.sServerRoot     = null;
 
-module.exports = Net;
+if (NODE) module.exports = Net;
diff --git a/modules/shared/es6/proclib.js b/modules/shared/es6/proclib.js
index fd377d790..5b861fa46 100644
--- a/modules/shared/es6/proclib.js
+++ b/modules/shared/es6/proclib.js
@@ -84,4 +84,4 @@ class Proc {
     }
 }
 
-module.exports = Proc;
+if (NODE) module.exports = Proc;
diff --git a/modules/shared/es6/reportapi.js b/modules/shared/es6/reportapi.js
index 84f007639..e54a8b5d8 100644
--- a/modules/shared/es6/reportapi.js
+++ b/modules/shared/es6/reportapi.js
@@ -46,4 +46,4 @@ var ReportAPI = {
     }
 };
 
-module.exports = ReportAPI;
+if (NODE) module.exports = ReportAPI;
diff --git a/modules/shared/es6/state.js b/modules/shared/es6/state.js
index 70f6f4f3c..8f6d9beb9 100644
--- a/modules/shared/es6/state.js
+++ b/modules/shared/es6/state.js
@@ -392,4 +392,4 @@ class State {
     }
 }
 
-module.exports = State;
+if (NODE) module.exports = State;
diff --git a/modules/shared/es6/strlib.js b/modules/shared/es6/strlib.js
index 2d6e6b091..a9dbf0bf8 100644
--- a/modules/shared/es6/strlib.js
+++ b/modules/shared/es6/strlib.js
@@ -632,4 +632,4 @@ Str.TYPES = {
     ARRAY:      8
 };
 
-module.exports = Str;
+if (NODE) module.exports = Str;
diff --git a/modules/shared/es6/userapi.js b/modules/shared/es6/userapi.js
index d954cac4a..1a24b3a77 100644
--- a/modules/shared/es6/userapi.js
+++ b/modules/shared/es6/userapi.js
@@ -65,4 +65,4 @@ var UserAPI = {
     }
 };
 
-module.exports = UserAPI;
+if (NODE) module.exports = UserAPI;
diff --git a/modules/shared/es6/usrlib.js b/modules/shared/es6/usrlib.js
index 3a03ddb33..4e65cc7fa 100644
--- a/modules/shared/es6/usrlib.js
+++ b/modules/shared/es6/usrlib.js
@@ -321,4 +321,4 @@ Usr.asDays = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
 Usr.asMonths = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
 Usr.aMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 
-module.exports = Usr;
+if (NODE) module.exports = Usr;
diff --git a/modules/shared/es6/weblib.js b/modules/shared/es6/weblib.js
index e9449b2e9..76d3f869f 100644
--- a/modules/shared/es6/weblib.js
+++ b/modules/shared/es6/weblib.js
@@ -28,8 +28,10 @@
 
 "use strict";
 
-var Component = require("../../shared/es6/component");
-var ReportAPI = require("../../shared/es6/reportapi");
+if (NODE) {
+    var Component = require("../../shared/es6/component");
+    var ReportAPI = require("../../shared/es6/reportapi");
+}
 
 /*
  * According to http://www.w3schools.com/jsref/jsref_obj_global.asp, these are the *global* properties
@@ -1011,4 +1013,4 @@ Web.onPageEvent(Web.isUserAgent("Opera") || Web.isUserAgent("iOS")? 'onunload' :
     Web.doPageEvent(Web.aPageEventHandlers['exit']);
 });
 
-module.exports = Web;
+if (NODE) module.exports = Web;
diff --git a/modules/shared/lib/netlib.js b/modules/shared/lib/netlib.js
index 6cbcfbcf5..ca6202ef0 100644
--- a/modules/shared/lib/netlib.js
+++ b/modules/shared/lib/netlib.js
@@ -38,7 +38,6 @@ if (NODE) {
     var http = require("http");
     var path = require("path");
     var url = require("url");
-    var str = require("./strlib");
 }
 
 /*
@@ -347,10 +346,6 @@ net.getResource = function(sURL, dataPost, fAsync, done)
         if (!sServerRoot) {
             sServerRoot = path.join(path.dirname(fs.realpathSync(__filename)), "../../../");
         }
-        /*
-         * TODO: Revisit why we pass back sBaseName instead of the original sURL....
-         */
-        var sBaseName = str.getBaseName(sURL);
         var sFile = path.join(sServerRoot, sURL);
         if (fAsync) {
             fs.readFile(sFile, {encoding: "utf8"}, function(err, s) {
@@ -361,7 +356,7 @@ net.getResource = function(sURL, dataPost, fAsync, done)
                     sResource = s;
                     nErrorCode = 0;
                 }
-                if (done) done(sBaseName, sResource, nErrorCode);
+                if (done) done(sURL, sResource, nErrorCode);
             });
         } else {
             try {
@@ -373,7 +368,7 @@ net.getResource = function(sURL, dataPost, fAsync, done)
                  */
                 console.log(err.message);
             }
-            if (done) done(sBaseName, sResource, nErrorCode);
+            if (done) done(sURL, sResource, nErrorCode);
             response = [sResource, nErrorCode];
         }
     }