diff --git a/src/index.js b/src/index.js
index 089559f..29f86d7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,10 +1,7 @@
-import React from 'react';
-import {render} from 'react-dom';
-import domReady from 'domready';
+import riot from 'riot';
+import MarathonStore from 'MarathonStore';
+import 'tags.js';
 
-import App from './app.js';
+var marathonStore = new MarathonStore()
 
-domReady(() => {
-  const container = document.getElementById('app');
-  render(<App/>, container);
-});
+riot.mount('marathon-app', {store: marathonStore})
diff --git a/src/tags.js b/src/tags.js
new file mode 100644
index 0000000..5b40942
--- /dev/null
+++ b/src/tags.js
@@ -0,0 +1,17 @@
+import riot from 'riot';
+
+riot.tag(
+  'form',
+  '<form>{opts.children}</form>',
+  function (opts) {
+    var dispatcher = this.opts.store.dispatcher;
+    // TODO Can we pass a function to the component children?
+  }
+)
+
+riot.tag(
+  'TextInput',
+  '<input type="text" value="{value}" placeholder="{placeholder}" onChange="{onChange}" />',
+  function (opts) {
+  }
+)