diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts
index c6d9e94df2..6a8624a601 100644
--- a/src/generators/dom/index.ts
+++ b/src/generators/dom/index.ts
@@ -12,7 +12,6 @@ import visit from './visit';
 import shared from './shared';
 import Generator from '../Generator';
 import Stylesheet from '../../css/Stylesheet';
-import preprocess from './preprocess';
 import Block from './Block';
 import { test } from '../../config';
 import { Parsed, CompileOptions, Node } from '../../interfaces';
@@ -96,7 +95,8 @@ export default function dom(
 		namespace,
 	} = generator;
 
-	const { block, state } = preprocess(generator, namespace, parsed.html);
+	parsed.html.init();
+	const { block, state } = parsed.html;
 
 	generator.stylesheet.warnOnUnusedSelectors(options.onwarn);
 
diff --git a/src/generators/dom/preprocess.ts b/src/generators/dom/preprocess.ts
deleted file mode 100644
index fdddfb1acf..0000000000
--- a/src/generators/dom/preprocess.ts
+++ /dev/null
@@ -1,587 +0,0 @@
-import Block from './Block';
-import { trimStart, trimEnd } from '../../utils/trim';
-import { assign } from '../../shared/index.js';
-import getStaticAttributeValue from '../../utils/getStaticAttributeValue';
-import isChildOfComponent from '../shared/utils/isChildOfComponent';
-import { DomGenerator } from './index';
-import { Node } from '../../interfaces';
-import { State } from './interfaces';
-
-function isElseIf(node: Node) {
-	return (
-		node && node.children.length === 1 && node.children[0].type === 'IfBlock'
-	);
-}
-
-function getChildState(parent: State, child = {}) {
-	return assign(
-		{},
-		parent,
-		{ parentNode: null, parentNodes: 'nodes' },
-		child || {}
-	);
-}
-
-function createDebuggingComment(node: Node, generator: DomGenerator) {
-	const { locate, source } = generator;
-
-	let c = node.start;
-	if (node.type === 'ElseBlock') {
-		while (source[c] !== '{') c -= 1;
-		c -= 1;
-	}
-
-	let d = node.expression ? node.expression.end : c;
-	while (source[d] !== '}') d += 1;
-	d += 2;
-
-	const start = locate(c);
-	const loc = `(${start.line + 1}:${start.column})`;
-
-	return `${loc} ${source.slice(c, d)}`.replace(/\n/g, ' ');
-}
-
-function cannotUseInnerHTML(node: Node) {
-	while (node && node.canUseInnerHTML) {
-		node.canUseInnerHTML = false;
-		node = node.parent;
-	}
-}
-
-const preprocessors = {
-	MustacheTag: (
-		generator: DomGenerator,
-		block: Block,
-		state: State,
-		node: Node,
-		elementStack: Node[],
-		componentStack: Node[],
-		stripWhitespace: boolean
-	) => {
-		node.init(block);
-	},
-
-	RawMustacheTag: (
-		generator: DomGenerator,
-		block: Block,
-		state: State,
-		node: Node,
-		elementStack: Node[],
-		componentStack: Node[],
-		stripWhitespace: boolean
-	) => {
-		node.init(block);
-	},
-
-	Text: (
-		generator: DomGenerator,
-		block: Block,
-		state: State,
-		node: Node,
-		elementStack: Node[],
-		componentStack: Node[],
-		stripWhitespace: boolean
-	) => {
-		node.init(block, state);
-	},
-
-	AwaitBlock: (
-		generator: DomGenerator,
-		block: Block,
-		state: State,
-		node: Node,
-		inEachBlock: boolean,
-		elementStack: Node[],
-		componentStack: Node[],
-		stripWhitespace: boolean,
-		nextSibling: Node
-	) => {
-		cannotUseInnerHTML(node);
-
-		node.var = block.getUniqueName('await_block');
-		block.addDependencies(node.metadata.dependencies);
-
-		let dynamic = false;
-
-		[
-			['pending', null],
-			['then', node.value],
-			['catch', node.error]
-		].forEach(([status, arg]) => {
-			const child = node[status];
-
-			const context = block.getUniqueName(arg || '_');
-			const contexts = new Map(block.contexts);
-			contexts.set(arg, context);
-
-			child._block = block.child({
-				comment: createDebuggingComment(child, generator),
-				name: generator.getUniqueName(`create_${status}_block`),
-				params: block.params.concat(context),
-				context,
-				contexts
-			});
-
-			child._state = getChildState(state);
-
-			preprocessChildren(generator, child._block, child._state, child, inEachBlock, elementStack, componentStack, stripWhitespace, nextSibling);
-			generator.blocks.push(child._block);
-
-			if (child._block.dependencies.size > 0) {
-				dynamic = true;
-				block.addDependencies(child._block.dependencies);
-			}
-		});
-
-		node.pending._block.hasUpdateMethod = dynamic;
-		node.then._block.hasUpdateMethod = dynamic;
-		node.catch._block.hasUpdateMethod = dynamic;
-	},
-
-	IfBlock: (
-		generator: DomGenerator,
-		block: Block,
-		state: State,
-		node: Node,
-		inEachBlock: boolean,
-		elementStack: Node[],
-		componentStack: Node[],
-		stripWhitespace: boolean,
-		nextSibling: Node
-	) => {
-		cannotUseInnerHTML(node);
-
-		const blocks: Block[] = [];
-		let dynamic = false;
-		let hasIntros = false;
-		let hasOutros = false;
-
-		function attachBlocks(node: Node) {
-			node.var = block.getUniqueName(`if_block`);
-
-			block.addDependencies(node.metadata.dependencies);
-
-			node._block = block.child({
-				comment: createDebuggingComment(node, generator),
-				name: generator.getUniqueName(`create_if_block`),
-			});
-
-			node._state = getChildState(state);
-
-			blocks.push(node._block);
-			preprocessChildren(generator, node._block, node._state, node, inEachBlock, elementStack, componentStack, stripWhitespace, nextSibling);
-
-			if (node._block.dependencies.size > 0) {
-				dynamic = true;
-				block.addDependencies(node._block.dependencies);
-			}
-
-			if (node._block.hasIntroMethod) hasIntros = true;
-			if (node._block.hasOutroMethod) hasOutros = true;
-
-			if (isElseIf(node.else)) {
-				attachBlocks(node.else.children[0]);
-			} else if (node.else) {
-				node.else._block = block.child({
-					comment: createDebuggingComment(node.else, generator),
-					name: generator.getUniqueName(`create_if_block`),
-				});
-
-				node.else._state = getChildState(state);
-
-				blocks.push(node.else._block);
-				preprocessChildren(
-					generator,
-					node.else._block,
-					node.else._state,
-					node.else,
-					inEachBlock,
-					elementStack,
-					componentStack,
-					stripWhitespace,
-					nextSibling
-				);
-
-				if (node.else._block.dependencies.size > 0) {
-					dynamic = true;
-					block.addDependencies(node.else._block.dependencies);
-				}
-			}
-		}
-
-		attachBlocks(node);
-
-		blocks.forEach(block => {
-			block.hasUpdateMethod = dynamic;
-			block.hasIntroMethod = hasIntros;
-			block.hasOutroMethod = hasOutros;
-		});
-
-		generator.blocks.push(...blocks);
-	},
-
-	EachBlock: (
-		generator: DomGenerator,
-		block: Block,
-		state: State,
-		node: Node,
-		inEachBlock: boolean,
-		elementStack: Node[],
-		componentStack: Node[],
-		stripWhitespace: boolean,
-		nextSibling: Node
-	) => {
-		cannotUseInnerHTML(node);
-		node.var = block.getUniqueName(`each`);
-		node.iterations = block.getUniqueName(`${node.var}_blocks`);
-
-		const { dependencies } = node.metadata;
-		block.addDependencies(dependencies);
-
-		const indexNames = new Map(block.indexNames);
-		const indexName =
-			node.index || block.getUniqueName(`${node.context}_index`);
-		indexNames.set(node.context, indexName);
-
-		const listNames = new Map(block.listNames);
-		const listName = block.getUniqueName(
-			(node.expression.type === 'MemberExpression' && !node.expression.computed) ? node.expression.property.name :
-			node.expression.type === 'Identifier' ? node.expression.name :
-			`each_value`
-		);
-		listNames.set(node.context, listName);
-
-		const context = block.getUniqueName(node.context);
-		const contexts = new Map(block.contexts);
-		contexts.set(node.context, context);
-
-		const indexes = new Map(block.indexes);
-		if (node.index) indexes.set(node.index, node.context);
-
-		const changeableIndexes = new Map(block.changeableIndexes);
-		if (node.index) changeableIndexes.set(node.index, node.key);
-
-		if (node.destructuredContexts) {
-			for (let i = 0; i < node.destructuredContexts.length; i += 1) {
-				contexts.set(node.destructuredContexts[i], `${context}[${i}]`);
-			}
-		}
-
-		node._block = block.child({
-			comment: createDebuggingComment(node, generator),
-			name: generator.getUniqueName('create_each_block'),
-			context: node.context,
-			key: node.key,
-
-			contexts,
-			indexes,
-			changeableIndexes,
-
-			listName,
-			indexName,
-
-			indexNames,
-			listNames,
-			params: block.params.concat(listName, context, indexName),
-		});
-
-		node._state = getChildState(state, {
-			inEachBlock: true,
-		});
-
-		generator.blocks.push(node._block);
-		preprocessChildren(generator, node._block, node._state, node, true, elementStack, componentStack, stripWhitespace, nextSibling);
-		block.addDependencies(node._block.dependencies);
-		node._block.hasUpdateMethod = node._block.dependencies.size > 0;
-
-		if (node.else) {
-			node.else._block = block.child({
-				comment: createDebuggingComment(node.else, generator),
-				name: generator.getUniqueName(`${node._block.name}_else`),
-			});
-
-			node.else._state = getChildState(state);
-
-			generator.blocks.push(node.else._block);
-			preprocessChildren(
-				generator,
-				node.else._block,
-				node.else._state,
-				node.else,
-				inEachBlock,
-				elementStack,
-				componentStack,
-				stripWhitespace,
-				nextSibling
-			);
-			node.else._block.hasUpdateMethod = node.else._block.dependencies.size > 0;
-		}
-	},
-
-	Element: (
-		generator: DomGenerator,
-		block: Block,
-		state: State,
-		node: Node,
-		inEachBlock: boolean,
-		elementStack: Node[],
-		componentStack: Node[],
-		stripWhitespace: boolean,
-		nextSibling: Node
-	) => {
-		if (node.name === 'slot' || node.name === 'option') {
-			cannotUseInnerHTML(node);
-		}
-
-		node.attributes.forEach((attribute: Node) => {
-			if (attribute.type === 'Attribute' && attribute.value !== true) {
-				attribute.value.forEach((chunk: Node) => {
-					if (chunk.type !== 'Text') {
-						if (node.parent) cannotUseInnerHTML(node.parent);
-
-						const dependencies = chunk.metadata.dependencies;
-						block.addDependencies(dependencies);
-
-						// special case — <option value='{{foo}}'> — see below
-						if (
-							node.name === 'option' &&
-							attribute.name === 'value' &&
-							state.selectBindingDependencies
-						) {
-							state.selectBindingDependencies.forEach(prop => {
-								dependencies.forEach((dependency: string) => {
-									generator.indirectDependencies.get(prop).add(dependency);
-								});
-							});
-						}
-					}
-				});
-			} else {
-				if (node.parent) cannotUseInnerHTML(node.parent);
-
-				if (attribute.type === 'EventHandler' && attribute.expression) {
-					attribute.expression.arguments.forEach((arg: Node) => {
-						block.addDependencies(arg.metadata.dependencies);
-					});
-				} else if (attribute.type === 'Binding') {
-					block.addDependencies(attribute.metadata.dependencies);
-				} else if (attribute.type === 'Transition') {
-					if (attribute.intro)
-						generator.hasIntroTransitions = block.hasIntroMethod = true;
-					if (attribute.outro) {
-						generator.hasOutroTransitions = block.hasOutroMethod = true;
-						block.outros += 1;
-					}
-				}
-			}
-		});
-
-		const valueAttribute = node.attributes.find((attribute: Node) => attribute.name === 'value');
-
-		// Treat these the same way:
-		//   <option>{{foo}}</option>
-		//   <option value='{{foo}}'>{{foo}}</option>
-		if (node.name === 'option' && !valueAttribute) {
-			node.attributes.push({
-				type: 'Attribute',
-				name: 'value',
-				value: node.children
-			});
-		}
-
-		// special case — in a case like this...
-		//
-		//   <select bind:value='foo'>
-		//     <option value='{{bar}}'>bar</option>
-		//     <option value='{{baz}}'>baz</option>
-		//   </option>
-		//
-		// ...we need to know that `foo` depends on `bar` and `baz`,
-		// so that if `foo.qux` changes, we know that we need to
-		// mark `bar` and `baz` as dirty too
-		if (node.name === 'select') {
-			const binding = node.attributes.find((node: 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;
-				state.selectBindingDependencies = dependencies;
-				dependencies.forEach((prop: string) => {
-					generator.indirectDependencies.set(prop, new Set());
-				});
-			} else {
-				state.selectBindingDependencies = null;
-			}
-		}
-
-		const isComponent =
-			generator.components.has(node.name) || node.name === ':Self' || node.name === ':Component';
-
-		if (isComponent) {
-			cannotUseInnerHTML(node);
-
-			node.var = block.getUniqueName(
-				(
-					node.name === ':Self' ? generator.name :
-					node.name === ':Component' ? 'switch_instance' :
-					node.name
-				).toLowerCase()
-			);
-
-			node._state = getChildState(state, {
-				parentNode: `${node.var}._slotted.default`
-			});
-		} else {
-			const slot = getStaticAttributeValue(node, 'slot');
-			if (slot && isChildOfComponent(node, generator)) {
-				cannotUseInnerHTML(node);
-				node.slotted = true;
-				// TODO validate slots — no nesting, no dynamic names...
-				const component = componentStack[componentStack.length - 1];
-				component._slots.add(slot);
-			}
-
-			node.var = block.getUniqueName(
-				node.name.replace(/[^a-zA-Z0-9_$]/g, '_')
-			);
-
-			node._state = getChildState(state, {
-				parentNode: node.var,
-				parentNodes: block.getUniqueName(`${node.var}_nodes`),
-				parentNodeName: node.name,
-				namespace: node.name === 'svg'
-					? 'http://www.w3.org/2000/svg'
-					: state.namespace,
-				allUsedContexts: [],
-			});
-
-			generator.stylesheet.apply(node, elementStack);
-		}
-
-		if (node.children.length) {
-			if (isComponent) {
-				if (node.children) node._slots = new Set(['default']);
-				preprocessChildren(generator, block, node._state, node, inEachBlock, elementStack, componentStack.concat(node), stripWhitespace, nextSibling);
-			} else {
-				if (node.name === 'pre' || node.name === 'textarea') stripWhitespace = false;
-				preprocessChildren(generator, block, node._state, node, inEachBlock, elementStack.concat(node), componentStack, stripWhitespace, nextSibling);
-			}
-		}
-	},
-};
-
-function preprocessChildren(
-	generator: DomGenerator,
-	block: Block,
-	state: State,
-	node: Node,
-	inEachBlock: boolean,
-	elementStack: Node[],
-	componentStack: Node[],
-	stripWhitespace: boolean,
-	nextSibling: Node
-) {
-	// glue text nodes together
-	const cleaned: Node[] = [];
-	let lastChild: Node;
-
-	let windowComponent;
-
-	node.children.forEach((child: Node) => {
-		if (child.type === 'Comment') return;
-
-		// special case — this is an easy way to remove whitespace surrounding
-		// <:Window/>. lil hacky but it works
-		if (child.type === 'Element' && child.name === ':Window') {
-			windowComponent = child;
-			return;
-		}
-
-		if (child.type === 'Text' && lastChild && lastChild.type === 'Text') {
-			lastChild.data += child.data;
-			lastChild.end = child.end;
-		} else {
-			if (child.type === 'Text' && stripWhitespace && cleaned.length === 0) {
-				child.data = trimStart(child.data);
-				if (child.data) cleaned.push(child);
-			} else {
-				cleaned.push(child);
-			}
-		}
-
-		lastChild = child;
-	});
-
-	lastChild = null;
-
-	cleaned.forEach((child: Node, i: number) => {
-		child.canUseInnerHTML = !generator.hydratable;
-
-		const preprocessor = preprocessors[child.type];
-		if (preprocessor) preprocessor(generator, block, state, child, inEachBlock, elementStack, componentStack, stripWhitespace, cleaned[i + 1] || nextSibling);
-
-		if (child.shouldSkip) return;
-
-		if (lastChild) lastChild.next = child;
-		child.prev = lastChild;
-
-		lastChild = child;
-	});
-
-	// We want to remove trailing whitespace inside an element/component/block,
-	// *unless* there is no whitespace between this node and its next sibling
-	if (stripWhitespace && lastChild && lastChild.type === 'Text') {
-		const shouldTrim = (
-			nextSibling ?  (nextSibling.type === 'Text' && /^\s/.test(nextSibling.data)) : !inEachBlock
-		);
-
-		if (shouldTrim) {
-			lastChild.data = trimEnd(lastChild.data);
-			if (!lastChild.data) {
-				cleaned.pop();
-				lastChild = cleaned[cleaned.length - 1];
-				lastChild.next = null;
-			}
-		}
-	}
-
-	node.children = cleaned;
-	if (windowComponent) cleaned.unshift(windowComponent);
-}
-
-export default function preprocess(
-	generator: DomGenerator,
-	namespace: string,
-	node: Node
-) {
-	// const block = new Block({
-	// 	generator,
-	// 	name: '@create_main_fragment',
-	// 	key: null,
-
-	// 	contexts: new Map(),
-	// 	indexes: new Map(),
-	// 	changeableIndexes: new Map(),
-
-	// 	params: ['state'],
-	// 	indexNames: new Map(),
-	// 	listNames: new Map(),
-
-	// 	dependencies: new Set(),
-	// });
-
-	// const state: State = {
-	// 	namespace,
-	// 	parentNode: null,
-	// 	parentNodes: 'nodes'
-	// };
-
-	// generator.blocks.push(block);
-	// preprocessChildren(generator, block, state, node, false, [], [], true, null);
-	// block.hasUpdateMethod = true;
-
-	node.init(
-		namespace
-	);
-
-	return node;
-}
diff --git a/src/generators/nodes/Fragment.ts b/src/generators/nodes/Fragment.ts
index 97d7e4d4fb..90f4faedbf 100644
--- a/src/generators/nodes/Fragment.ts
+++ b/src/generators/nodes/Fragment.ts
@@ -28,7 +28,7 @@ export default class Fragment extends Node {
 		});
 
 		this.state = new State({
-			namespace,
+			namespace: this.generator.namespace,
 			parentNode: null,
 			parentNodes: 'nodes'
 		});