diff --git a/src/components/Route.html b/src/components/Route.html
index b9105af..fff8529 100644
--- a/src/components/Route.html
+++ b/src/components/Route.html
@@ -12,7 +12,7 @@
 
 	function update() {
 		let {
-			r: { match, pathname, router },
+			r: { match, pathname, router } = {},
 			path,
 			exact,
 			component,
diff --git a/src/components/Router.html b/src/components/Router.html
index c0a783d..4d0b566 100644
--- a/src/components/Router.html
+++ b/src/components/Router.html
@@ -1,20 +1,18 @@
-<div ref:mount/>
+{{yield}}
 
 <script>
 	export default {
 		oncreate() {
 			document.addEventListener('click', clickHandler.bind(this))
 			window.addEventListener('popstate', popHandler.bind(this))
-			this._r = new (this.get('component'))({ target: this.refs.mount, data: { r: { router: this, pathname: document.location.pathname } } })
+			this.set({ r: { router: this, pathname: document.location.pathname } })
 		},
 		methods: {
 			go(url, replace) {
 				history[replace ? 'replaceState' : 'pushState'](null, '', location.origin + url)
-				if (this._r) {
-					let r = this._r.get('r')
-					r.pathname = url
-					this._r.set({ r })
-				}
+				let r = this.get('r')
+				r.pathname = url
+				this.set({ r })
 			},
 		},
 	}
@@ -42,10 +40,8 @@
 	}
 
 	function popHandler() {
-		if (this._r) {
-			let r = this._r.get('r')
-			r.pathname = document.location.pathname
-			this._r.set({ r })
-		}
+		let r = this.get('r')
+		r.pathname = document.location.pathname
+		this.set({ r })
 	}
 </script>