diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,1 @@
+No license. Use the code as if it were yours.
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/heist-aeson.cabal b/heist-aeson.cabal
new file mode 100644
--- /dev/null
+++ b/heist-aeson.cabal
@@ -0,0 +1,60 @@
+-- heist-aeson.cabal auto-generated by cabal init. For additional
+-- options, see
+-- http://www.haskell.org/cabal/release/cabal-latest/doc/users-guide/authors.html#pkg-descr.
+-- The name of the package.
+Name:                heist-aeson
+
+-- The package version. See the Haskell package versioning policy
+-- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for
+-- standards guiding when and how versions should be incremented.
+Version:             0.1
+
+-- A short (one-line) description of the package.
+Synopsis:            Use JSON directly from Heist templates.
+
+-- A longer description of the package.
+Description:         Examples of how to use this library can be found in the "tests" directory.
+
+-- The license under which the package is released.
+License:             PublicDomain
+
+-- The file containing the license text.
+License-file:        LICENSE
+
+-- The package author(s).
+Author:              David Himmelstrup <lemmih@gmail.com>
+
+-- An email address to which users can send suggestions, bug reports,
+-- and patches.
+Maintainer:          David Himmelstrup <lemmih@gmail.com>
+
+-- A copyright notice.
+-- Copyright:           
+
+Category:            Web
+
+Build-type:          Simple
+
+-- Extra files to be distributed with the package, such as examples or
+-- a README.
+-- Extra-source-files:  
+
+-- Constraint on the version of Cabal needed to build this package.
+Cabal-version:       >=1.2
+
+
+Library
+  -- Modules exported by the library.
+  Exposed-modules:     Text.Templating.Heist.Aeson
+  Hs-Source-Dirs:      src/
+
+  -- Packages needed in order to build this package.
+  Build-depends:       base >= 4 && < 5, aeson, monads-fd, text, xmlhtml,
+                       bytestring, vector, containers, blaze-builder, heist
+  
+  -- Modules not exported by this package.
+  -- Other-modules:       
+  
+  -- Extra tools (e.g. alex, hsc2hs, ...) needed to build the source.
+  -- Build-tools:         
+  
diff --git a/src/Text/Templating/Heist/Aeson.hs b/src/Text/Templating/Heist/Aeson.hs
new file mode 100644
--- /dev/null
+++ b/src/Text/Templating/Heist/Aeson.hs
@@ -0,0 +1,151 @@
+{-# LANGUAGE OverloadedStrings #-}
+module Text.Templating.Heist.Aeson
+    ( JsonT
+    , JsonTemplate
+    , JsonState
+    , JsonSpliceT
+    , JsonSplice
+    , addHeistAeson
+    , runJsonT
+    , renderJsonTemplate
+    ) where
+
+import Data.Aeson                            ( Value(..), Array )
+import Text.Templating.Heist                 ( TemplateState, TemplateMonad
+                                             , Splice, getParamNode, MIMEType
+                                             , modifyTS, renderTemplate
+                                             , runNodeList, bindSplices )
+import Blaze.ByteString.Builder              ( Builder )
+import qualified Data.Map as Map             ( lookup, toList )
+import qualified Data.Vector as V            ( forM, toList )
+
+import qualified Data.ByteString as Strict   ( ByteString )
+
+import qualified Text.XmlHtml as X           ( Node(..), childNodes
+                                             , getAttribute )
+import qualified Data.Text as T              ( Text, append, pack, splitOn
+                                             , intercalate )
+
+import Control.Monad.Reader                  ( ReaderT, ask, local, runReaderT )
+
+
+type JsonT m = ReaderT Value m
+type JsonTemplate m a = TemplateMonad (JsonT m) a
+type JsonState m = TemplateState (JsonT m)
+type JsonSpliceT m = Splice (JsonT m)
+type JsonSplice = JsonSpliceT IO
+
+section :: Monad m => JsonSpliceT m
+section = do
+    node <- getParamNode
+    withRequiredAttribute "key" $ \nodeIdentifier -> do
+    withAnyValue nodeIdentifier $ \json -> do
+    openJson json $ do
+    runNodeList $ X.childNodes node
+
+noSection :: Monad m => JsonSpliceT m
+noSection = do
+    node <- getParamNode
+    withRequiredAttribute "key" $ \nodeIdentifier -> do
+    json <- ask
+    case findWithIdentifier nodeIdentifier json of
+      Just{}  -> return []
+      Nothing -> runNodeList $ X.childNodes node 
+
+repeated :: Monad m => JsonSpliceT m
+repeated = do
+    node <- getParamNode
+    withRequiredAttribute "key" $ \nodeIdentifier -> do
+    withArrayValue nodeIdentifier $ \array -> do
+    result <- V.forM array $ \entry -> openJson entry $ runNodeList $ X.childNodes node
+    return $ concat (V.toList result)
+
+withArrayValue ::Monad m => T.Text -> (Array -> JsonSpliceT m) -> JsonSpliceT m
+withArrayValue nodeIdentifier action
+    = withAnyValue nodeIdentifier $ \json ->
+      case json of
+        Array array -> action array
+        _           -> return [X.TextNode $ "Json value expected to be an array: " `T.append` nodeIdentifier]
+
+withAnyValue :: Monad m => T.Text -> (Value -> JsonSpliceT m) -> JsonSpliceT m
+withAnyValue nodeIdentifier action
+    = do json <- ask
+         case findWithIdentifier nodeIdentifier json of
+           Nothing    -> return []
+           Just value -> action value
+
+{-
+  Return corresponding json values for identifiers such as:
+    "@"
+    "key"
+    "object.key"
+-}
+findWithIdentifier :: T.Text -> Value -> Maybe Value
+findWithIdentifier "@" currentJsonScope = Just currentJsonScope
+findWithIdentifier identifier currentJsonScope
+    = worker (T.splitOn "." identifier) currentJsonScope
+    where worker [] json = Just json
+          worker (key:keys) json
+              = case json of
+                  Object object | Just value <- Map.lookup key object
+                    -> worker keys value
+                  _ -> Nothing
+
+withRequiredAttribute :: Monad m => T.Text -> (T.Text -> JsonSpliceT m) -> JsonSpliceT m
+withRequiredAttribute attribute action
+    = do node <- getParamNode
+         case X.getAttribute attribute node of
+           Nothing  -> return [X.TextNode ("Missing attribute: " `T.append` attribute)]
+           Just val -> action val
+
+-- Set a new json value as the current scope.
+-- I'm not quite happy with the way it works. 2011-03-30
+openJson :: Monad m => Value -> JsonTemplate m a -> JsonTemplate m a
+openJson json splice
+    = ask >>= \originalJsonScope ->
+      local (const json) $
+      do modifyTS $ closeJsonTS originalJsonScope
+         modifyTS $ openJsonTS json
+         tpl <- splice
+         modifyTS $ closeJsonTS json
+         return tpl
+
+openJsonTS :: Monad m => Value -> TemplateState m -> TemplateState m
+openJsonTS json
+    = bindSplices [ ("val:" `T.append` key, return [X.TextNode val])
+                    | (key, val) <- jsonToBinds json ]
+
+-- Undo the binds created with 'openJsonTS'.
+closeJsonTS :: Monad m => Value -> TemplateState m -> TemplateState m
+closeJsonTS json
+    = bindSplices [ ("val:" `T.append` key, generateOriginal)
+                    | (key, _val) <- jsonToBinds json ]
+    where generateOriginal = do node <- getParamNode
+                                return [node]
+
+jsonToBinds :: Value -> [(T.Text, T.Text)]
+jsonToBinds = worker []
+    where worker hierarchy json
+              = case json of
+                  Object object -> concat [ worker (key:hierarchy) val | (key, val) <- Map.toList object ]
+                  Array{}       -> []
+                  String string -> [(mkIndex hierarchy, string)]
+                  Number num    -> [(mkIndex hierarchy, T.pack $ show num)]
+                  Bool bool     -> [(mkIndex hierarchy, T.pack $ show bool)]
+                  Null          -> [(mkIndex hierarchy, "Null")]
+          mkIndex [] = "self"
+          mkIndex hierarchy = T.intercalate "." (reverse hierarchy)
+
+addHeistAeson :: Monad m => JsonState m -> JsonState m
+addHeistAeson
+    = bindSplices [ ("json:section", section)
+                  , ("json:no-section", noSection)
+                  , ("json:repeated", repeated) ]
+
+renderJsonTemplate :: Monad m => JsonState m -> Strict.ByteString -> Value -> m (Maybe (Builder, MIMEType))
+renderJsonTemplate state tplName json
+    = runReaderT (renderTemplate (openJsonTS json state) tplName) json
+
+runJsonT :: Monad m => JsonT m a -> Value -> m a
+runJsonT action json
+    = runReaderT action json