diff --git a/mocha.opts b/mocha.opts
index 427b029758..af6b17a845 100644
--- a/mocha.opts
+++ b/mocha.opts
@@ -1 +1,2 @@
+--bail
 test/test.js
\ No newline at end of file
diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts
index 6a8624a601..a2e3bb281f 100644
--- a/src/generators/dom/index.ts
+++ b/src/generators/dom/index.ts
@@ -100,9 +100,10 @@ export default function dom(
 
 	generator.stylesheet.warnOnUnusedSelectors(options.onwarn);
 
-	parsed.html.children.forEach((node: Node) => {
-		visit(generator, block, state, node, [], []);
-	});
+	// parsed.html.children.forEach((node: Node) => {
+	// 	visit(generator, block, state, node, [], []);
+	// });
+	parsed.html.build();
 
 	const builder = new CodeBuilder();
 	const computationBuilder = new CodeBuilder();
diff --git a/src/generators/nodes/Attribute.ts b/src/generators/nodes/Attribute.ts
new file mode 100644
index 0000000000..daaa9e6b7f
--- /dev/null
+++ b/src/generators/nodes/Attribute.ts
@@ -0,0 +1,7 @@
+import Node from './shared/Node';
+
+export default class Attribute extends Node {
+	name: string;
+	value: true | Node[]
+	expression: Node
+}
\ No newline at end of file
diff --git a/src/generators/nodes/Element.ts b/src/generators/nodes/Element.ts
index 66c9f84be9..f659dbd50f 100644
--- a/src/generators/nodes/Element.ts
+++ b/src/generators/nodes/Element.ts
@@ -1,11 +1,17 @@
 import Node from './shared/Node';
 import Block from '../dom/Block';
 import State from '../dom/State';
+import Attribute from './Attribute';
+import * as namespaces from '../../utils/namespaces';
+
+const meta: Record<string, any> = {
+	':Window': {}, // TODO this should be dealt with in walkTemplate
+};
 
 export default class Element extends Node {
 	type: 'Element';
 	name: string;
-	attributes: Node[]; // TODO have more specific Attribute type
+	attributes: Attribute[]; // TODO have more specific Attribute type
 	children: Node[];
 
 	init(
@@ -21,7 +27,7 @@ export default class Element extends Node {
 			this.cannotUseInnerHTML();
 		}
 
-		this.attributes.forEach((attribute: Node) => {
+		this.attributes.forEach(attribute => {
 			if (attribute.type === 'Attribute' && attribute.value !== true) {
 				attribute.value.forEach((chunk: Node) => {
 					if (chunk.type !== 'Text') {
@@ -70,11 +76,11 @@ export default class Element extends Node {
 		//   <option>{{foo}}</option>
 		//   <option value='{{foo}}'>{{foo}}</option>
 		if (this.name === 'option' && !valueAttribute) {
-			this.attributes.push({
+			this.attributes.push(new Attribute({
 				type: 'Attribute',
 				name: 'value',
 				value: this.children
-			});
+			}));
 		}
 
 		// special case — in a case like this...
@@ -88,7 +94,7 @@ export default class Element extends Node {
 		// so that if `foo.qux` changes, we know that we need to
 		// mark `bar` and `baz` as dirty too
 		if (this.name === 'select') {
-			const binding = this.attributes.find((node: Node) => node.type === 'Binding' && node.name === 'value');
+			const binding = this.attributes.find(node => node.type === 'Binding' && node.name === 'value');
 			if (binding) {
 				// TODO does this also apply to e.g. `<input type='checkbox' bind:group='foo'>`?
 				const dependencies = binding.metadata.dependencies;
@@ -132,6 +138,294 @@ export default class Element extends Node {
 		}
 	}
 
+	build(
+		block: Block,
+		state: State,
+		node: Node,
+		elementStack: Node[],
+		componentStack: Node[]
+	) {
+		if (this.name in meta) {
+			return meta[this.name](generator, block, this);
+		}
+
+		if (this.name === 'slot') { // TODO deal with in walkTemplate
+			if (this.generator.customElement) {
+				const slotName = getStaticAttributeValue(this, 'name') || 'default';
+				this.generator.slots.add(slotName);
+			} else {
+				return visitSlot(this.generator, block, state, this, elementStack, componentStack);
+			}
+		}
+
+		const childState = this._state;
+		const name = childState.parentNode;
+
+		const slot = this.attributes.find((attribute: Node) => attribute.name === 'slot');
+		const parentNode = this.slotted ?
+			`${componentStack[componentStack.length - 1].var}._slotted.${slot.value[0].data}` : // TODO this looks bonkers
+			state.parentNode;
+
+		block.addVariable(name);
+		block.builders.create.addLine(
+			`${name} = ${getRenderStatement(
+				this.generator,
+				childState.namespace,
+				this.name
+			)};`
+		);
+
+		if (this.generator.hydratable) {
+			block.builders.claim.addBlock(deindent`
+				${name} = ${getClaimStatement(generator, childState.namespace, state.parentNodes, node)};
+				var ${childState.parentNodes} = @children(${name});
+			`);
+		}
+
+		if (parentNode) {
+			block.builders.mount.addLine(
+				`@appendNode(${name}, ${parentNode});`
+			);
+		} else {
+			block.builders.mount.addLine(`@insertNode(${name}, #target, anchor);`);
+
+			// TODO we eventually need to consider what happens to elements
+			// that belong to the same outgroup as an outroing element...
+			block.builders.unmount.addLine(`@detachNode(${name});`);
+		}
+
+		// add CSS encapsulation attribute
+		if (this._needsCssAttribute && !generator.customElement) {
+			generator.needsEncapsulateHelper = true;
+			block.builders.hydrate.addLine(
+				`@encapsulateStyles(${name});`
+			);
+
+			if (this._cssRefAttribute) {
+				block.builders.hydrate.addLine(
+					`@setAttribute(${name}, "svelte-ref-${this._cssRefAttribute}", "");`
+				)
+			}
+		}
+
+		if (this.name === 'textarea') {
+			// this is an egregious hack, but it's the easiest way to get <textarea>
+			// children treated the same way as a value attribute
+			if (this.children.length > 0) {
+				this.attributes.push({
+					type: 'Attribute',
+					name: 'value',
+					value: this.children,
+				});
+
+				this.children = [];
+			}
+		}
+
+		// insert static children with textContent or innerHTML
+		if (!childState.namespace && this.canUseInnerHTML && this.children.length > 0) {
+			if (this.children.length === 1 && this.children[0].type === 'Text') {
+				block.builders.create.addLine(
+					`${name}.textContent = ${stringify(this.children[0].data)};`
+				);
+			} else {
+				block.builders.create.addLine(
+					`${name}.innerHTML = ${stringify(this.children.map(toHTML).join(''))};`
+				);
+			}
+		} else {
+			this.children.forEach((child: Node) => {
+				visit(generator, block, childState, child, elementStack.concat(this), componentStack);
+			});
+		}
+
+		addBindings(generator, block, childState, this);
+
+		this.attributes.filter((a: Node) => a.type === 'Attribute').forEach((attribute: Node) => {
+			visitAttribute(generator, block, childState, this, attribute);
+		});
+
+		// event handlers
+		this.attributes.filter((a: Node) => a.type === 'EventHandler').forEach((attribute: Node) => {
+			const isCustomEvent = this.generator.events.has(attribute.name);
+			const shouldHoist = !isCustomEvent && state.inEachBlock;
+
+			const context = shouldHoist ? null : name;
+			const usedContexts: string[] = [];
+
+			if (attribute.expression) {
+				this.generator.addSourcemapLocations(attribute.expression);
+
+				const flattened = flattenReference(attribute.expression.callee);
+				if (!validCalleeObjects.has(flattened.name)) {
+					// allow event.stopPropagation(), this.select() etc
+					// TODO verify that it's a valid callee (i.e. built-in or declared method)
+					this.generator.code.prependRight(
+						attribute.expression.start,
+						`${block.alias('component')}.`
+					);
+					if (shouldHoist) childState.usesComponent = true; // this feels a bit hacky but it works!
+				}
+
+				attribute.expression.arguments.forEach((arg: Node) => {
+					const { contexts } = block.contextualise(arg, context, true);
+
+					contexts.forEach(context => {
+						if (!~usedContexts.indexOf(context)) usedContexts.push(context);
+						if (!~childState.allUsedContexts.indexOf(context))
+							childState.allUsedContexts.push(context);
+					});
+				});
+			}
+
+			const _this = context || 'this';
+			const declarations = usedContexts.map(name => {
+				if (name === 'state') {
+					if (shouldHoist) childState.usesComponent = true;
+					return `var state = ${block.alias('component')}.get();`;
+				}
+
+				const listName = block.listNames.get(name);
+				const indexName = block.indexNames.get(name);
+				const contextName = block.contexts.get(name);
+
+				return `var ${listName} = ${_this}._svelte.${listName}, ${indexName} = ${_this}._svelte.${indexName}, ${contextName} = ${listName}[${indexName}];`;
+			});
+
+			// get a name for the event handler that is globally unique
+			// if hoisted, locally unique otherwise
+			const handlerName = (shouldHoist ? generator : block).getUniqueName(
+				`${attribute.name.replace(/[^a-zA-Z0-9_$]/g, '_')}_handler`
+			);
+
+			// create the handler body
+			const handlerBody = deindent`
+				${childState.usesComponent &&
+					`var ${block.alias('component')} = ${_this}._svelte.component;`}
+				${declarations}
+				${attribute.expression ?
+					`[✂${attribute.expression.start}-${attribute.expression.end}✂];` :
+					`${block.alias('component')}.fire("${attribute.name}", event);`}
+			`;
+
+			if (isCustomEvent) {
+				block.addVariable(handlerName);
+
+				block.builders.hydrate.addBlock(deindent`
+					${handlerName} = %events-${attribute.name}.call(#component, ${name}, function(event) {
+						${handlerBody}
+					});
+				`);
+
+				block.builders.destroy.addLine(deindent`
+					${handlerName}.teardown();
+				`);
+			} else {
+				const handler = deindent`
+					function ${handlerName}(event) {
+						${handlerBody}
+					}
+				`;
+
+				if (shouldHoist) {
+					this.generator.blocks.push(handler);
+				} else {
+					block.builders.init.addBlock(handler);
+				}
+
+				block.builders.hydrate.addLine(
+					`@addListener(${name}, "${attribute.name}", ${handlerName});`
+				);
+
+				block.builders.destroy.addLine(
+					`@removeListener(${name}, "${attribute.name}", ${handlerName});`
+				);
+			}
+		});
+
+		// refs
+		this.node.attributes.filter((a: Node) => a.type === 'Ref').forEach((attribute: Node) => {
+			const ref = `#component.refs.${attribute.name}`;
+
+			block.builders.mount.addLine(
+				`${ref} = ${name};`
+			);
+
+			block.builders.destroy.addLine(
+				`if (${ref} === ${name}) ${ref} = null;`
+			);
+
+			this.generator.usesRefs = true; // so component.refs object is created
+		});
+
+		addTransitions(this.generator, block, childState, node);
+
+		if (childState.allUsedContexts.length || childState.usesComponent) {
+			const initialProps: string[] = [];
+			const updates: string[] = [];
+
+			if (childState.usesComponent) {
+				initialProps.push(`component: #component`);
+			}
+
+			childState.allUsedContexts.forEach((contextName: string) => {
+				if (contextName === 'state') return;
+
+				const listName = block.listNames.get(contextName);
+				const indexName = block.indexNames.get(contextName);
+
+				initialProps.push(
+					`${listName}: ${listName},\n${indexName}: ${indexName}`
+				);
+				updates.push(
+					`${name}._svelte.${listName} = ${listName};\n${name}._svelte.${indexName} = ${indexName};`
+				);
+			});
+
+			if (initialProps.length) {
+				block.builders.hydrate.addBlock(deindent`
+					${name}._svelte = {
+						${initialProps.join(',\n')}
+					};
+				`);
+			}
+
+			if (updates.length) {
+				block.builders.update.addBlock(updates.join('\n'));
+			}
+		}
+
+		if (this.initialUpdate) {
+			block.builders.mount.addBlock(this.initialUpdate);
+		}
+
+		block.builders.claim.addLine(
+			`${childState.parentNodes}.forEach(@detachNode);`
+		);
+
+		function toHTML(node: Node) {
+			if (node.type === 'Text') return node.data;
+
+			let open = `<${node.name}`;
+
+			if (node._needsCssAttribute) {
+				open += ` ${generator.stylesheet.id}`;
+			}
+
+			if (node._cssRefAttribute) {
+				open += ` svelte-ref-${node._cssRefAttribute}`;
+			}
+
+			node.attributes.forEach((attr: Node) => {
+				open += ` ${attr.name}${stringifyAttributeValue(attr.value)}`
+			});
+
+			if (isVoidElementName(node.name)) return open + '>';
+
+			return `${open}>${node.children.map(toHTML).join('')}</${node.name}>`;
+		}
+	}
+
 	getStaticAttributeValue(name: string) {
 		const attribute = this.attributes.find(
 			(attr: Node) => attr.name.toLowerCase() === name
@@ -148,4 +442,53 @@ export default class Element extends Node {
 
 		return null;
 	}
+}
+
+function getRenderStatement(
+	generator: DomGenerator,
+	namespace: string,
+	name: string
+) {
+	if (namespace === 'http://www.w3.org/2000/svg') {
+		return `@createSvgElement("${name}")`;
+	}
+
+	if (namespace) {
+		return `document.createElementNS("${namespace}", "${name}")`;
+	}
+
+	return `@createElement("${name}")`;
+}
+
+function getClaimStatement(
+	generator: DomGenerator,
+	namespace: string,
+	nodes: string,
+	node: Node
+) {
+	const attributes = node.attributes
+		.filter((attr: Node) => attr.type === 'Attribute')
+		.map((attr: Node) => `${quoteProp(attr.name, generator.legacy)}: true`)
+		.join(', ');
+
+	const name = namespace ? node.name : node.name.toUpperCase();
+
+	return `@claimElement(${nodes}, "${name}", ${attributes
+		? `{ ${attributes} }`
+		: `{}`}, ${namespace === namespaces.svg ? true : false})`;
+}
+
+function quoteProp(name: string, legacy: boolean) {
+	const isLegacyPropName = legacy && reservedNames.has(name);
+
+	if (/[^a-zA-Z_$0-9]/.test(name) || isLegacyPropName) return `"${name}"`;
+	return name;
+}
+
+function stringifyAttributeValue(value: Node | true) {
+	if (value === true) return '';
+	if (value.length === 0) return `=""`;
+
+	const data = value[0].data;
+	return `=${JSON.stringify(data)}`;
 }
\ No newline at end of file
diff --git a/src/generators/nodes/Fragment.ts b/src/generators/nodes/Fragment.ts
index 90f4faedbf..8de7f98129 100644
--- a/src/generators/nodes/Fragment.ts
+++ b/src/generators/nodes/Fragment.ts
@@ -38,4 +38,17 @@ export default class Fragment extends Node {
 
 		this.block.hasUpdateMethod = true;
 	}
+
+	build(
+		generator: DomGenerator,
+		block: Block,
+		state: State,
+		node: Node,
+		elementStack: Node[],
+		componentStack: Node[]
+	) {
+		this.children.forEach(child => {
+			child.build(block, state, node, elementStack, componentStack);
+		});
+	}
 }
\ No newline at end of file
diff --git a/src/generators/nodes/shared/Node.ts b/src/generators/nodes/shared/Node.ts
index 95d057ba47..6d651602c2 100644
--- a/src/generators/nodes/shared/Node.ts
+++ b/src/generators/nodes/shared/Node.ts
@@ -15,6 +15,10 @@ export default class Node {
 	canUseInnerHTML: boolean;
 	var: string;
 
+	constructor(data: Record<string, any>) {
+		Object.assign(this, data);
+	}
+
 	cannotUseInnerHTML() {
 		if (this.canUseInnerHTML !== false) {
 			this.canUseInnerHTML = false;
@@ -113,6 +117,16 @@ export default class Node {
 		if (windowComponent) cleaned.unshift(windowComponent);
 	}
 
+	build(
+		block: Block,
+		state: State,
+		node: Node,
+		elementStack: Node[],
+		componentStack: Node[]
+	) {
+		// implemented by subclasses
+	}
+
 	isChildOfComponent() {
 		return this.parent ?
 			this.parent.type === 'Component' || this.parent.isChildOfComponent() :