diff --git a/backend-src/Miso.hs b/backend-src/Miso.hs
deleted file mode 100644
index f433e014..00000000
--- a/backend-src/Miso.hs
+++ /dev/null
@@ -1,29 +0,0 @@
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE LambdaCase          #-}
-{-# LANGUAGE RecordWildCards     #-}
-{-# LANGUAGE DataKinds           #-}
-{-# LANGUAGE KindSignatures      #-}
------------------------------------------------------------------------------
--- |
--- Module      :  Miso
--- Copyright   :  (C) 2016-2018 David M. Johnson
--- License     :  BSD3-style (see the file LICENSE)
--- Maintainer  :  David M. Johnson <djohnson.m@gmail.com>
--- Stability   :  experimental
--- Portability :  non-portable
-----------------------------------------------------------------------------
-module Miso
-  ( module Miso.Event
-  , module Miso.Html
-  , module Miso.Router
-  , module Miso.TypeLevel
-  , module Miso.Util
-  , module Miso.WebSocket
-  ) where
-
-import           Miso.Event
-import           Miso.Html
-import           Miso.Router
-import           Miso.TypeLevel
-import           Miso.Util
-import           Miso.WebSocket
diff --git a/backend-src/Miso/Html/Internal.hs b/backend-src/Miso/Html/Internal.hs
deleted file mode 100644
index d04cb58e..00000000
--- a/backend-src/Miso/Html/Internal.hs
+++ /dev/null
@@ -1,303 +0,0 @@
-{-# LANGUAGE CPP                  #-}
-{-# LANGUAGE DeriveFunctor        #-}
-{-# LANGUAGE KindSignatures       #-}
-{-# LANGUAGE DataKinds            #-}
-{-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE TypeSynonymInstances #-}
-{-# LANGUAGE RankNTypes           #-}
-{-# LANGUAGE GADTs                #-}
-{-# LANGUAGE RecordWildCards      #-}
-{-# LANGUAGE ConstraintKinds      #-}
-{-# LANGUAGE TypeFamilies         #-}
-{-# LANGUAGE OverloadedStrings    #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE UndecidableInstances #-}
------------------------------------------------------------------------------
--- |
--- Module      :  Miso.Html.Internal
--- Copyright   :  (C) 2016-2018 David M. Johnson
--- License     :  BSD3-style (see the file LICENSE)
--- Maintainer  :  David M. Johnson <djohnson.m@gmail.com>
--- Stability   :  experimental
--- Portability :  non-portable
-----------------------------------------------------------------------------
-module Miso.Html.Internal (
-  -- * Core types and interface
-    VTree  (..)
-  , View   (..)
-  , ToView (..)
-  , Attribute (..)
-  -- * Smart `View` constructors
-  , node
-  , text
-  , textRaw
-  -- * Key patch internals
-  , Key    (..)
-  , ToKey  (..)
-  -- * Namespace
-  , NS     (..)
-  -- * Setting properties on virtual DOM nodes
-  , prop
-  -- * Setting CSS
-  , style_
-  -- * Handling events
-  , on
-  , onWithOptions
-  -- * Life cycle events
-  , onCreated
-  , onDestroyed
-  , onBeforeDestroyed
-  ) where
-
-import           Data.Aeson  (Value(..), ToJSON(..))
-import qualified Data.Map    as M
-import           Data.Proxy
-import           Data.String (IsString(..))
-import qualified Data.Text   as T
-import qualified Data.Vector as V
-import qualified Lucid       as L
-import qualified Lucid.Base  as L
-import           Prelude     hiding (null)
-import           Servant.API
-
-import           Miso.Event
-import           Miso.String hiding (map)
-
--- | Virtual DOM implemented as a Rose `Vector`.
---   Used for diffing, patching and event delegation.
---   Not meant to be constructed directly, see `View` instead.
-data VTree action where
-  VNode :: { vType :: Text -- ^ Element type (i.e. "div", "a", "p")
-           , vNs :: NS -- ^ HTML or SVG
-           , vProps :: Props -- ^ Fields present on DOM Node
-           , vKey :: Maybe Key -- ^ Key used for child swap patch
-           , vChildren :: V.Vector (VTree action) -- ^ Child nodes
-           } -> VTree action
-  VText :: { vText :: Text -- ^ TextNode content
-           } -> VTree action
-  -- Invariant: To avoid complexity with collapsing mixed VText and
-  -- VTextRaw nodes, VTextRaw node is always the only child.
-  -- That's not a big limitation, since the intended purpose is to be able
-  -- to use <style> and <script> tags. That means we can't support HTML
-  -- entities like &nbsp; with VTextRaw, but the same can be achieved with
-  -- Unicode.
-  VTextRaw :: { vText :: Text -- ^ Raw TextNode content
-              } -> VTree action
-  deriving Functor
-
-instance Show (VTree action) where
-  show = show . L.toHtml
-
--- | Converting `VTree` to Lucid's `L.Html`
-instance L.ToHtml (VTree action) where
-  toHtmlRaw = L.toHtml
-  toHtml (VText x) | T.null x = L.toHtml (" " :: MisoString)
-                   | otherwise = L.toHtml x
-  toHtml (VTextRaw x) | T.null x = L.toHtml (" " :: MisoString)
-                      | otherwise = L.toHtmlRaw x
-  toHtml VNode{..} =
-    let
-      noEnd = ["img", "input", "br", "hr", "meta"]
-      tag = toTag vType
-      ele =
-          if tag `elem` noEnd
-            then L.makeElementNoEnd tag
-            else L.makeElement tag kids
-    in L.with ele as
-      where
-        Props xs = vProps
-        as = [ L.makeAttribute k (if k `elem` exceptions && v == Bool True then k else v')
-             | (k,v) <- M.toList xs
-             , let v' = toHtmlFromJSON v
-             , not (k `elem` exceptions && v == Bool False)
-             ]
-        exceptions = [ "checked"
-                     , "disabled"
-                     , "selected"
-                     , "hidden"
-                     , "readOnly"
-                     , "autoplay"
-                     , "required"
-                     , "default"
-                     , "autofocus"
-                     , "multiple"
-                     , "noValidate"
-                     , "autocomplete"
-                     ]
-        toTag = T.toLower
-        kids
-          = foldMap L.toHtml
-          . V.fromList
-          . collapseSiblingTextNodes
-          . V.toList
-          $ vChildren
-
-collapseSiblingTextNodes :: [VTree a] -> [VTree a]
-collapseSiblingTextNodes [] = []
-collapseSiblingTextNodes (VText x : VText y : xs) =
-  collapseSiblingTextNodes (VText (x <> y) : xs)
--- VTextRaw is the only child, so no need to collapse.
-collapseSiblingTextNodes (x:xs) =
-  x : collapseSiblingTextNodes xs
-
--- | Helper for turning JSON into Text
--- Object, Array and Null are kind of non-sensical here
-toHtmlFromJSON :: Value -> Text
-toHtmlFromJSON (String t) = t
-toHtmlFromJSON (Number t) = pack (show t)
-toHtmlFromJSON (Bool b) = if b then "true" else "false"
-toHtmlFromJSON Null = "null"
-toHtmlFromJSON (Object o) = pack (show o)
-toHtmlFromJSON (Array a) = pack (show a)
-
--- | Core type for constructing a `VTree`, use this instead of `VTree` directly.
-newtype View action = View { runView :: VTree action }
-  deriving Functor
-
--- | For constructing type-safe links
-instance HasLink (View a) where
-#if MIN_VERSION_servant(0,14,0)
-  type MkLink (View a) b = MkLink (Get '[] ()) b
-  toLink toA Proxy = toLink toA (Proxy :: Proxy (Get '[] ()))
-#else
-  type MkLink (View a) = MkLink (Get '[] ())
-  toLink Proxy = toLink (Proxy :: Proxy (Get '[] ()))
-#endif
-
-
--- | Convenience class for using View
-class ToView v where toView :: v -> View action
-
--- | Show `View`
-instance Show (View action) where
-  show (View xs) = show xs
-
--- | Converting `View` to Lucid's `L.Html`
-instance L.ToHtml (View action) where
-  toHtmlRaw = L.toHtml
-  toHtml (View xs) = L.toHtml xs
-
--- | Namespace for element creation
-data NS
-  = HTML -- ^ HTML Namespace
-  | SVG  -- ^ SVG Namespace
-  | MATHML  -- ^ MATHML Namespace
-  deriving (Show, Eq)
-
--- | `VNode` creation
-node :: NS -> MisoString -> Maybe Key -> [Attribute action] -> [View action] -> View action
-node vNs vType vKey as xs =
-  let classes = intercalate " " [ v | P "class" (String v) <- as ]
-      vProps  = Props $ do
-        let propClass = M.fromList [ (k,v) | P k v <- as ]
-        if not (null classes)
-          then M.insert "class" (String classes) propClass
-          else propClass
-      vChildren = V.fromList $ map runView xs
-  in View VNode {..}
-
--- | `VText` creation
-text :: MisoString -> View action
-text = View . VText
-
--- | `VTextRaw` creation. Don't use directly
-textRaw :: MisoString -> View action
-textRaw = View . VTextRaw
-
--- | `IsString` instance
-instance IsString (View a) where
-  fromString = text . fromString
-
--- | Key for specific children patch
-newtype Key = Key MisoString
-  deriving (Show, Eq, Ord, IsString)
-
--- | Convert type into Key, ensure `Key` is unique
-class ToKey key where toKey :: key -> Key
--- | Identity instance
-instance ToKey Key    where toKey = id
--- | Convert `Text` to `Key`
-instance ToKey MisoString where toKey = Key
--- | Convert `String` to `Key`
-instance ToKey String where toKey = Key . T.pack
--- | Convert `Int` to `Key`
-instance ToKey Int    where toKey = Key . T.pack . show
--- | Convert `Double` to `Key`
-instance ToKey Double where toKey = Key . T.pack . show
--- | Convert `Float` to `Key`
-instance ToKey Float  where toKey = Key . T.pack . show
--- | Convert `Word` to `Key`
-instance ToKey Word   where toKey = Key . T.pack . show
-
--- | Properties
-newtype Props = Props (M.Map MisoString Value)
-  deriving (Show, Eq)
-
--- | `View` Attributes to annotate DOM, converted into Events, Props, Attrs and CSS
-data Attribute action
-  = P MisoString Value
-  | E ()
-  deriving (Show, Eq)
-
--- | DMJ: this used to get set on preventDefault on Options... if options are dynamic now what
--- | Useful for `drop` events
-newtype AllowDrop = AllowDrop Bool
-  deriving (Show, Eq)
-
--- | Constructs a property on a `VNode`, used to set fields on a DOM Node
-prop :: ToJSON a => MisoString -> a -> Attribute action
-prop k v = P k (toJSON v)
-
--- | For defining delegated events
---
--- > let clickHandler = on "click" emptyDecoder $ \() -> Action
--- > in button_ [ clickHandler, class_ "add" ] [ text_ "+" ]
---
-on :: MisoString
-   -> Decoder r
-   -> (r -> action)
-   -> Attribute action
-on _ _ _ = E ()
-
--- | For defining delegated events with options
---
--- > let clickHandler = onWithOptions defaultOptions "click" emptyDecoder $ \() -> Action
--- > in button_ [ clickHandler, class_ "add" ] [ text_ "+" ]
---
-onWithOptions
-   :: Options
-   -> MisoString
-   -> Decoder r
-   -> (r -> action)
-   -> Attribute action
-onWithOptions _ _ _ _ = E ()
-
--- | @onCreated action@ is an event that gets called after the actual DOM
--- element is created.
-onCreated :: action -> Attribute action
-onCreated _ = E ()
-
--- | @onDestroyed action@ is an event that gets called after the DOM element
--- is removed from the DOM. The @action@ is given the DOM element that was
--- removed from the DOM tree.
-onDestroyed :: action -> Attribute action
-onDestroyed _ = E ()
-
--- | @onBeforeDestroyed action@ is an event that gets called before the DOM element
--- is removed from the DOM. The @action@ is given the DOM element that was
--- removed from the DOM tree.
-onBeforeDestroyed :: action -> Attribute action
-onBeforeDestroyed _ = E ()
-
--- | Constructs CSS for a DOM Element
---
--- > import qualified Data.Map as M
--- > div_ [ style_  $ M.singleton "background" "red" ] [ ]
---
--- <https://developer.mozilla.org/en-US/docs/Web/CSS>
---
-style_ :: M.Map MisoString MisoString -> Attribute action
-style_ map' = P "style" $ String (M.foldrWithKey go mempty map')
-  where
-    go :: MisoString -> MisoString -> MisoString -> MisoString
-    go k v xs = mconcat [ k, ":", v, ";" ] <> xs
diff --git a/ghcjs-src/Miso/String.hs b/ghcjs-src/Miso/String.hs
index 41d4dac5..8368c54a 100644
--- a/ghcjs-src/Miso/String.hs
+++ b/ghcjs-src/Miso/String.hs
@@ -24,9 +24,7 @@ module Miso.String (
   , ms
   ) where
 
-#if !defined(JSADDLE) || defined(__GHCJS__)
 import           Data.Aeson
-#endif
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as BL
 import           Data.Char
@@ -42,9 +40,6 @@ import           Prelude hiding (foldr)
 -- | String type swappable based on compiler
 type MisoString = JSString
 
-#if !defined(JSADDLE) || defined(__GHCJS__)
-
-
 -- | `ToJSON` for `MisoString`
 instance ToJSON MisoString where
   toJSON = String . textFromJSString
@@ -54,7 +49,6 @@ instance FromJSON MisoString where
   parseJSON =
     withText "Not a valid string" $ \x ->
       pure (toMisoString x)
-#endif
 
 -- | Convenience class for creating `MisoString` from other string-like types
 class ToMisoString str where
diff --git a/miso.cabal b/miso.cabal
index 5d1201f6..78618e1a 100644
--- a/miso.cabal
+++ b/miso.cabal
@@ -113,6 +113,9 @@ library
     Miso.Html.Element
     Miso.Html.Event
     Miso.Html.Property
+    Miso.Html.Types
+    Miso.Delegate
+    Miso.Diff
     Miso.Event
     Miso.Event.Decoder
     Miso.Event.Types
@@ -145,7 +148,6 @@ library
     Miso.WebSocket
   other-modules:
     Miso.Concurrent
-    Miso.Html.Internal
   ghc-options:
     -Wall
   hs-source-dirs:
@@ -155,9 +157,11 @@ library
     base < 5,
     bytestring,
     containers,
+    file-embed,
     http-api-data,
     http-types,
     jsaddle,
+    lucid,
     network-uri,
     servant,
     servant-lucid,
@@ -168,14 +172,9 @@ library
       build-depends:
         ghcjs-base
     if flag(jsaddle)
-      cpp-options:
-        -DJSADDLE
       if flag (ios)
         cpp-options:
           -DIOS
-      else
-        build-depends:
-          file-embed
     else
       js-sources:
         jsbits/diff.js
@@ -190,12 +189,8 @@ library
       unordered-containers,
       transformers,
       vector
-    other-modules:
-      Miso.Diff
-      Miso.Delegate
   else
     build-depends:
-      lucid,
       vector
     hs-source-dirs:
       backend-src
diff --git a/frontend-src/Miso.hs b/src/Miso.hs
similarity index 97%
rename from frontend-src/Miso.hs
rename to src/Miso.hs
index 74d9ca28..391ae7cf 100644
--- a/frontend-src/Miso.hs
+++ b/src/Miso.hs
@@ -26,10 +26,12 @@ module Miso
   , module Miso.Event
   , module Miso.Html
   , module Miso.Subscription
+  , module Miso.TypeLevel
   , module Miso.Types
   , module Miso.Router
   , module Miso.Util
   , module Miso.FFI
+  , module Miso.WebSocket
   ) where
 
 import           Control.Concurrent
@@ -42,7 +44,7 @@ import           System.Mem.StableName
 import qualified Data.Sequence as S
 import qualified JavaScript.Object.Internal as OI
 
-#ifdef JSADDLE
+#ifndef __GHCJS__
 import           Language.Javascript.JSaddle (eval, waitForAnimationFrame)
 #ifdef IOS
 import           Miso.JSBits
@@ -63,8 +65,10 @@ import           Miso.FFI
 import           Miso.Html
 import           Miso.Router
 import           Miso.Subscription
+import           Miso.TypeLevel
 import           Miso.Types
 import           Miso.Util
+import           Miso.WebSocket
 
 -- | Helper function to abstract out common functionality between `startApp` and `miso`
 common
@@ -74,7 +78,7 @@ common
   -> (Sink action -> JSM (IORef VTree))
   -> JSM ()
 common App {..} m getView = do
-#ifdef JSADDLE
+#ifndef __GHCJS__
 #ifdef IOS
   mapM_ eval [delegateJs,diffJs,isomorphicJs,utilJs]
 #else
diff --git a/frontend-src/Miso/Delegate.hs b/src/Miso/Delegate.hs
similarity index 96%
rename from frontend-src/Miso/Delegate.hs
rename to src/Miso/Delegate.hs
index 2fe71478..61fbe8f7 100644
--- a/frontend-src/Miso/Delegate.hs
+++ b/src/Miso/Delegate.hs
@@ -16,7 +16,7 @@ import           GHCJS.Marshal
 import           GHCJS.Types (JSVal)
 import qualified JavaScript.Object.Internal as OI
 import           Miso.FFI
-import           Miso.Html.Internal
+import           Miso.Html.Types
 import           Miso.String
 
 -- | Entry point for event delegation
diff --git a/frontend-src/Miso/Diff.hs b/src/Miso/Diff.hs
similarity index 98%
rename from frontend-src/Miso/Diff.hs
rename to src/Miso/Diff.hs
index ae044856..5470a3ae 100644
--- a/frontend-src/Miso/Diff.hs
+++ b/src/Miso/Diff.hs
@@ -14,7 +14,7 @@ module Miso.Diff ( diff
 import GHCJS.Foreign.Internal     hiding (Object)
 import GHCJS.Types
 import JavaScript.Object.Internal
-import Miso.Html.Internal
+import Miso.Html.Types
 import Miso.FFI
 import Miso.String
 
diff --git a/src/Miso/Event/Types.hs b/src/Miso/Event/Types.hs
index 72ca866d..8f2475d1 100644
--- a/src/Miso/Event/Types.hs
+++ b/src/Miso/Event/Types.hs
@@ -14,6 +14,7 @@ module Miso.Event.Types where
 
 import qualified Data.Map as M
 import           GHC.Generics
+import           GHCJS.Marshal (ToJSVal)
 import           Miso.String
 import           Data.Aeson (FromJSON)
 
@@ -40,6 +41,8 @@ data Options = Options {
   , stopPropagation :: Bool
   } deriving (Show, Eq, Generic)
 
+instance ToJSVal Options
+
 -- | Default value for 'Options'.
 --
 -- > defaultOptions = Options { preventDefault = False, stopPropagation = False }
diff --git a/src/Miso/Html.hs b/src/Miso/Html.hs
index b8fd21b4..7e70a122 100644
--- a/src/Miso/Html.hs
+++ b/src/Miso/Html.hs
@@ -30,11 +30,11 @@
 module Miso.Html
    ( module Miso.Html.Element
    , module Miso.Html.Event
-   , module Miso.Html.Internal
+   , module Miso.Html.Types
    , module Miso.Html.Property
    ) where
 
 import Miso.Html.Element hiding (style_)
 import Miso.Html.Event
-import Miso.Html.Internal hiding (textRaw)
+import Miso.Html.Types hiding (textRaw)
 import Miso.Html.Property hiding (form_)
diff --git a/src/Miso/Html/Element.hs b/src/Miso/Html/Element.hs
index 3032e650..087b88f8 100644
--- a/src/Miso/Html/Element.hs
+++ b/src/Miso/Html/Element.hs
@@ -134,7 +134,7 @@ module Miso.Html.Element
     , menu_
     ) where
 
-import           Miso.Html.Internal
+import           Miso.Html.Types
 import           Miso.String (MisoString)
 
 -- | Used to construct `VNode`'s in `View`
diff --git a/src/Miso/Html/Event.hs b/src/Miso/Html/Event.hs
index 8a591e0f..045c569a 100644
--- a/src/Miso/Html/Event.hs
+++ b/src/Miso/Html/Event.hs
@@ -57,7 +57,7 @@ module Miso.Html.Event
   , onDrop
   ) where
 
-import Miso.Html.Internal ( Attribute, on, onWithOptions )
+import Miso.Html.Types ( Attribute, on, onWithOptions )
 import Miso.Event
 import Miso.String (MisoString)
 
diff --git a/src/Miso/Html/Property.hs b/src/Miso/Html/Property.hs
index b70d0cf1..92e9473c 100644
--- a/src/Miso/Html/Property.hs
+++ b/src/Miso/Html/Property.hs
@@ -122,7 +122,7 @@ module Miso.Html.Property
    , styleInline_
    ) where
 
-import           Miso.Html.Internal
+import           Miso.Html.Types
 import           Miso.String (MisoString, intercalate)
 
 #if __GLASGOW_HASKELL__ < 841
diff --git a/frontend-src/Miso/Html/Internal.hs b/src/Miso/Html/Types.hs
similarity index 56%
rename from frontend-src/Miso/Html/Internal.hs
rename to src/Miso/Html/Types.hs
index 835311d6..95b1e24d 100644
--- a/frontend-src/Miso/Html/Internal.hs
+++ b/src/Miso/Html/Types.hs
@@ -1,93 +1,75 @@
-{-# LANGUAGE OverloadedStrings          #-}
-{-# LANGUAGE CPP                        #-}
-{-# LANGUAGE TypeFamilies               #-}
-{-# LANGUAGE TypeOperators              #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE DataKinds                  #-}
-{-# LANGUAGE KindSignatures             #-}
-{-# LANGUAGE LambdaCase                 #-}
-{-# LANGUAGE ConstraintKinds            #-}
-{-# LANGUAGE FlexibleInstances          #-}
-{-# LANGUAGE MultiParamTypeClasses      #-}
-{-# LANGUAGE UndecidableInstances       #-}
-{-# LANGUAGE ScopedTypeVariables        #-}
-{-# LANGUAGE OverloadedStrings          #-}
-{-# LANGUAGE DeriveGeneric              #-}
-{-# LANGUAGE DeriveFunctor              #-}
-{-# LANGUAGE RecordWildCards            #-}
-{-# OPTIONS_GHC -fno-warn-orphans       #-}
------------------------------------------------------------------------------
--- |
--- Module      :  Miso.Html.Internal
--- Copyright   :  (C) 2016-2018 David M. Johnson
--- License     :  BSD3-style (see the file LICENSE)
--- Maintainer  :  David M. Johnson <djohnson.m@gmail.com>
--- Stability   :  experimental
--- Portability :  non-portable
-----------------------------------------------------------------------------
-module Miso.Html.Internal (
-  -- * Core types and interface
-    VTree  (..)
-  , View   (..)
-  , ToView (..)
-  , Attribute (..)
-  -- * Smart `View` constructors
-  , node
-  , text
-  , textRaw
-  -- * Key patch internals
-  , Key    (..)
-  , ToKey  (..)
-  -- * Namespace
-  , NS     (..)
-  -- * Setting properties on virtual DOM nodes
-  , prop
-  -- * Setting css
-  , style_
-  -- * Handling events
-  , on
-  , onWithOptions
-  -- * Life cycle events
-  , onCreated
-  , onDestroyed
-  , onBeforeDestroyed
-  -- * Events
-  , defaultEvents
-  -- * Subscription type
-  , Sub
-  ) where
+{-# LANGUAGE CPP                  #-}
+{-# LANGUAGE DataKinds            #-}
+{-# LANGUAGE DeriveFunctor        #-}
+{-# LANGUAGE FlexibleInstances    #-}
+{-# LANGUAGE LambdaCase           #-}
+{-# LANGUAGE OverloadedStrings    #-}
+{-# LANGUAGE RecordWildCards      #-}
+{-# LANGUAGE TypeFamilies         #-}
+{-# LANGUAGE UndecidableInstances #-}
 
-import           Control.Monad
-import           Control.Monad.IO.Class
+module Miso.Html.Types (
+    -- * Core types and interface
+      VTree  (..)
+    , View   (..)
+    , ToView (..)
+    -- * `View` runner
+    , runView
+    -- * Smart `View` constructors
+    , node
+    , text
+    , textRaw
+    -- * Core types and interface
+    , Attribute (..)
+    -- * Key patch internals
+    , Key    (..)
+    , ToKey  (..)
+    -- * Namespace
+    , NS(..)
+    -- * Setting properties on virtual DOM nodes
+    , prop
+    -- * Setting css
+    , style_
+    -- * Handling events
+    , on
+    , onWithOptions
+    -- * Life cycle events
+    , onCreated
+    , onDestroyed
+    , onBeforeDestroyed
+    ) where
+
+import           Control.Monad (forM_, (<=<))
+import           Control.Monad.IO.Class (liftIO)
+import qualified Data.Aeson as A
+import           Data.Aeson (ToJSON, Value, toJSON)
 import           Data.Aeson.Types (parseEither)
 import           Data.JSString (JSString)
 import qualified Data.Map as M
-import           Data.Proxy
-import           Data.String (IsString(..))
+import           Data.Proxy (Proxy(Proxy))
+import           Data.String (IsString, fromString)
 import qualified Data.Text as T
-import           GHCJS.Marshal
-import           GHCJS.Types
+import           GHCJS.Marshal (ToJSVal, fromJSVal, toJSVal)
+import           GHCJS.Types (jsval)
 import qualified JavaScript.Array as JSArray
-import           JavaScript.Object
-import           JavaScript.Object.Internal (Object (Object))
-import           Servant.API
+import           JavaScript.Object (create, getProp)
+import           JavaScript.Object.Internal (Object(Object))
+import qualified Lucid       as L
+import qualified Lucid.Base  as L
+import           Prelude     hiding (null)
+import           Servant.API (Get, HasLink, MkLink, toLink)
 
-import           Miso.Effect (Sub)
-import           Miso.Event.Decoder
-import           Miso.Event.Types
-import           Miso.String
-import           Miso.Effect (Sink)
+import           Miso.Effect
+import           Miso.Event
 import           Miso.FFI
-
--- | Virtual DOM implemented as a JavaScript `Object`.
---   Used for diffing, patching and event delegation.
---   Not meant to be constructed directly, see `View` instead.
-newtype VTree = VTree { getTree :: Object }
+import           Miso.String
 
 -- | Core type for constructing a `VTree`, use this instead of `VTree` directly.
-newtype View action = View {
-  runView :: Sink action -> JSM VTree
-} deriving Functor
+data View action
+    = Node NS MisoString (Maybe Key) [Attribute action] [View action]
+    | Text MisoString
+    | TextRaw MisoString
+    deriving Functor
 
 -- | For constructing type-safe links
 instance HasLink (View a) where
@@ -100,9 +82,9 @@ instance HasLink (View a) where
 #endif
 
 -- | Convenience class for using View
-class ToView v where toView :: v -> View m
+class ToView v where toView :: v -> View action
 
--- | Create a new @Miso.Types.VNode@.
+-- | Create a new @Miso.Html.Types.Node@.
 --
 -- @node ns tag key attrs children@ creates a new node with tag @tag@
 -- and 'Key' @key@ in the namespace @ns@. All @attrs@ are called when
@@ -110,10 +92,95 @@ class ToView v where toView :: v -> View m
 node :: NS
      -> MisoString
      -> Maybe Key
-     -> [Attribute m]
-     -> [View m]
-     -> View m
-node ns tag key attrs kids = View $ \sink -> do
+     -> [Attribute action]
+     -> [View action]
+     -> View action
+node = Node
+
+-- | Create a new @Text@ with the given content.
+text :: MisoString -> View action
+text = Text
+
+-- | `TextRaw` creation. Don't use directly
+textRaw :: MisoString -> View action
+textRaw = TextRaw
+
+-- | `IsString` instance
+instance IsString (View a) where
+  fromString = text . fromString
+
+-- | Converting `View` to Lucid's `L.Html`
+instance L.ToHtml (View action) where
+  toHtmlRaw = L.toHtml
+  toHtml (Node vNs vType vKey attrs vChildren) = L.with ele lattrs
+    where
+      noEnd = ["img", "input", "br", "hr", "meta"]
+      tag = toTag $ fromMisoString vType
+      ele = if tag `elem` noEnd
+          then L.makeElementNoEnd tag
+          else L.makeElement tag kids
+      classes = T.intercalate " " [ v | P "class" (A.String v) <- attrs ]
+      propClass = M.fromList $ attrs >>= \case
+          P k v -> [(k, v)]
+          E _ -> []
+          S m -> [("style", A.String . fromMisoString $ M.foldrWithKey go mempty m)]
+            where
+              go :: MisoString -> MisoString -> MisoString -> MisoString
+              go k v ys = mconcat [ k, ":", v, ";" ] <> ys
+      xs = if not (T.null classes)
+          then M.insert "class" (A.String classes) propClass
+          else propClass
+      lattrs = [ L.makeAttribute k' (if k `elem` exceptions && v == A.Bool True then k' else v')
+               | (k,v) <- M.toList xs
+               , let k' = fromMisoString k
+               , let v' = toHtmlFromJSON v
+               , not (k `elem` exceptions && v == A.Bool False)
+               ]
+      exceptions = [ "checked"
+                   , "disabled"
+                   , "selected"
+                   , "hidden"
+                   , "readOnly"
+                   , "autoplay"
+                   , "required"
+                   , "default"
+                   , "autofocus"
+                   , "multiple"
+                   , "noValidate"
+                   , "autocomplete"
+                   ]
+      toTag = T.toLower
+      kids = foldMap L.toHtml $ collapseSiblingTextNodes vChildren
+  toHtml (Text x) | null x = L.toHtml (" " :: T.Text)
+                  | otherwise = L.toHtml (fromMisoString x :: T.Text)
+  toHtml (TextRaw x) | null x = L.toHtml (" " :: T.Text)
+                     | otherwise = L.toHtmlRaw (fromMisoString x :: T.Text)
+
+collapseSiblingTextNodes :: [View a] -> [View a]
+collapseSiblingTextNodes [] = []
+collapseSiblingTextNodes (Text x : Text y : xs) =
+  collapseSiblingTextNodes (Text (x <> y) : xs)
+-- TextRaw is the only child, so no need to collapse.
+collapseSiblingTextNodes (x:xs) =
+  x : collapseSiblingTextNodes xs
+
+-- | Helper for turning JSON into Text
+-- Object, Array and Null are kind of non-sensical here
+toHtmlFromJSON :: Value -> T.Text
+toHtmlFromJSON (A.String t) = t
+toHtmlFromJSON (A.Number t) = T.pack (show t)
+toHtmlFromJSON (A.Bool b) = if b then "true" else "false"
+toHtmlFromJSON A.Null = "null"
+toHtmlFromJSON (A.Object o) = T.pack (show o)
+toHtmlFromJSON (A.Array a) = T.pack (show a)
+
+-- | Virtual DOM implemented as a JavaScript `Object`.
+--   Used for diffing, patching and event delegation.
+--   Not meant to be constructed directly, see `View` instead.
+newtype VTree = VTree { getTree :: Object }
+
+runView :: View action -> Sink action -> JSM VTree
+runView (Node ns tag key attrs kids) sink = do
   vnode <- create
   cssObj <- objectToJSVal =<< create
   propsObj <- objectToJSVal =<< create
@@ -132,19 +199,25 @@ node ns tag key attrs kids = View $ \sink -> do
   pure $ VTree vnode
     where
       setAttrs vnode sink =
-        forM_ attrs $ \(Attribute attr) ->
-          attr sink vnode
+        forM_ attrs $ \case
+          P k v -> do
+            val <- toJSVal v
+            o <- getProp "props" vnode
+            set k val (Object o)
+          E attr -> attr sink vnode
+          S m -> do
+            cssObj <- getProp "css" vnode
+            forM_ (M.toList m) $ \(k,v) -> do
+              set k v (Object cssObj)
       setKids sink = do
         kidsViews <- traverse (objectToJSVal . getTree <=< flip runView sink) kids
         ghcjsPure (JSArray.fromList kidsViews)
-
-instance ToJSVal Options
-instance ToJSVal Key where toJSVal (Key x) = toJSVal x
-
-instance ToJSVal NS where
-  toJSVal SVG  = toJSVal ("svg" :: JSString)
-  toJSVal HTML = toJSVal ("html" :: JSString)
-  toJSVal MATHML = toJSVal ("mathml" :: JSString)
+runView (Text t) _ = do
+  vtree <- create
+  set "type" ("vtext" :: JSString) vtree
+  set "text" t vtree
+  pure $ VTree vtree
+runView (TextRaw t) s = runView (Text t) s
 
 -- | Namespace of DOM elements.
 data NS
@@ -153,21 +226,10 @@ data NS
   | MATHML  -- ^ MATHML Namespace
   deriving (Show, Eq)
 
--- | Create a new @VText@ with the given content.
-text :: MisoString -> View m
-text t = View . const $ do
-  vtree <- create
-  set "type" ("vtext" :: JSString) vtree
-  set "text" t vtree
-  pure $ VTree vtree
-
--- | For parity with server-side rendering. Don't use directly.
-textRaw :: MisoString -> View m
-textRaw = text
-
--- | `IsString` instance
-instance IsString (View a) where
-  fromString = text . fromString
+instance ToJSVal NS where
+  toJSVal SVG  = toJSVal ("svg" :: JSString)
+  toJSVal HTML = toJSVal ("html" :: JSString)
+  toJSVal MATHML = toJSVal ("mathml" :: JSString)
 
 -- | A unique key for a dom node.
 --
@@ -177,6 +239,8 @@ instance IsString (View a) where
 -- invariant gives undefined behavior at runtime.
 newtype Key = Key MisoString
 
+instance ToJSVal Key where toJSVal (Key x) = toJSVal x
+
 -- | Convert custom key types to `Key`.
 --
 -- Instances of this class do not have to guarantee uniqueness of the
@@ -206,15 +270,16 @@ instance ToKey Word where toKey = Key . toMisoString
 -- the @update@ function. This is especially useful for event handlers
 -- like the @onclick@ attribute. The second argument represents the
 -- vnode the attribute is attached to.
-newtype Attribute action = Attribute (Sink action -> Object -> JSM ())
+data Attribute action
+    = P MisoString Value
+    | E (Sink action -> Object -> JSM ())
+    | S (M.Map MisoString MisoString)
+    deriving Functor
 
 -- | @prop k v@ is an attribute that will set the attribute @k@ of the DOM node associated with the vnode
 -- to @v@.
-prop :: ToJSVal a => MisoString -> a -> Attribute action
-prop k v = Attribute . const $ \n -> do
-  val <- toJSVal v
-  o <- getProp "props" n
-  set k val (Object o)
+prop :: ToJSON a => MisoString -> a -> Attribute action
+prop k v = P k (toJSON v)
 
 -- | Convenience wrapper for @onWithOptions defaultOptions@.
 --
@@ -244,7 +309,7 @@ onWithOptions
   -> (r -> action)
   -> Attribute action
 onWithOptions options eventName Decoder{..} toAction =
-  Attribute $ \sink n -> do
+  E $ \sink n -> do
    eventObj <- getProp "events" n
    eventHandlerObject@(Object eo) <- create
    jsOptions <- toJSVal options
@@ -266,7 +331,7 @@ onWithOptions options eventName Decoder{..} toAction =
 -- otherwise the event may not be reliably called!
 onCreated :: action -> Attribute action
 onCreated action =
-  Attribute $ \sink n -> do
+  E $ \sink n -> do
     cb <- callbackToJSVal =<< asyncCallback (liftIO (sink action))
     set "onCreated" cb n
     registerCallback cb
@@ -279,7 +344,7 @@ onCreated action =
 -- otherwise the event may not be reliably called!
 onDestroyed :: action -> Attribute action
 onDestroyed action =
-  Attribute $ \sink n -> do
+  E $ \sink n -> do
     cb <- callbackToJSVal =<< asyncCallback (liftIO (sink action))
     set "onDestroyed" cb n
     registerCallback cb
@@ -292,7 +357,7 @@ onDestroyed action =
 -- otherwise the event may not be reliably called!
 onBeforeDestroyed :: action -> Attribute action
 onBeforeDestroyed action =
-  Attribute $ \sink n -> do
+  E $ \sink n -> do
     cb <- callbackToJSVal =<< asyncCallback (liftIO (sink action))
     set "onBeforeDestroyed" cb n
     registerCallback cb
@@ -308,7 +373,4 @@ onBeforeDestroyed action =
 -- <https://developer.mozilla.org/en-US/docs/Web/CSS>
 --
 style_ :: M.Map MisoString MisoString -> Attribute action
-style_ m = Attribute . const $ \n -> do
-   cssObj <- getProp "css" n
-   forM_ (M.toList m) $ \(k,v) ->
-     set k v (Object cssObj)
+style_ = S
diff --git a/src/Miso/Mathml/Element.hs b/src/Miso/Mathml/Element.hs
index 1dca9381..fa7d57a6 100644
--- a/src/Miso/Mathml/Element.hs
+++ b/src/Miso/Mathml/Element.hs
@@ -14,7 +14,7 @@ module Miso.Mathml.Element
       nodeMathml
   ) where
 
-import           Miso.Html.Internal
+import           Miso.Html.Types
 import           Miso.String (MisoString)
 import qualified Prelude            as P
 
diff --git a/src/Miso/Svg/Attribute.hs b/src/Miso/Svg/Attribute.hs
index 4ef616ec..4beb0f3b 100644
--- a/src/Miso/Svg/Attribute.hs
+++ b/src/Miso/Svg/Attribute.hs
@@ -270,7 +270,7 @@ module Miso.Svg.Attribute
   , writingMode_
   ) where
 
-import Miso.Html.Internal ( Attribute )
+import Miso.Html.Types ( Attribute )
 import Miso.Html.Property ( textProp )
 import Miso.String        ( MisoString )
 
diff --git a/src/Miso/Svg/Element.hs b/src/Miso/Svg/Element.hs
index ee501561..234376fa 100644
--- a/src/Miso/Svg/Element.hs
+++ b/src/Miso/Svg/Element.hs
@@ -103,7 +103,7 @@ module Miso.Svg.Element
   , view_
   ) where
 
-import           Miso.Html.Internal hiding (style_)
+import           Miso.Html.Types hiding (style_)
 import           Miso.String        (MisoString)
 import qualified Prelude            as P
 
diff --git a/src/Miso/Svg/Event.hs b/src/Miso/Svg/Event.hs
index bb989638..1bbd3bc6 100644
--- a/src/Miso/Svg/Event.hs
+++ b/src/Miso/Svg/Event.hs
@@ -39,7 +39,7 @@ module Miso.Svg.Event
 
 import Miso.Event 
 import Miso.Html.Event (onClick)
-import Miso.Html.Internal
+import Miso.Html.Types
 
 -- | onBegin event
 onBegin :: action -> Attribute action
diff --git a/src/Miso/Types.hs b/src/Miso/Types.hs
index 4daa002c..26c47b89 100644
--- a/src/Miso/Types.hs
+++ b/src/Miso/Types.hs
@@ -33,7 +33,7 @@ import           Data.Foldable (Foldable, for_)
 import qualified Data.Map as M
 import           Miso.Effect
 import           Miso.FFI (JSM)
-import           Miso.Html.Internal (View)
+import           Miso.Html.Types (View)
 import           Miso.String
 
 -- | Application entry point