diff --git a/app/components/App.tsx b/app/components/App.tsx
index 0017f84..a49d062 100644
--- a/app/components/App.tsx
+++ b/app/components/App.tsx
@@ -3,23 +3,22 @@ import DevTools from "mobx-react-devtools";
 import * as React from "react";
 import { Item } from "semantic-ui-react";
 
-import { UiStore } from "@app/ui";
-import { SprinklersDevice } from "@common/sprinklers";
-import { DeviceView, MessagesView } from ".";
+import { DevicesView, MessagesView } from "@app/components";
 
 import "@app/styles/app.css";
 import "font-awesome/css/font-awesome.css";
 import "semantic-ui-css/semantic.css";
 
-@observer
-export default class App extends React.Component<{ device: SprinklersDevice, uiStore: UiStore }> {
+class App extends React.Component {
     render() {
         return (
             <Item.Group divided>
-                <MessagesView uiStore={this.props.uiStore} />
-                <DeviceView device={this.props.device} />
+                <MessagesView />
+                <DevicesView />
                 <DevTools />
             </Item.Group>
         );
     }
 }
+
+export default observer(App);
diff --git a/app/components/DeviceView.tsx b/app/components/DeviceView.tsx
index 76510d2..d7d19c3 100644
--- a/app/components/DeviceView.tsx
+++ b/app/components/DeviceView.tsx
@@ -21,8 +21,7 @@ const ConnectionState = ({ connected }: { connected: boolean }) => {
     );
 };
 
