diff --git a/src/index.ts b/src/index.ts
index 2dd5f25ac..88570c2de 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,3 +1,13 @@
+export {SystemWatcher} from "./watchers/system";
+export {HTMLWatcher} from "./watchers/html";
+export {SVGWatcher} from "./watchers/svg";
+export {CanvasWatcher} from "./watchers/canvas";
+export {UIWatcher} from "./watchers/ui";
+export {CompilerWatcher} from "./watchers/compiler";
+export {ShapeWatcher} from "./watchers/shape";
+export {EditorWatcher} from "./watchers/editor";
+export {TagBrowserWatcher} from "./watchers/tag-browser";
+
 export {Watcher, Program, appendAsEAVs, RawEAV, createId} from "./watchers/watcher";
 
 export var watcherPath = "./build/src/watchers";
diff --git a/src/watchers/canvas.ts b/src/watchers/canvas.ts
index d2c6a6e3e..d6d81ab9e 100644
--- a/src/watchers/canvas.ts
+++ b/src/watchers/canvas.ts
@@ -40,7 +40,7 @@ export interface Operation {type: OperationType, args:any, paths:RawValue[]};
 // {fillStyle: "#000000", strokeStyle: "#000000", lineWidth: 1, lineCap: "butt", lineJoin: "miter"}
 export interface PathStyle {[key:string]: RawValue|undefined, fillStyle?:string, strokeStyle?:string, lineWidth?:number, lineCap?:string, lineJoin?: string };
 
-class CanvasWatcher extends Watcher {
+export class CanvasWatcher extends Watcher {
   html:HTMLWatcher;
   canvases:RawMap<RawValue[]|undefined> = {};
   paths:RawMap<RawValue[]|undefined> = {};
@@ -393,9 +393,9 @@ class CanvasWatcher extends Watcher {
   }
 }
 
-Watcher.register("canvas", CanvasWatcher);
-
 /*
  * [#canvas/root width height children:
  *  [#canvas/rect x y width height fill? stroke?]]
  */
+
+Watcher.register("canvas", CanvasWatcher);
diff --git a/src/watchers/editor.ts b/src/watchers/editor.ts
index bdf3195e8..7c17106ba 100644
--- a/src/watchers/editor.ts
+++ b/src/watchers/editor.ts
@@ -5,7 +5,7 @@
 import {Watcher, Program, RawMap, RawValue, RawEAV, forwardDiffs, appendAsEAVs, createId} from "../watchers/watcher";
 import {CompilerWatcher} from "../watchers/compiler";
 
-class EditorWatcher extends Watcher {
+export class EditorWatcher extends Watcher {
   editor: Program;
   setup() {
     this.editor = this.createEditor();
diff --git a/src/watchers/shape.ts b/src/watchers/shape.ts
index 1768960ef..d166a13a0 100644
--- a/src/watchers/shape.ts
+++ b/src/watchers/shape.ts
@@ -1,6 +1,6 @@
 import {Watcher, RawValue, RawEAV, RawEAVC} from "./watcher";
 
-class ShapeWatcher extends Watcher {
+export class ShapeWatcher extends Watcher {
   setup() {
     this.program.attach("html");
     this.program.attach("canvas");
diff --git a/src/watchers/svg.ts b/src/watchers/svg.ts
index 6d3f55e0f..8d22c2caf 100644
--- a/src/watchers/svg.ts
+++ b/src/watchers/svg.ts
@@ -1,10 +1,9 @@
 import {Watcher, RawValue, RawEAV, RawEAVC} from "./watcher";
 import {DOMWatcher, ElemInstance} from "./dom";
 
-interface Instance extends SVGElement {__element?: RawValue, __styles?: RawValue[], __sort?: RawValue}
+export interface Instance extends SVGElement {__element?: RawValue, __styles?: RawValue[], __sort?: RawValue}
 
-
-class SVGWatcher extends DOMWatcher<Instance> {
+export class SVGWatcher extends DOMWatcher<Instance> {
   tagPrefix = "svg";
 
   createInstance(id:RawValue, element:RawValue, tagname:RawValue):Instance {
diff --git a/src/watchers/system.ts b/src/watchers/system.ts
index 1630ecd2a..3e442eca4 100644
--- a/src/watchers/system.ts
+++ b/src/watchers/system.ts
@@ -1,7 +1,7 @@
 import {Watcher} from "./watcher";
 import {ID} from "../runtime/runtime";
 
-class SystemWatcher extends Watcher {
+export class SystemWatcher extends Watcher {
   timers:{[key:string]: {timer:any, prev:Date|undefined, frame:number}} = {};
 
   getTime(changes:any[], timer:ID, frame:number, date?:Date) {