diff --git a/compiler/generate/visitors/Element.js b/compiler/generate/visitors/Element.js
index 1d4757f7f5..8cda9e7caa 100644
--- a/compiler/generate/visitors/Element.js
+++ b/compiler/generate/visitors/Element.js
@@ -20,11 +20,22 @@ export default {
 		if ( isComponent ) {
 			addComponentAttributes( generator, node, local );
 
-			local.init.unshift( deindent`
-				var ${name} = new template.components.${node.name}({
-					target: ${generator.current.target}
-				});
-			` );
+			if ( local.data.length ) {
+				local.init.unshift( deindent`
+					var ${name} = new template.components.${node.name}({
+						target: ${generator.current.target},
+						data: {
+							${local.data.join( ',\n' )}
+						}
+					});
+				` );
+			} else {
+				local.init.unshift( deindent`
+					var ${name} = new template.components.${node.name}({
+						target: ${generator.current.target}
+					});
+				` );
+			}
 
 			local.teardown.push( `${name}.teardown();` );
 		}
diff --git a/compiler/generate/visitors/attributes/addComponentAttributes.js b/compiler/generate/visitors/attributes/addComponentAttributes.js
index 55e37c4d9e..6e4e065dc3 100644
--- a/compiler/generate/visitors/attributes/addComponentAttributes.js
+++ b/compiler/generate/visitors/attributes/addComponentAttributes.js
@@ -1,41 +1,40 @@
 import deindent from '../../utils/deindent.js';
 
 export default function addComponentAttributes ( generator, node, local ) {
+	const variables = [];
+	local.data = [];
+
 	node.attributes.forEach( attribute => {
 		if ( attribute.type === 'Attribute' ) {
 			if ( attribute.value === true ) {
 				// attributes without values, e.g. <textarea readonly>
-				local.init.push( deindent`
-					${local.name}.setAttribute( '${attribute.name}', true );
-				` );
+				local.data.push( `${attribute.name}: true` );
 			}
 
 			else if ( attribute.value.length === 1 ) {
 				const value = attribute.value[0];
 
-				let result = '';
-
 				if ( value.type === 'Text' ) {
 					// static attributes
-					result = JSON.stringify( value.data );
-
-					local.init.push( deindent`
-						${local.name}.setAttribute( '${attribute.name}', ${result} );
-					` );
+					const result = isNaN( parseFloat( value.data ) ) ? JSON.stringify( value.data ) : value.data;
+					local.data.push( `${attribute.name}: ${result}` );
 				}
 
 				else {
 					// dynamic – but potentially non-string – attributes
 					generator.contextualise( value.expression );
-					result = `[✂${value.expression.start}-${value.expression.end}✂]`;
+					const result = `[✂${value.expression.start}-${value.expression.end}✂]`;
 
-					local.update.push( deindent`
-						${local.name}.setAttribute( '${attribute.name}', ${result} );
-					` );
+					throw new Error( 'TODO dynamic data' );
+					// local.update.push( deindent`
+					// 	${local.name}.setAttribute( '${attribute.name}', ${result} );
+					// ` );
 				}
 			}
 
 			else {
+				throw new Error( 'TODO dynamic data' );
+
 				const value = ( attribute.value[0].type === 'Text' ? '' : `"" + ` ) + (
 					attribute.value.map( chunk => {
 						if ( chunk.type === 'Text' ) {
diff --git a/test/compiler/component-data-static/Widget.html b/test/compiler/component-data-static/Widget.html
new file mode 100644
index 0000000000..573b6ffcc3
--- /dev/null
+++ b/test/compiler/component-data-static/Widget.html
@@ -0,0 +1,2 @@
+<p>foo: {{foo}}</p>
+<p>baz: {{baz}} ({{typeof baz}})</p>
diff --git a/test/compiler/component-data-static/_config.js b/test/compiler/component-data-static/_config.js
new file mode 100644
index 0000000000..21ccb13172
--- /dev/null
+++ b/test/compiler/component-data-static/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '<div><p>foo: bar</p>\n<p>baz: 42 (number)</p></div>'
+};
diff --git a/test/compiler/component-data-static/main.html b/test/compiler/component-data-static/main.html
new file mode 100644
index 0000000000..0df72c1465
--- /dev/null
+++ b/test/compiler/component-data-static/main.html
@@ -0,0 +1,11 @@
+<div>
+	<Widget foo='bar' baz='42'/>
+</div>
+
+<script>
+	import Widget from './Widget.html';
+
+	export default {
+		components: { Widget }
+	};
+</script>
diff --git a/test/compiler/component-ref/Widget.html b/test/compiler/component-ref/Widget.html
new file mode 100644
index 0000000000..460a2a1c01
--- /dev/null
+++ b/test/compiler/component-ref/Widget.html
@@ -0,0 +1 @@
+<p>i am a widget</p>
diff --git a/test/compiler/component-ref/_config.js b/test/compiler/component-ref/_config.js
new file mode 100644
index 0000000000..d32cd98ded
--- /dev/null
+++ b/test/compiler/component-ref/_config.js
@@ -0,0 +1,10 @@
+import * as assert from 'assert';
+import Widget from './Widget.html';
+
+export default {
+	html: '<div><p>i am a widget</p></div>',
+	test ( component ) {
+		const widget = component.refs.widget;
+		assert.ok( widget instanceof Widget );
+	}
+};
diff --git a/test/compiler/component-ref/main.html b/test/compiler/component-ref/main.html
new file mode 100644
index 0000000000..162f6f5d23
--- /dev/null
+++ b/test/compiler/component-ref/main.html
@@ -0,0 +1,11 @@
+<div>
+	<Widget ref:widget/>
+</div>
+
+<script>
+	import Widget from './Widget.html';
+
+	export default {
+		components: { Widget }
+	};
+</script>