-@observer
-export default class DeviceView extends React.Component<{ device: SprinklersDevice }> {
+class DeviceView extends React.Component<{ device: SprinklersDevice }> {
     render() {
         const { id, connected, sections, programs, sectionRunner } = this.props.device;
         return (
@@ -45,3 +44,5 @@ export default class DeviceView extends React.Component<{ device: SprinklersDevi
         );
     }
 }
+
+export default observer(DeviceView);
diff --git a/app/components/DevicesView.tsx b/app/components/DevicesView.tsx
new file mode 100644
index 0000000..5e37918
--- /dev/null
+++ b/app/components/DevicesView.tsx
@@ -0,0 +1,14 @@
+import { observer } from "mobx-react";
+import * as React from "react";
+
+import DeviceView from "@app/components/DeviceView";
+import { injectState, State } from "@app/state";
+
+class DevicesView extends React.Component<{ state: State }> {
+    render() {
+        const { device } = this.props.state;
+        return <DeviceView device={device} />;
+    }
+}
+
+export default injectState(observer(DevicesView));
diff --git a/app/components/MessagesView.tsx b/app/components/MessagesView.tsx
index 1a8726d..85beea6 100644
--- a/app/components/MessagesView.tsx
+++ b/app/components/MessagesView.tsx
@@ -2,8 +2,9 @@ import { observer } from "mobx-react";
 import * as React from "react";
 import { Message, MessageProps, TransitionGroup } from "semantic-ui-react";
 
-import { Message as UiMessage, UiStore } from "@app/ui";
+import { injectState, State, UiMessage, UiStore } from "@app/state/";
 
+@observer
 class MessageView extends React.Component<{
     uiStore: UiStore,
     message: UiMessage,
@@ -20,7 +21,7 @@ class MessageView extends React.Component<{
         );
     }
 
-    private dismiss = (event: React.MouseEvent<HTMLElement>, data: MessageProps) => {
+    private dismiss: MessageProps["onDismiss"] = (event, data) => {
         const { uiStore, index } = this.props;
         uiStore.messages.splice(index, 1);
         if (this.props.message.onDismiss) {
@@ -29,18 +30,20 @@ class MessageView extends React.Component<{
     }
 }
 
-@observer
-export default class MessagesView extends React.Component<{ uiStore: UiStore }> {
+class MessagesView extends React.Component<{ state: State }> {
     render() {
-        const messages = this.props.uiStore.messages.map((message, index) => (
-            <MessageView key={message.id} uiStore={this.props.uiStore} message={message} index={index} />
+        const { uiStore } = this.props.state;
+        const messages = uiStore.messages.map((message, index) => (
+            <MessageView key={message.id} uiStore={uiStore} message={message} index={index} />
         ));
         return (
             <div className="messages" >
-            <TransitionGroup  animation="scale" duration={200}>
-                {messages}
-            </TransitionGroup>
+                <TransitionGroup animation="scale" duration={200}>
+                    {messages}
+                </TransitionGroup>
             </div>
         );
     }
 }
+
+export default injectState(observer(MessagesView));
diff --git a/app/components/index.ts b/app/components/index.ts
index 3b59144..ad43dc4 100644
--- a/app/components/index.ts
+++ b/app/components/index.ts
@@ -1,8 +1,9 @@
-export {default as App} from "./App";
-export {default as DeviceView} from "./DeviceView";
-export {default as DurationInput} from "./DurationInput";
-export {default as MessagesView} from "./MessagesView";
-export {default as ProgramTable} from "./ProgramTable";
-export {default as RunSectionForm} from "./RunSectionForm";
-export {default as SectionRunnerView} from "./SectionRunnerView";
-export {default as SectionTable} from "./SectionTable";
+export { default as App } from "./App";
+export { default as DevicesView } from "./DevicesView";
+export { default as DeviceView } from "./DeviceView";
+export { default as DurationInput } from "./DurationInput";
+export { default as MessagesView } from "./MessagesView";
+export { default as ProgramTable } from "./ProgramTable";
+export { default as RunSectionForm } from "./RunSectionForm";
+export { default as SectionRunnerView } from "./SectionRunnerView";
+export { default as SectionTable } from "./SectionTable";
diff --git a/app/di.ts b/app/di.ts
deleted file mode 100644
index fa38655..0000000
--- a/app/di.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as PropTypes from "prop-types";
-import * as React from "react";
-
-export class Provider<T extends {}> extends React.Component<T> {
-    static childContextTypes = {
-        injected: any,
-    };
-}
-
-export function inject<P, T extends React.ComponentType<P>>(...names: string[]): (base: T) => React.ComponentClass<T> {
-    return (Component) => {
-        return class extends React.Component<T> {
-
-        };
-    };
-}
diff --git a/app/index.tsx b/app/index.tsx
index 1fb4765..2b8e6cd 100644
--- a/app/index.tsx
+++ b/app/index.tsx
@@ -3,13 +3,19 @@ import * as ReactDOM from "react-dom";
 import { AppContainer } from "react-hot-loader";
 
 import App from "@app/components/App";
+import { ProvideState, State } from "@app/state";
+
+const state = new State();
+state.start();
 
 const rootElem = document.getElementById("app");
 
-const doRender = (Component: typeof App) => {
+const doRender = (Component: React.ComponentType) => {
     ReactDOM.render((
         <AppContainer>
-            <Component device={device} uiStore={uiStore} />
+            <ProvideState state={state}>
+                <Component />
+            </ProvideState>
         </AppContainer>
     ), rootElem);
 };
diff --git a/app/state/index.ts b/app/state/index.ts
index 91ff165..7ce8922 100644
--- a/app/state/index.ts
+++ b/app/state/index.ts
@@ -1,14 +1,17 @@
 import { MqttApiClient } from "@app/mqtt";
-import { Message, UiStore } from "@app/ui";
 import { ISprinklersApi, SprinklersDevice } from "@common/sprinklers";
 
+import { UiMessage, UiStore } from "./ui";
+export { UiMessage, UiStore };
+export * from "./inject";
+
 export class State {
     client: ISprinklersApi = new MqttApiClient();
     device: SprinklersDevice;
     uiStore = new UiStore();
 
     constructor() {
-        const device = this.client.getDevice("grinklers");
+        this.device = this.client.getDevice("grinklers");
         this.uiStore.addMessage({ header: "asdf", content: "boo!", error: true });
     }
 
@@ -17,6 +20,6 @@ export class State {
     }
 }
 
-const state = new State();
+// const state = new State();
 
-export default state;
+// export default state;
diff --git a/app/state/inject.tsx b/app/state/inject.tsx
new file mode 100644
index 0000000..0196872
--- /dev/null
+++ b/app/state/inject.tsx
@@ -0,0 +1,43 @@
+import * as PropTypes from "prop-types";
+import * as React from "react";
+
+import { State } from "@app/state";
+
+interface IProvidedStateContext {
+    providedState: State;
+}
+
+const providedStateContextTypes: PropTypes.ValidationMap<any> = {
+    providedState: PropTypes.object,
+};
+
+export class ProvideState extends React.Component<{
+    state: State,
+}> implements React.ChildContextProvider<IProvidedStateContext> {
+    static childContextTypes = providedStateContextTypes;
+
+    getChildContext(): IProvidedStateContext {
+        return {
+            providedState: this.props.state,
+        };
+    }
+
+    render() {
+        return React.Children.only(this.props.children);
+    }
+}
+
+type Diff<T extends string, U extends string> = ({[P in T]: P } & {[P in U]: never } & { [x: string]: never })[T];
+type Omit<T, K extends keyof T> = {[P in Diff<keyof T, K>]: T[P]};
+
+export function injectState<P extends { "state": State }, T extends React.ComponentClass<P>>(Component: T) {
+    return class extends React.Component<Omit<P, "state">> {
+        static contextTypes = providedStateContextTypes;
+        context: IProvidedStateContext;
+
+        render() {
+            const state = this.context.providedState;
+            return <Component {...this.props} state={state} />;
+        }
+    };
+}
diff --git a/app/ui.ts b/app/state/ui.ts
similarity index 73%
rename from app/ui.ts
rename to app/state/ui.ts
index d865132..7a5a067 100644
--- a/app/ui.ts
+++ b/app/state/ui.ts
@@ -3,13 +3,12 @@ import { MessageProps } from "semantic-ui-react";
 
 import { getRandomId } from "@common/utils";
 
-export interface Message extends MessageProps {
+export interface UiMessage extends MessageProps {
     id: number;
 }
 
 export class UiStore {
-    @observable
-    messages: IObservableArray<Message> = observable.array();
+    messages: IObservableArray<UiMessage> = observable.array();
 
     addMessage(message: MessageProps) {
         this.messages.push(observable({
diff --git a/common/tsconfig.json b/common/tsconfig.json
index aad4391..97737e9 100644
--- a/common/tsconfig.json
+++ b/common/tsconfig.json
@@ -1,6 +1,6 @@
 {
+    "experimentalDecorators": true,
     "compilerOptions": {
-        "experimentalDecorators": true,
         "target": "es5"
     }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 79fa44a..06b9722 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "description": "A frontend for mqtt based IoT sprinklers systems",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "clean": "rm -rf ./dist ./build",
+    "clean": "rm -rf ./dist ./build ./public",
     "build:app": "webpack --config ./app/webpack/prod.config.js",
     "build:server": "tsc --project server",
     "watch:app": "yarn build:app --watch",