diff --git a/hledger-web/.hledger/unused/addform.hamlet b/hledger-web/.hledger/unused/addform.hamlet
deleted file mode 100644
index 89c9478a1..000000000
--- a/hledger-web/.hledger/unused/addform.hamlet
+++ /dev/null
@@ -1,47 +0,0 @@
-%script!type=text/javascript
- $$(document).ready(function() {
-    /* dhtmlxcombo setup */
-    window.dhx_globalImgPath="../static/";
-    var desccombo  = new dhtmlXCombo("description");
-    var acct1combo = new dhtmlXCombo("account1");
-    var acct2combo = new dhtmlXCombo("account2");
-    desccombo.enableFilteringMode(true);
-    acct1combo.enableFilteringMode(true);
-    acct2combo.enableFilteringMode(true);
-    desccombo.setSize(300);
-    acct1combo.setSize(300);
-    acct2combo.setSize(300);
- });
-
-%form#addform!method=POST;
-  %table.form
-   %tr
-    %td!colspan=4
-     %table
-      %tr#descriptionrow
-       %td
-        Date:
-       %td
-        %input.textinput!size=15!name=date!value=$date$
-       %td!style=padding-left:1em;
-        Description:
-       %td
-        %select!id=description!name=description
-         %option
-         $forall descriptions d
-          %option!value=$d$ $d$
-      %tr.helprow
-       %td
-       %td
-        .help $datehelp$ $
-       %td
-       %td
-        .help $deschelp$
-   $postingfields1$
-   $postingfields2$
-   %tr#addbuttonrow
-    %td!colspan=4
-     %input!type=hidden!name=action!value=add
-     %input!type=submit!name=submit!value="add transaction"
-     $if manyfiles
-      \ to: ^journalselect.files^
diff --git a/hledger-web/.hledger/unused/addformpostingfields.hamlet b/hledger-web/.hledger/unused/addformpostingfields.hamlet
deleted file mode 100644
index ff44e1088..000000000
--- a/hledger-web/.hledger/unused/addformpostingfields.hamlet
+++ /dev/null
@@ -1,15 +0,0 @@
- %tr#postingrow
-  %td!align=right $acctlabel$:
-  %td
-   %select!id=$acctvar$!name=$acctvar$
-    %option
-    $forall acctnames a
-     %option!value=$a$ $a$
-  $amtfield$
- %tr.helprow
-  %td
-  %td
-   .help $accthelp$
-  %td
-  %td
-   .help $amthelp$
diff --git a/hledger-web/.hledger/unused/default-layout.hamlet b/hledger-web/.hledger/unused/default-layout.hamlet
deleted file mode 100644
index 4b8ce5070..000000000
--- a/hledger-web/.hledger/unused/default-layout.hamlet
+++ /dev/null
@@ -1,9 +0,0 @@
-!!!
-%html
-    %head
-        %title $pageTitle.pc$
-        ^pageHead.pc^
-    %body
-        $maybe mmsg msg
-            #message $msg$
-        ^pageBody.pc^
diff --git a/hledger-web/.hledger/unused/homepage.cassius b/hledger-web/.hledger/unused/homepage.cassius
deleted file mode 100644
index f14022e41..000000000
--- a/hledger-web/.hledger/unused/homepage.cassius
+++ /dev/null
@@ -1,6 +0,0 @@
-body
-    font-family: sans-serif
-h1
-    text-align: center
-h2#$h2id$
-    color: red
diff --git a/hledger-web/.hledger/unused/homepage.hamlet b/hledger-web/.hledger/unused/homepage.hamlet
deleted file mode 100644
index bd73ffca1..000000000
--- a/hledger-web/.hledger/unused/homepage.hamlet
+++ /dev/null
@@ -1,12 +0,0 @@
-%h1 Hello
-%h2#$h2id$ You do not have Javascript enabled.
-$maybe mu u
-    %p
-        You are logged in as $userIdent.snd.u$. $
-        %a!href=@AuthR.LogoutR@ Logout
-        \.
-$nothing
-    %p
-        You are not logged in. $
-        %a!href=@AuthR.LoginR@ Login now
-        \.
diff --git a/hledger-web/.hledger/unused/homepage.julius b/hledger-web/.hledger/unused/homepage.julius
deleted file mode 100644
index 9bc2f68d2..000000000
--- a/hledger-web/.hledger/unused/homepage.julius
+++ /dev/null
@@ -1,3 +0,0 @@
-window.onload = function(){
-    document.getElementById("%h2id%").innerHTML = "<i>Added from JavaScript.</i>";
-}
diff --git a/hledger-web/.hledger/web/favicon.ico b/hledger-web/.hledger/web/favicon.ico
deleted file mode 100644
index 4613ed03a..000000000
Binary files a/hledger-web/.hledger/web/favicon.ico and /dev/null differ
diff --git a/hledger-web/.hledger/web/combo_select.gif b/hledger-web/.hledger/web/static/combo_select.gif
similarity index 100%
rename from hledger-web/.hledger/web/combo_select.gif
rename to hledger-web/.hledger/web/static/combo_select.gif
diff --git a/hledger-web/.hledger/web/dhtmlxcombo.js b/hledger-web/.hledger/web/static/dhtmlxcombo.js
similarity index 100%
rename from hledger-web/.hledger/web/dhtmlxcombo.js
rename to hledger-web/.hledger/web/static/dhtmlxcombo.js
diff --git a/hledger-web/.hledger/web/dhtmlxcommon.js b/hledger-web/.hledger/web/static/dhtmlxcommon.js
similarity index 100%
rename from hledger-web/.hledger/web/dhtmlxcommon.js
rename to hledger-web/.hledger/web/static/dhtmlxcommon.js
diff --git a/hledger-web/.hledger/web/static/favicon.ico b/hledger-web/.hledger/web/static/favicon.ico
new file mode 100644
index 000000000..9888b98f9
Binary files /dev/null and b/hledger-web/.hledger/web/static/favicon.ico differ
diff --git a/hledger-web/.hledger/web/hledger.js b/hledger-web/.hledger/web/static/hledger.js
similarity index 100%
rename from hledger-web/.hledger/web/hledger.js
rename to hledger-web/.hledger/web/static/hledger.js
diff --git a/hledger-web/.hledger/web/jquery.js b/hledger-web/.hledger/web/static/jquery.js
similarity index 100%
rename from hledger-web/.hledger/web/jquery.js
rename to hledger-web/.hledger/web/static/jquery.js
diff --git a/hledger-web/.hledger/web/jquery.url.js b/hledger-web/.hledger/web/static/jquery.url.js
similarity index 100%
rename from hledger-web/.hledger/web/jquery.url.js
rename to hledger-web/.hledger/web/static/jquery.url.js
diff --git a/hledger-web/.hledger/web/style.css b/hledger-web/.hledger/web/static/style.css
similarity index 98%
rename from hledger-web/.hledger/web/style.css
rename to hledger-web/.hledger/web/static/style.css
index fde7ba490..adcef832f 100644
--- a/hledger-web/.hledger/web/style.css
+++ b/hledger-web/.hledger/web/static/style.css
@@ -1,3 +1,10 @@
+/* LOCAL:
+hledger-web executables built in this repo will include these local styles
+when generating the web support files
+*/
+body { border-top: thin solid red; }
+/* END LOCAL */
+
 /* hledger web ui styles */
 
 /*------------------------------------------------------------------------------------------*/
diff --git a/hledger-web/.hledger/unused/default-layout.cassius b/hledger-web/.hledger/web/templates/default-layout.cassius
similarity index 100%
rename from hledger-web/.hledger/unused/default-layout.cassius
rename to hledger-web/.hledger/web/templates/default-layout.cassius
diff --git a/hledger-web/.hledger/web/templates/default-layout.hamlet b/hledger-web/.hledger/web/templates/default-layout.hamlet
new file mode 100644
index 000000000..d07318684
--- /dev/null
+++ b/hledger-web/.hledger/web/templates/default-layout.hamlet
@@ -0,0 +1,9 @@
+!!!
+<html
+    <head
+        <title>#{pageTitle pc}
+        ^{pageHead pc}
+    <body
+        $maybe msg <- mmsg
+            <div #message>#{msg}
+        ^{pageBody pc}
diff --git a/hledger-web/.hledger/web/templates/homepage.cassius b/hledger-web/.hledger/web/templates/homepage.cassius
new file mode 100644
index 000000000..d6eee1b56
--- /dev/null
+++ b/hledger-web/.hledger/web/templates/homepage.cassius
@@ -0,0 +1,4 @@
+h1
+    text-align: center
+h2##{h2id}
+    color: #990
diff --git a/hledger-web/.hledger/web/templates/homepage.hamlet b/hledger-web/.hledger/web/templates/homepage.hamlet
new file mode 100644
index 000000000..ccab6463c
--- /dev/null
+++ b/hledger-web/.hledger/web/templates/homepage.hamlet
@@ -0,0 +1,2 @@
+<h1>Hello
+<h2 ##{h2id}>You could have Javascript enabled.
\ No newline at end of file
diff --git a/hledger-web/.hledger/web/templates/homepage.julius b/hledger-web/.hledger/web/templates/homepage.julius
new file mode 100644
index 000000000..0589b9153
--- /dev/null
+++ b/hledger-web/.hledger/web/templates/homepage.julius
@@ -0,0 +1,3 @@
+window.onload = function(){
+    document.getElementById("#{h2id}").innerHTML = "<i>Added from JavaScript.</i>";
+}
diff --git a/hledger-web/App.hs b/hledger-web/App.hs
new file mode 100644
index 000000000..c7537250a
--- /dev/null
+++ b/hledger-web/App.hs
@@ -0,0 +1,100 @@
+{-# LANGUAGE QuasiQuotes, TemplateHaskell, TypeFamilies #-}
+{-# LANGUAGE OverloadedStrings #-}
+module App
+    ( App (..)
+    , AppRoute (..)
+    , resourcesApp
+    , Handler
+    , Widget
+    , module Yesod.Core
+    , module Settings
+    , StaticRoute (..)
+    , lift
+    , liftIO
+    ) where
+
+import Yesod.Core
+import Yesod.Helpers.Static
+import qualified Settings
+import System.Directory
+import qualified Data.ByteString.Lazy as L
+import Settings (hamletFile, cassiusFile, juliusFile, widgetFile)
+import Control.Monad (unless)
+import Control.Monad.Trans.Class (lift)
+import Control.Monad.IO.Class (liftIO)
+import qualified Data.Text as T
+
+import Hledger.Cli.Options (Opt)
+import Hledger.Data (Journal)
+
+-- | The site argument for your application. This can be a good place to
+-- keep settings and values requiring initialization before your application
+-- starts running, such as database connections. Every handler will have
+-- access to the data present here.
+data App = App
+    {getStatic :: Static -- ^ Settings for static file serving.
+    ,appRoot    :: T.Text
+    ,appOpts    :: [Opt]
+    ,appArgs    :: [String]
+    ,appJournal :: Journal
+    }
+
+-- | A useful synonym; most of the handler functions in your application
+-- will need to be of this type.
+type Handler = GHandler App App
+
+-- | A useful synonym; most of the widgets functions in your application
+-- will need to be of this type.
+type Widget = GWidget App App
+
+-- This is where we define all of the routes in our application. For a full
+-- explanation of the syntax, please see:
+-- http://docs.yesodweb.com/book/web-routes-quasi/
+--
+-- This function does three things:
+--
+-- * Creates the route datatype AppRoute. Every valid URL in your
+--   application can be represented as a value of this type.
+-- * Creates the associated type:
+--       type instance Route App = AppRoute
+-- * Creates the value resourcesApp which contains information on the
+--   resources declared below. This is used in Controller.hs by the call to
+--   mkYesodDispatch
+--
+-- What this function does *not* do is create a YesodSite instance for
+-- App. Creating that instance requires all of the handler functions
+-- for our application to be in scope. However, the handler functions
+-- usually require access to the AppRoute datatype. Therefore, we
+-- split these actions into two functions and place them in separate files.
+mkYesodData "App" $(parseRoutesFile "routes")
+
+-- Please see the documentation for the Yesod typeclass. There are a number
+-- of settings which can be configured by overriding methods here.
+instance Yesod App where
+    approot = appRoot
+
+    defaultLayout widget = do
+        mmsg <- getMessage
+        pc <- widgetToPageContent $ do
+            widget
+            addCassius $(Settings.cassiusFile "default-layout")
+        hamletToRepHtml $(Settings.hamletFile "default-layout")
+
+    -- This is done to provide an optimization for serving static files from
+    -- a separate domain. Please see the staticroot setting in Settings.hs
+    -- urlRenderOverride a (StaticR s) =
+    --     Just $ uncurry (joinPath a Settings.staticroot) $ renderRoute s
+    -- urlRenderOverride _ _ = Nothing
+
+    -- This function creates static content files in the static folder
+    -- and names them based on a hash of their content. This allows
+    -- expiration dates to be set far in the future without worry of
+    -- users receiving stale content.
+    addStaticContent ext' _ content = do
+        let fn = base64md5 content ++ '.' : T.unpack ext'
+        let statictmp = Settings.staticdir ++ "/tmp/"
+        liftIO $ createDirectoryIfMissing True statictmp
+        let fn' = statictmp ++ fn
+        exists <- liftIO $ doesFileExist fn'
+        unless exists $ liftIO $ L.writeFile fn' content
+        return $ Just $ Right (StaticR $ StaticRoute ["tmp", T.pack fn] [], [])
\ No newline at end of file
diff --git a/hledger-web/Controller.hs b/hledger-web/Controller.hs
new file mode 100644
index 000000000..0726f540c
--- /dev/null
+++ b/hledger-web/Controller.hs
@@ -0,0 +1,56 @@
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+module Controller
+    ( withApp
+    , withDevelApp
+    ) where
+
+import App
+import Settings
+import Yesod.Helpers.Static
+import Data.ByteString (ByteString)
+import Network.Wai (Application)
+import Data.Dynamic (Dynamic, toDyn)
+import System.FilePath ((</>))
+
+-- Import all relevant handler modules here.
+import Handlers
+
+import Hledger.Data (nulljournal)
+
+-- This line actually creates our YesodSite instance. It is the second half
+-- of the call to mkYesodData which occurs in App.hs. Please see
+-- the comments there for more details.
+mkYesodDispatch "App" resourcesApp
+
+-- Some default handlers that ship with the Yesod site template. You will
+-- very rarely need to modify this.
+getFaviconR :: Handler ()
+getFaviconR = sendFile "image/x-icon" $ Settings.staticdir </> "favicon.ico"
+
+getRobotsR :: Handler RepPlain
+getRobotsR = return $ RepPlain $ toContent ("User-agent: *" :: ByteString)
+
+-- This function allocates resources (such as a database connection pool),
+-- performs initialization and creates a WAI application. This is also the
+-- place to put your migrate statements to have automatic database
+-- migrations handled by Yesod.
+withApp :: App -> (Application -> IO a) -> IO a
+withApp a f = do
+    toWaiApp a >>= f
+  -- where
+  --   s = static Settings.staticdir
+
+withDevelApp :: Dynamic
+-- withDevelApp = undefined
+withDevelApp = toDyn (withApp a :: (Application -> IO ()) -> IO ())
+   where a = App{
+              getStatic=static Settings.staticdir
+             ,appRoot=Settings.defapproot
+             ,appOpts=[]
+             ,appArgs=[]
+             ,appJournal=nulljournal
+             }
+
diff --git a/hledger-web/Hledger/Web/Files.hs b/hledger-web/EmbeddedFiles.hs
similarity index 62%
rename from hledger-web/Hledger/Web/Files.hs
rename to hledger-web/EmbeddedFiles.hs
index 72d671d37..8cbbeb6e0 100644
--- a/hledger-web/Hledger/Web/Files.hs
+++ b/hledger-web/EmbeddedFiles.hs
@@ -1,14 +1,14 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-| 
 
-Support files used by the web app are embedded here at compile time via
-template haskell magic.  This allows us minimise deployment hassle by
-recreating them on the filesystem when needed (since hamlet can not use
-the embedded files directly.)  Installing on the filesystem has the added
-benefit of making them easily customisable.
+Support files (static files and templates) used by the web app are
+embedded in this module at compile time. Since hamlet can not use the
+embedded files directly, we also provide a way to write them out to the
+filesystem at startup, when needed. This simplifies installation for
+end-users, and customisation too.
 
 -}
-module Hledger.Web.Files
+module EmbeddedFiles
     (
      files
     ,createFilesIfMissing
@@ -18,9 +18,9 @@ import Control.Monad
 import qualified Data.ByteString as B
 import Data.FileEmbed (embedDir)
 import System.Directory
+import System.FilePath
 
-import Hledger.Web.Settings (datadir)
-
+import Settings (datadir)
 
 -- | An embedded copy of all files below the the hledger-web data
 -- directory (@.hledger/web/@) at compile time, as (FilePath,ByteString)
@@ -40,5 +40,7 @@ createFilesIfMissing = do
    else do
      createDirectoryIfMissing True datadir  
      setCurrentDirectory datadir
-     forM_ files $ \(f,d) -> B.writeFile f d
+     forM_ files $ \(f,d) -> do
+                              createDirectoryIfMissing True $ takeDirectory f
+                              B.writeFile f d
      return True
diff --git a/hledger-web/Hledger/Web/App.hs b/hledger-web/Handlers.hs
similarity index 58%
rename from hledger-web/Hledger/Web/App.hs
rename to hledger-web/Handlers.hs
index 84393e42e..49c8de626 100644
--- a/hledger-web/Hledger/Web/App.hs
+++ b/hledger-web/Handlers.hs
@@ -1,36 +1,13 @@
-{-# LANGUAGE CPP, QuasiQuotes, TemplateHaskell, TypeFamilies, GeneralizedNewtypeDeriving, OverloadedStrings #-}
-{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, MultiParamTypeClasses, FlexibleContexts #-}
-{-| 
-The web app providing a richer interface to hledger's data.
--}
--- with authentication, registration and persistent storage of user accounts (not yet)
-module Hledger.Web.App
-    ( App (..)
-    , withApp
-    )
-where
-import Control.Applicative ((<$>), (<*>))
--- import Control.Failure
-import qualified Data.ByteString.Lazy as L
-import Data.Either
--- import qualified Data.Text as T
+{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings #-}
+module Handlers where
+
+import Control.Applicative ((<$>)) --, (<*>))
 import Data.Text(Text,pack,unpack)
-import System.Directory
-import System.FilePath ((</>), takeFileName)
+import System.FilePath (takeFileName) --(</>))
 import System.IO.Storage (putValue, getValue)
-import Text.Jasmine (minifym)
+import Text.Hamlet
 import Text.ParserCombinators.Parsec hiding (string)
 
--- import Database.Persist.GenericSql (ConnectionPool, SqlPersist, runMigration, migrate)
-import Yesod
-import Yesod.Helpers.Static
--- import Yesod.Helpers.Auth
--- import Yesod.Mail
--- import Yesod.WebRoutes
--- import Text.Hamlet (defaultHamletSettings)
--- import Text.Hamlet.RT
-
-import Hledger.Cli.Add (appendToJournalFile)
 import Hledger.Cli.Balance
 import Hledger.Cli.Print
 import Hledger.Cli.Register
@@ -38,496 +15,22 @@ import Hledger.Cli.Options hiding (value)
 import Hledger.Cli.Utils
 import Hledger.Cli.Version (version)
 import Hledger.Data hiding (insert, today)
-import Hledger.Read (journalFromPathAndString)
-import Hledger.Read.JournalReader (someamount)
-import Hledger.Web.Settings
-    -- --   withConnectionPool
-    -- -- , runConnectionPool
-    -- -- , staticroot
-    --   datadir
-    -- -- , hamletFile
-    -- -- , cassiusFile
-    -- -- , juliusFile
-    -- -- , hledgerorgurl
-    -- , manualurl
-    -- -- , style_css
-    -- -- , hledger_js
-    -- -- , jquery_js
-    -- -- , jquery_url_js
-    -- -- , dhtmlxcommon_js
-    -- -- , dhtmlxcombo_js
-    -- , robots_txt
-    -- )
 
+import App
+import Settings
+import StaticFiles
 
-----------------------------------------------------------------------
--- define the web app
-----------------------------------------------------------------------
-
--- persistent data schema for the web app. User account info is stored here,
--- hledger's main data is stored in the usual places (journal files etc.)
--- persist (quasi-quoter from persistent) defines a list of data entities.
--- mkPersist (template haskell from persistent) defines persistence-capable data types based on these.
--- mkPersist [$persist|
--- User
---     ident String
---     password String null update
---     UniqueUser ident
--- Email
---     email String
---     user UserId null update
---     verkey String null update
---     UniqueEmail email
--- |]
-
--- run-time data kept by the web app.
-data App = App
-    { -- appConnPool :: Maybe ConnectionPool
-     appRoot    :: Text
-    ,appDataDir :: FilePath
-    ,appOpts    :: [Opt]
-    ,appArgs    :: [String]
-    ,appStaticSettings :: Static
-    ,appJournal :: Journal
-    }
-
--- parseRoutes (quasi-quoter from web-routes) defines a list of route patterns for the web app.
--- mkYesod (template haskell from yesod) defines types for the web app based on the routes.
--- /auth            AuthR             Auth getAuth
-mkYesod "App" [$parseRoutes|
-/                IndexR            GET
-/static          StaticR           Static appStaticSettings
-/favicon.ico     FaviconR          GET
-/robots.txt      RobotsR           GET
-/journalonly     JournalOnlyR      GET POST
-/registeronly    RegisterOnlyR     GET
-/accounts        AccountsOnlyR     GET
-/journal         JournalR          GET POST
-/register        RegisterR         GET POST
-|]
--- /addformrt       AddformRTR        GET
-
-type Handler = GHandler App App
-
-instance Yesod App where
-    approot = appRoot
-    -- This function creates static content files in the static folder
-    -- and names them based on a hash of their content. This allows
-    -- expiration dates to be set far in the future without worry of
-    -- users receiving stale content.
-    addStaticContent ext' _ content = do
-        let fn = base64md5 content ++ '.' : unpack ext'
-        let content' =
-                if ext' == "js"
-                    then case minifym content of
-                            Left _ -> content
-                            Right y -> y
-                    else content
-        let statictmp = Hledger.Web.Settings.datadir ++ "/tmp/"
-        liftIO $ createDirectoryIfMissing True statictmp
-        let fn' = statictmp ++ fn
-        exists <- liftIO $ doesFileExist fn'
-        unless exists $ liftIO $ L.writeFile fn' content'
-        return $ Just $ Right (StaticR $ StaticRoute ["tmp", pack fn] [], [])
-
-    -- defaultLayout widget = do
-    --     mmsg <- getMessage
-    --     pc <- widgetToPageContent $ do
-    --         widget
-    --         addCassius $(cassiusFile "default-layout")
-    --     hamletToRepHtml $(hamletFile "default-layout")
-
-    -- authRoute _ = Just $ AuthR LoginR
-
-    -- static file-serving optimisations, disable for the moment
-    -- urlRenderOverride a (StaticR s) =
-    --     Just $ uncurry (joinPath a staticroot) $ format s
-    --   where
-    --     format = formatPathSegments ss
-    --     ss :: Site StaticRoute (String -> Maybe (GHandler Static App ChooseRep))
-    --     ss = getSubSite
-    urlRenderOverride _ _ = Nothing
-    -- addStaticContent ext' _ content = do
-    --     let fn = base64md5 content ++ '.' : ext'
-    --     let statictmp = datadir ++ "/tmp/"
-    --     liftIO $ createDirectoryIfMissing True statictmp
-    --     liftIO $ L.writeFile (statictmp ++ fn) content
-    --     return $ Just $ Right (StaticR $ StaticRoute ["tmp", fn] [], [])
-
--- instance YesodPersist App where
---     type YesodDB App = SqlPersist
---     runDB db = do
---       y <- getYesod
---       let p = appConnPool y
---       case p of Just p' -> runConnectionPool db p'
---                 Nothing -> error "no connection pool, programmer error" -- XXX
-
--- instance YesodAuth App where
---     type AuthEntity App = User
---     type AuthEmailEntity App = Email
-
---     defaultDest _ = IndexR
-
---     getAuthId creds _extra = runDB $ do
---         x <- getBy $ UniqueUser $ credsIdent creds
---         case x of
---             Just (uid, _) -> return $ Just uid
---             Nothing -> do
---                 fmap Just $ insert $ User (credsIdent creds) Nothing
-
---     openIdEnabled _ = True
-
---     emailSettings _ = Just EmailSettings {
---           addUnverified = \email verkey -> runDB $ insert $ Email email Nothing (Just verkey)
---         , sendVerifyEmail = sendVerifyEmail'
---         , getVerifyKey = runDB . fmap (join . fmap emailVerkey) . get
---         , setVerifyKey = \eid key -> runDB $ update eid [EmailVerkey $ Just key]
---         , verifyAccount = \eid -> runDB $ do
---             me <- get eid
---             case me of
---                 Nothing -> return Nothing
---                 Just e -> do
---                     let email = emailEmail e
---                     case emailUser e of
---                         Just uid -> return $ Just uid
---                         Nothing -> do
---                             uid <- insert $ User email Nothing
---                             update eid [EmailUser $ Just uid]
---                             return $ Just uid
---         , getPassword = runDB . fmap (join . fmap userPassword) . get
---         , setPassword = \uid pass -> runDB $ update uid [UserPassword $ Just pass]
---         , getEmailCreds = \email -> runDB $ do
---             me <- getBy $ UniqueEmail email
---             case me of
---                 Nothing -> return Nothing
---                 Just (eid, e) -> return $ Just EmailCreds
---                     { emailCredsId = eid
---                     , emailCredsAuthId = emailUser e
---                     , emailCredsStatus = isJust $ emailUser e
---                     , emailCredsVerkey = emailVerkey e
---                     }
---         , getEmail = runDB . fmap (fmap emailEmail) . get
---         }
-
--- sendVerifyEmail' :: String -> String -> String -> GHandler Auth m ()
--- sendVerifyEmail' email _ verurl =
---     liftIO $ renderSendMail Mail
---             { mailHeaders =
---                 [ ("From", "noreply")
---                 , ("To", email)
---                 , ("Subject", "Verify your email address")
---                 ]
---             , mailPlain = verurl
---             , mailParts = return Part
---                 { partType = "text/html; charset=utf-8"
---                 , partEncoding = None
---                 , partDisposition = Inline
---                 , partContent = renderHamlet id [$hamlet|
--- %p Please confirm your email address by clicking on the link below.
--- %p
---     %a!href=$verurl$ $verurl$
--- %p Thank you
--- |]
---                 }
---             }
-
--- | Migrate the app's persistent data and run the given yesod/persistent/wai-ish IO action on it.
--- withApp :: App -> (Yesod.Application -> IO a) -> IO a
--- withApp app f = toPersistentApp app >>= toWaiApp >>= f
-withApp :: App -> (Yesod.Application -> IO a) -> IO a
-withApp app f = toWaiApp app >>= f
-
--- -- | Obtain a persistent db connection pool to the app, and run any necessary data migrations.
--- toPersistentApp :: App -> IO App
--- toPersistentApp app = withConnectionPool $ \p -> do
---     flip runConnectionPool p $ runMigration $ do
---         migrate (undefined :: User)
---         migrate (undefined :: Email)
---         return ()
---     return app{appConnPool=Just p}
-
-
-----------------------------------------------------------------------
--- handler utilities, common templates
-----------------------------------------------------------------------
-
-nulltemplate :: Hamlet AppRoute
-nulltemplate = [$hamlet||]
-
--- | A bundle of useful data passed to templates.
-data TemplateData = TD {
-     here         :: AppRoute -- ^ the current page's route
-    ,title        :: String             -- ^ page's title
-    ,msg          :: Maybe Html         -- ^ transient message
-    ,a            :: String             -- ^ a (acct/desc filter pattern) parameter
-    ,p            :: String             -- ^ p (period expression) parameter
-    ,j            :: Journal            -- ^ the current journal
-    ,today        :: Day                -- ^ the current day
-    }
-
-mktd :: TemplateData
-mktd = TD {
-      here = IndexR
-     ,title = "hledger"
-     ,msg = Nothing
-     ,a = ""
-     ,p = ""
-     ,j = nulljournal
-     ,today = ModifiedJulianDay 0
-     }
-
--- | Gather the data useful for a hledger web request handler, including:
--- initial command-line options, current a and p query string values, a
--- journal filter specification based on the above and the current time,
--- an up-to-date parsed journal, the current route, and the current ui
--- message if any.
-getHandlerData :: Handler (String, String, [Opt], FilterSpec, Journal, Maybe Html, AppRoute)
-getHandlerData = do
-  Just here' <- getCurrentRoute
-  (a, p, opts, fspec) <- getReportParameters
-  (j, err) <- getLatestJournal opts
-  msg <- getMessage' err
-  return (a, p, opts, fspec, j, msg, here')
-    where
-      -- | Get current report parameters for this request.
-      getReportParameters :: Handler (String, String, [Opt], FilterSpec)
-      getReportParameters = do
-          app <- getYesod
-          t <- liftIO $ getCurrentLocalTime
-          a <- fromMaybe "" <$> lookupGetParam "a"
-          p <- fromMaybe "" <$> lookupGetParam "p"
-          let (a',p') = (unpack a, unpack p)
-              opts = appOpts app ++ [Period p']
-              args = appArgs app ++ words' a'
-              fspec = optsToFilterSpec opts args t
-          return (a', p', opts, fspec)
-
-      -- | Quote-sensitive words, ie don't split on spaces which are inside quotes.
-      words' :: String -> [String]
-      words' = fromparse . parsewith ((quotedPattern <|> pattern) `sepBy` many1 spacenonewline)
-          where
-            pattern = many (noneOf " \n\r\"")
-            quotedPattern = between (oneOf "'\"") (oneOf "'\"") $ many $ noneOf "'\""
-
-      -- | Update our copy of the journal if the file changed. If there is an
-      -- error while reloading, keep the old one and return the error, and set a
-      -- ui message.
-      getLatestJournal :: [Opt] -> Handler (Journal, Maybe String)
-      getLatestJournal opts = do
-        j <- liftIO $ fromJust `fmap` getValue "hledger" "journal"
-        (jE, changed) <- liftIO $ journalReloadIfChanged opts j
-        if not changed
-         then return (j,Nothing)
-         else case jE of
-                Right j' -> do liftIO $ putValue "hledger" "journal" j'
-                               return (j',Nothing)
-                Left e  -> do setMessage $ "error while reading" {- ++ ": " ++ e-}
-                              return (j, Just e)
-
-      -- | Helper to work around a yesod feature (can't set and get a message in the same request.)
-      getMessage' :: Maybe String -> Handler (Maybe Html)
-      getMessage' newmsgstr = do
-        oldmsg <- getMessage
-        return $ maybe oldmsg (Just . toHtml) newmsgstr
-
--- | Wrap a template with the standard hledger web ui page layout.
-pageLayout :: TemplateData -> Hamlet AppRoute -> Hamlet AppRoute
-pageLayout td@TD{title=basetitle, msg=msg, p=p, j=j, today=today} content = [$hamlet|
-!!!
-<html
- <head
-  <title>#{title'}
-  <meta http-equiv=Content-Type content=#{metacontent}
-  <script type=text/javascript src=@{StaticR jquery_js}
-  <script type=text/javascript src=@{StaticR jquery_url_js}
-  <script type=text/javascript src=@{StaticR dhtmlxcommon_js}
-  <script type=text/javascript src=@{StaticR dhtmlxcombo_js}
-  <script type=text/javascript src=@{StaticR hledger_js}
-  <link rel=stylesheet type=text/css media=all href=@{StaticR style_css}
- <body
-  ^{navbar td}
-  <div#messages>#{m}
-  <div#content
-   ^{content}
-|]
- where title' = basetitle ++ " - " ++ journaltitle
-       (journaltitle, _) = journalTitleDesc j p today
-       metacontent = "text/html; charset=utf-8" :: String
-       m = fromMaybe "" msg
-
--- | Global toolbar/heading area.
-navbar :: TemplateData -> Hamlet AppRoute
-navbar TD{p=p,j=j,today=today} = [$hamlet|
- <div#navbar
-  <a.topleftlink href=#{hledgerorgurl}
-   hledger-web
-   <br />
-   #{version}
-  <a.toprightlink href=#{manualurl} target=hledgerhelp manual
-  <h1>#{title}
-  \ #
-  <span#journaldesc>#{desc}
-|]
-  where (title, desc) = journalTitleDesc j p today
-
--- | Generate a title and description for the given journal, period
--- expression, and date.
-journalTitleDesc :: Journal -> String -> Day -> (String, String)
-journalTitleDesc j p today = (title, desc)
-  where
-    title = printf "%s" (takeFileName $ journalFilePath j) :: String
-    desc  = printf "%s" (showspan span) :: String
-    span = either (const $ DateSpan Nothing Nothing) snd (parsePeriodExpr today p)
-    showspan (DateSpan Nothing Nothing) = ""
-    showspan s = " (" ++ dateSpanAsText s ++ ")"
-
--- | Links to the main views.
-navlinks :: TemplateData -> Hamlet AppRoute
-navlinks td = [$hamlet|
- <div#navlinks
-  ^{accountsjournallink}
-  \ | #
-  ^{accountsregisterlink}
-  \ | #
-  <a#addformlink href onclick="return addformToggle(event)">add transaction
-  <a#importformlink href onclick="return importformToggle(event)" style="display:none;">import transactions
-  \ | #
-  <a#editformlink href onclick="return editformToggle(event)">edit journal
-|]
---  \ | #
- where
-   accountsjournallink  = navlink td "journal" JournalR
-   accountsregisterlink = navlink td "register" RegisterR
-
-navlink :: TemplateData -> String -> AppRoute -> Hamlet AppRoute
-navlink TD{here=here,a=a,p=p} s dest = [$hamlet|<a##{s}link.#{style} href=@?{u}>#{s}</a>|]
- where u = (dest, concat [(if null a then [] else [("a", pack a)])
-                         ,(if null p then [] else [("p", pack p)])])
-       style | dest == here = "navlinkcurrent"
-             | otherwise    = "navlink" :: Text
-
--- | Form controlling journal filtering parameters.
-filterform :: TemplateData -> Hamlet AppRoute
-filterform TD{here=here,a=a,p=p} = [$hamlet|
- <div#filterformdiv
-  <form#filterform.form method=GET style=display:#{visible};
-   <table.form
-    <tr.#{filteringperiodclass}
-     <td
-      filter by period:
-      \ #
-     <td
-      <input name=p size=60 value=#{p}
-      ^{phelp}
-      \ #
-     <td align=right
-      ^{stopfilteringperiod}
-    <tr.#{filteringclass}
-     <td
-      filter by account/description:
-      \ #
-     <td
-      <input name=a size=60 value=#{a}
-      ^{ahelp}
-      \ #
-      <input type=submit value=filter #
-      \ #
-     <td align=right
-      ^{stopfiltering}
-|]
- where
-  ahelp = helplink "filter-patterns" "?"
-  phelp = helplink "period-expressions" "?"
-  filtering = not $ null a
-  filteringperiod = not $ null p
-  visible = "block" :: String
-  filteringclass = if filtering then "filtering" else "" :: String
-  filteringperiodclass = if filteringperiod then "filtering" else "" :: String
-  stopfiltering = if filtering then [$hamlet|<a#stopfilterlink href=@?{u} clear filter|] else nulltemplate
-      where u = (here, if filteringperiod then [("p", pack p)] else [])
-  stopfilteringperiod = if filteringperiod then [$hamlet|<a#stopfilterlink href=@?{u} clear filter|] else nulltemplate
-      where u = (here, if filtering then [("a", pack a)] else [])
-
--- | Link to a topic in the manual.
-helplink :: String -> String -> Hamlet AppRoute
-helplink topic label = [$hamlet|<a href=#{u} target=hledgerhelp>#{label}|]
-    where u = manualurl ++ if null topic then "" else '#':topic
-
-{-
-
--- | Render a runtime template with the provided runtime data as html.
-renderHamletFileRT :: FilePath -> HamletMap AppRoute -> Handler Html
-renderHamletFileRT hfile hmap = do
-  hrt <- readTemplateFile hfile >>= parseHamletRT defaultHamletSettings
-  renderHamletRT hrt hmap urlParamsToString
-
--- | Read a file from the app's templates directory.
-readTemplateFile :: FilePath -> Handler String
-readTemplateFile hfile = do
-  dir <- appDataDir `fmap` getYesod
-  liftIO $ readFile $ dir </> hfile
-
--- what to do if rendering a runtime template fails.
-instance Failure HamletException Handler
-    where failure = error' . show
-
-renderHamletAsHtml :: Hamlet AppRoute -> Html
-renderHamletAsHtml h = h urlParamsToString
-
-htmlAsHamlet :: Html -> Hamlet AppRoute
-htmlAsHamlet h = [$hamlet|$h$|]
-
-urlParamsToString :: AppRoute -> [(String,String)] -> String
-urlParamsToString u [] = show u
-urlParamsToString u ps = show u ++ "?" ++ intercalate "&" [k++"="++v | (k,v) <- ps]
-
--- | Convert a string to a hamlet HDHtml data item.
-hdstring :: String -> HamletData AppRoute
-hdstring = HDHtml . string
-
--- | Convert a simple list of strings to hamlet's complicated HDList type.
-hdstringlist :: [String] -> HamletData AppRoute
-hdstringlist ss = HDList [ [([], hdstring s)] | s <- ss ]
-
--- renderHamletRT' :: Failure HamletException m => HamletMap AppRoute -> HamletRT -> m Html
--- renderHamletRT' m h = renderHamletRT h m urlParamsToString
-
--- parseHamletRT' :: Failure HamletException m => String -> m HamletRT
--- parseHamletRT' s = parseHamletRT defaultHamletSettings s
-
--- hamletToHamletRT ::  Failure HamletException m => Hamlet AppRoute -> m HamletRT
--- hamletToHamletRT h = stringToHamletRT $ show $ unsafeByteString $ renderHamlet show h
-
--}
 
 ----------------------------------------------------------------------
 -- handlers/views
 ----------------------------------------------------------------------
 
-getFaviconR :: Handler ()
-getFaviconR = sendFile "image/x-icon" $ datadir </> "favicon.ico"
-
-----------------------------------------------------------------------
-
-getRobotsR :: Handler RepPlain
-getRobotsR = return $ RepPlain $ toContent robots_txt
-
-----------------------------------------------------------------------
-
-getIndexR :: Handler ()
-getIndexR = redirect RedirectTemporary defaultroute where defaultroute = JournalR
-
-----------------------------------------------------------------------
-
--- getDemoR :: Handler RepHtml
--- getDemoR = do
---     -- mu <- maybeAuth
---     defaultLayout $ do
---         h2id <- newIdent
---         setTitle $ string "hledger front page"
---         addBody $(hamletFile "homepage")
---         addStyle $(cassiusFile "homepage")
---         addJavascript $(juliusFile "homepage")
+getRootR :: Handler RepHtml
+getRootR = redirect RedirectTemporary defaultroute where defaultroute = JournalR
+    -- defaultLayout $ do
+    --     h2id <- lift newIdent
+    --     setTitle "hledger-web homepage"
+    --     addWidget $(widgetFile "homepage")
 
 ----------------------------------------------------------------------
 
@@ -544,7 +47,7 @@ getJournalR = do
       maincontent = journalReportAsHtml opts td $ journalReport opts fspec j
       td = mktd{here=here, title="hledger journal", msg=msg, a=a, p=p, j=j, today=today}
       editform' = editform td
-  hamletToRepHtml $ pageLayout td [$hamlet|
+  hamletToRepHtml $ pageLayout td [hamlet|
  <div#content
   <div#sidebar
    ^{sidecontent}
@@ -558,8 +61,8 @@ getJournalR = do
    ^{importform}
 |]
 
-postJournalR :: Handler RepPlain
-postJournalR = postJournalOnlyR
+-- postJournalR :: Handler RepPlain
+-- postJournalR = postJournalOnlyR
 
 ----------------------------------------------------------------------
 
@@ -577,7 +80,7 @@ getRegisterR = do
       maincontent = registerReportAsHtml opts td $ registerReport opts fspec j
       td = mktd{here=here, title="hledger register", msg=msg, a=a, p=p, j=j, today=today}
       editform' = editform td
-  hamletToRepHtml $ pageLayout td [$hamlet|
+  hamletToRepHtml $ pageLayout td [hamlet|
  <div#content
   <div#sidebar
    ^{sidecontent}
@@ -591,8 +94,8 @@ getRegisterR = do
    ^{importform}
 |]
 
-postRegisterR :: Handler RepPlain
-postRegisterR = postJournalOnlyR
+-- postRegisterR :: Handler RepPlain
+-- postRegisterR = postJournalOnlyR
 
 ----------------------------------------------------------------------
 
@@ -606,7 +109,7 @@ getAccountsOnlyR = do
 
 -- | Render a balance report as HTML.
 balanceReportAsHtml :: [Opt] -> TemplateData -> BalanceReport -> Hamlet AppRoute
-balanceReportAsHtml _ td@TD{here=here,a=a,p=p} (items,total) = [$hamlet|
+balanceReportAsHtml _ td@TD{here=here,a=a,p=p} (items,total) = [hamlet|
 ^{accountsheading}
 <table.balancereport>
  $forall i <- items
@@ -615,49 +118,48 @@ balanceReportAsHtml _ td@TD{here=here,a=a,p=p} (items,total) = [$hamlet|
   <td colspan=2>
  <tr>
   <td>
-  <td align=right>#{mixedAmountAsHtml total} >
+  <td align=right>#{mixedAmountAsHtml total}
 |]
  where
-   accountsheading = [$hamlet|
-                      <div#accountsheading
+   accountsheading = [hamlet|
+                      <span#accountsheading
                        accounts
                        \ #
                        ^{showlinks}
                       |] :: Hamlet AppRoute
        where
          filteringaccts = not $ null a
-         showlinks = [$hamlet|<span#showmoreaccounts ^{showmore} ^{showall}|] :: Hamlet AppRoute
+         showlinks = [hamlet|<span#showmoreaccounts>^{showmore} ^{showall}|] :: Hamlet AppRoute
          showmore = case (filteringaccts, items) of
                       -- cunning parent account logic
                       (True, ((acct, _, _, _):_)) ->
                           let a' = if isAccountRegex a then a else acct
                               a'' = accountNameToAccountRegex $ parentAccountName $ accountRegexToAccountName a'
                               parenturl = (here, [("a",pack a''), ("p",pack p)])
-                          in [$hamlet|
+                          in [hamlet|
                               \ | #
-                              <a href=@?{parenturl} show more &uarr;
+                              <a href=@?{parenturl}>show more &uarr;
                               |]
                       _ -> nulltemplate
          showall = if filteringaccts
-                    then [$hamlet|
+                    then [hamlet|
                           \ | #
-                          <a href=@?{allurl} show all
+                          <a href=@?{allurl}>show all
                           |]
                     else nulltemplate
              where allurl = (here, [("p",pack p)])
    itemAsHtml' = itemAsHtml td
    itemAsHtml :: TemplateData -> BalanceReportItem -> Hamlet AppRoute
-   itemAsHtml TD{p=p} (acct, adisplay, adepth, abal) = [$hamlet|
+   itemAsHtml TD{p=p} (acct, adisplay, adepth, abal) = [hamlet|
      <tr.item
       <td.account
        #{indent}
-       <a href=#{aurl}>#{adisplay}
+       <a href="@{here}?a=#{acctpat}#{pparam}">#{adisplay}
       <td.balance align=right>#{mixedAmountAsHtml abal}
      |] where
-       -- current = if not (null a) && containsRegex a acct then "current" else ""
        indent = preEscapedString $ concat $ replicate (2 * adepth) "&nbsp;"
-       aurl = printf ".?a=%s%s" (accountNameToAccountRegex acct) p' :: String
-       p' = if null p then "" else printf "&p=%s" p :: String
+       acctpat = accountNameToAccountRegex acct
+       pparam = if null p then "" else "&p="++p
 
 accountNameToAccountRegex :: String -> String
 accountNameToAccountRegex "" = ""
@@ -679,7 +181,7 @@ getJournalOnlyR = do
   let td = mktd{here=here, title="hledger journal", msg=msg, a=a, p=p, j=j, today=today}
       editform' = editform td
       txns = journalReportAsHtml opts td $ journalReport opts fspec j
-  hamletToRepHtml $ pageLayout td [$hamlet|
+  hamletToRepHtml $ pageLayout td [hamlet|
 <div#journal
  <div.nav2
   <a#addformlink href onclick="return addformToggle(event)" add one transaction
@@ -692,7 +194,7 @@ getJournalOnlyR = do
 
 -- | Render a journal report as HTML.
 journalReportAsHtml :: [Opt] -> TemplateData -> JournalReport -> Hamlet AppRoute
-journalReportAsHtml _ td items = [$hamlet|
+journalReportAsHtml _ td items = [hamlet|
 <table.journalreport>
  $forall i <- number items
   ^{itemAsHtml' i}
@@ -701,7 +203,7 @@ journalReportAsHtml _ td items = [$hamlet|
    number = zip [1..]
    itemAsHtml' = itemAsHtml td
    itemAsHtml :: TemplateData -> (Int, JournalReportItem) -> Hamlet AppRoute
-   itemAsHtml _ (n, t) = [$hamlet|
+   itemAsHtml _ (n, t) = [hamlet|
      <tr.item.#{evenodd} >
       <td.transaction>
        <pre> #{txn}
@@ -710,7 +212,7 @@ journalReportAsHtml _ td items = [$hamlet|
        txn = trimnl $ showTransaction t where trimnl = reverse . dropWhile (=='\n') . reverse
 
 addform :: TemplateData -> Hamlet AppRoute
-addform td = [$hamlet|
+addform td = [hamlet|
 <script type=text/javascript>
  $(document).ready(function() {
     /* dhtmlxcombo setup */
@@ -768,7 +270,7 @@ addform td = [$hamlet|
   manyfiles = (length $ files $ j td) > 1
 
 postingsfields :: TemplateData -> Hamlet AppRoute
-postingsfields td = [$hamlet|
+postingsfields td = [hamlet|
  ^{p1}
  ^{p2}
 |]
@@ -777,7 +279,7 @@ postingsfields td = [$hamlet|
     p2 = postingfields td 2
 
 postingfields :: TemplateData -> Int -> Hamlet AppRoute
-postingfields TD{j=j} n = [$hamlet|
+postingfields TD{j=j} n = [hamlet|
  <tr#postingrow
   <td align=right>#{acctlabel}:
   <td
@@ -802,7 +304,7 @@ postingfields TD{j=j} n = [$hamlet|
   (acctlabel, accthelp, amtfield, amthelp)
        | n == 1     = ("To account"
                      ,"eg: expenses:food"
-                     ,[$hamlet|
+                     ,[hamlet|
                        <td style=padding-left:1em;
                         Amount:
                        <td
@@ -817,7 +319,7 @@ postingfields TD{j=j} n = [$hamlet|
                      )
 
 editform :: TemplateData -> Hamlet AppRoute
-editform TD{j=j} = [$hamlet|
+editform TD{j=j} = [hamlet|
  <form#editform method=POST style=display:none;
   <table.form#editform
    $if manyfiles
@@ -844,14 +346,14 @@ editform TD{j=j} = [$hamlet|
     formathelp = helplink "file-format" "file format help"
 
 journalselect :: [(FilePath,String)] -> Hamlet AppRoute
-journalselect journalfiles = [$hamlet|
+journalselect journalfiles = [hamlet|
      <select id=journalselect name=journal onchange="editformJournalSelect(event)"
       $forall f <- journalfiles
        <option value=#{fst f}>#{fst f}
 |]
 
 importform :: Hamlet AppRoute
-importform = [$hamlet|
+importform = [hamlet|
  <form#importform method=POST style=display:none;
   <table.form
    <tr
@@ -863,6 +365,7 @@ importform = [$hamlet|
      <a href onclick="return importformToggle(event)" cancel
 |]
 
+{-
 postJournalOnlyR :: Handler RepPlain
 postJournalOnlyR = do
   action <- runFormPost' $ maybeStringInput "action"
@@ -993,6 +496,7 @@ postImportForm = do
   --  Right s -> do
   --    setMessage s
   --    redirect RedirectTemporary JournalR
+-}
 
 ----------------------------------------------------------------------
 
@@ -1006,7 +510,7 @@ getRegisterOnlyR = do
 
 -- | Render a register report as HTML.
 registerReportAsHtml :: [Opt] -> TemplateData -> RegisterReport -> Hamlet AppRoute
-registerReportAsHtml _ td items = [$hamlet|
+registerReportAsHtml _ td items = [hamlet|
 <table.registerreport
  <tr.headings
   ^{headings}
@@ -1015,7 +519,7 @@ registerReportAsHtml _ td items = [$hamlet|
 |]
  where
    number = zip [1..]
-   headings = [$hamlet|
+   headings = [hamlet|
                <th.date align=left Date
                <th.description align=left Description
                <th.account align=left Account
@@ -1024,12 +528,12 @@ registerReportAsHtml _ td items = [$hamlet|
                |] :: Hamlet AppRoute
    itemAsHtml' = itemAsHtml td
    itemAsHtml :: TemplateData -> (Int, RegisterReportItem) -> Hamlet AppRoute
-   itemAsHtml TD{p=p} (n, (ds, posting, b)) = [$hamlet|
+   itemAsHtml TD{here=here,p=p} (n, (ds, posting, b)) = [hamlet|
      <tr.item.#{evenodd}.#{firstposting}
       <td.date>#{date}
       <td.description>#{desc}
       <td.account
-       <a href=#{aurl}>#{acct}
+       <a href="@{here}?a=#{acctpat}#{pparam}">#{acct}
       <td.amount align=right>#{mixedAmountAsHtml $ pamount posting}
       <td.balance align=right>#{mixedAmountAsHtml b}
      |] where
@@ -1037,8 +541,8 @@ registerReportAsHtml _ td items = [$hamlet|
        (firstposting, date, desc) = case ds of Just (da, de) -> ("firstposting", show da, de)
                                                Nothing -> ("", "", "") :: (String,String,String)
        acct = paccount posting
-       aurl = printf ".?a=%s%s" (accountNameToAccountRegex acct) p' :: String
-       p' = if null p then "" else printf "&p=%s" p :: String
+       acctpat = accountNameToAccountRegex acct
+       pparam = if null p then "" else "&p="++p
 
 mixedAmountAsHtml b = preEscapedString $ addclass $ intercalate "<br>" $ lines $ show b
     where addclass = printf "<span class=\"%s\">%s</span>" (c :: String)
@@ -1046,69 +550,208 @@ mixedAmountAsHtml b = preEscapedString $ addclass $ intercalate "<br>" $ lines $
                                               _         -> "positive amount"
 
 ----------------------------------------------------------------------
-
--- | A standalone journal edit form page.
--- getEditR :: Handler RepHtml
--- getEditR = do
---   (a, p, _, _, _, msg, here) <- getHandlerData
---   today <- liftIO getCurrentDay
---   -- reload journal's text without parsing, if changed     -- XXX are we doing this right ?
---   j <- liftIO $ fromJust `fmap` getValue "hledger" "journal"
---   changed <- liftIO $ journalFileIsNewer j
---   s <- liftIO $ if changed then readFile (filepath j) else return (jtext j) -- XXX readFile may throw an error
---   let td = mktd{here=here, title="hledger journal edit", msg=msg, a=a, p=p, j=j, today=today}
---   hamletToRepHtml $ pageLayout td $ editform td s
-
+-- utilities, common templates
 ----------------------------------------------------------------------
-{-
--- | An add form with template files reloaded at runtime.
-getAddformRTR :: Handler RepHtml
-getAddformRTR = do
-  (a, p, _, _, j, msg, here) <- getHandlerData
-  today <- liftIO getCurrentDay
-  let td = mktd{here=here, title="hledger add transaction", msg=msg, a=a, p=p, j=j, today=today}
-      descriptions = sort $ nub $ map tdescription $ jtxns j
-      acctnames = sort $ journalAccountNamesUsed j
-      postingData n = [
-                       (["acctlabel"], hdstring acctlabel)
-                      ,(["acctvar"],   hdstring acctvar)
-                      ,(["acctnames"], hdstringlist acctnames)
-                      ,(["amtfield"],  HDHtml $ renderHamletAsHtml amtfield)
-                      ,(["accthelp"],  hdstring accthelp)
-                      ,(["amthelp"],   hdstring amthelp)
-                      ] :: HamletMap AppRoute
+
+nulltemplate :: Hamlet AppRoute
+nulltemplate = [hamlet||]
+
+-- | A bundle of useful data passed to templates.
+data TemplateData = TD {
+     here         :: AppRoute -- ^ the current page's route
+    ,title        :: String             -- ^ page's title
+    ,msg          :: Maybe Html         -- ^ transient message
+    ,a            :: String             -- ^ a (acct/desc filter pattern) parameter
+    ,p            :: String             -- ^ p (period expression) parameter
+    ,j            :: Journal            -- ^ the current journal
+    ,today        :: Day                -- ^ the current day
+    }
+
+mktd :: TemplateData
+mktd = TD {
+      here = RootR
+     ,title = "hledger"
+     ,msg = Nothing
+     ,a = ""
+     ,p = ""
+     ,j = nulljournal
+     ,today = ModifiedJulianDay 0
+     }
+
+-- | Gather the data useful for a hledger web request handler, including:
+-- initial command-line options, current a and p query string values, a
+-- journal filter specification based on the above and the current time,
+-- an up-to-date parsed journal, the current route, and the current ui
+-- message if any.
+getHandlerData :: Handler (String, String, [Opt], FilterSpec, Journal, Maybe Html, AppRoute)
+getHandlerData = do
+  Just here' <- getCurrentRoute
+  (a, p, opts, fspec) <- getReportParameters
+  (j, err) <- getLatestJournal opts
+  msg <- getMessage' err
+  return (a, p, opts, fspec, j, msg, here')
+    where
+      -- | Get current report parameters for this request.
+      getReportParameters :: Handler (String, String, [Opt], FilterSpec)
+      getReportParameters = do
+          app <- getYesod
+          t <- liftIO $ getCurrentLocalTime
+          a <- fromMaybe "" <$> lookupGetParam "a"
+          p <- fromMaybe "" <$> lookupGetParam "p"
+          let (a',p') = (unpack a, unpack p)
+              opts = appOpts app ++ [Period p']
+              args = appArgs app ++ words' a'
+              fspec = optsToFilterSpec opts args t
+          return (a', p', opts, fspec)
+
+      -- | Quote-sensitive words, ie don't split on spaces which are inside quotes.
+      words' :: String -> [String]
+      words' = fromparse . parsewith ((quotedPattern <|> pattern) `sepBy` many1 spacenonewline)
           where
-            numbered = (++ show n)
-            acctvar = numbered "account"
-            amtvar = numbered "amount"
-            (acctlabel, accthelp, amtfield, amthelp)
-                | n == 1     = ("To account"
-                              ,"eg: expenses:food"
-                              ,[$hamlet|
-                                %td style=padding-left:1em;
-                                 Amount:
-                                %td
-                                 %input.textinput size=15 name=$amtvar$ value=""
-                                |]
-                              ,"eg: $6"
-                              )
-                | otherwise = ("From account"
-                              ,"eg: assets:bank:checking"
-                              ,nulltemplate
-                              ,""
-                              )
-  pfields1 <- renderHamletFileRT "addformpostingfields.hamlet" (postingData 1)
-  pfields2 <- renderHamletFileRT "addformpostingfields.hamlet" (postingData 2)
-  addform  <- renderHamletFileRT "addform.hamlet" ([
-                                                 (["date"], hdstring "today")
-                                                ,(["desc"], hdstring "")
-                                                ,(["descriptions"], hdstringlist descriptions)
-                                                ,(["datehelp"], hdstring "eg: 2010/7/20")
-                                                ,(["deschelp"], hdstring "eg: supermarket (optional)")
-                                                ,(["postingfields1"], HDHtml pfields1)
-                                                ,(["postingfields2"], HDHtml pfields2)
-                                                ,(["manyfiles"], HDBool $ (length $ files $ j) > 1)
---                                                ,(["files"], ... $ files $ j)
-                                                ] :: HamletMap AppRoute)
-  hamletToRepHtml $ pageLayout td $ htmlAsHamlet addform
--}
\ No newline at end of file
+            pattern = many (noneOf " \n\r\"")
+            quotedPattern = between (oneOf "'\"") (oneOf "'\"") $ many $ noneOf "'\""
+
+      -- | Update our copy of the journal if the file changed. If there is an
+      -- error while reloading, keep the old one and return the error, and set a
+      -- ui message.
+      getLatestJournal :: [Opt] -> Handler (Journal, Maybe String)
+      getLatestJournal opts = do
+        j <- liftIO $ fromJust `fmap` getValue "hledger" "journal"
+        (jE, changed) <- liftIO $ journalReloadIfChanged opts j
+        if not changed
+         then return (j,Nothing)
+         else case jE of
+                Right j' -> do liftIO $ putValue "hledger" "journal" j'
+                               return (j',Nothing)
+                Left e  -> do setMessage $ "error while reading" {- ++ ": " ++ e-}
+                              return (j, Just e)
+
+      -- | Helper to work around a yesod feature (can't set and get a message in the same request.)
+      getMessage' :: Maybe String -> Handler (Maybe Html)
+      getMessage' newmsgstr = do
+        oldmsg <- getMessage
+        return $ maybe oldmsg (Just . toHtml) newmsgstr
+
+-- | Wrap a template with the standard hledger web ui page layout.
+pageLayout :: TemplateData -> Hamlet AppRoute -> Hamlet AppRoute
+pageLayout td@TD{title=basetitle, msg=msg, p=p, j=j, today=today} content = [hamlet|
+!!!
+<html
+ <head
+  <title>#{title'}
+  <meta http-equiv=Content-Type content=#{metacontent}
+  <script type=text/javascript src=@{StaticR jquery_js}
+  <script type=text/javascript src=@{StaticR jquery_url_js}
+  <script type=text/javascript src=@{StaticR dhtmlxcommon_js}
+  <script type=text/javascript src=@{StaticR dhtmlxcombo_js}
+  <script type=text/javascript src=@{StaticR hledger_js}
+  <link rel=stylesheet type=text/css media=all href=@{StaticR style_css}
+ <body
+  ^{navbar td}
+  <div#messages>#{m}
+  <div#content
+   ^{content}
+|]
+ where title' = basetitle ++ " - " ++ journaltitle
+       (journaltitle, _) = journalTitleDesc j p today
+       metacontent = "text/html; charset=utf-8" :: String
+       m = fromMaybe "" msg
+
+-- | Global toolbar/heading area.
+navbar :: TemplateData -> Hamlet AppRoute
+navbar TD{p=p,j=j,today=today} = [hamlet|
+ <div#navbar
+  <a.topleftlink href=#{hledgerorgurl}
+   hledger-web
+   <br />
+   #{version}
+  <a.toprightlink href=#{manualurl} target=hledgerhelp>manual
+  <h1>#{title}
+  \ #
+  <span#journaldesc>#{desc}
+|]
+  where (title, desc) = journalTitleDesc j p today
+
+-- | Generate a title and description for the given journal, period
+-- expression, and date.
+journalTitleDesc :: Journal -> String -> Day -> (String, String)
+journalTitleDesc j p today = (title, desc)
+  where
+    title = printf "%s" (takeFileName $ journalFilePath j) :: String
+    desc  = printf "%s" (showspan span) :: String
+    span = either (const $ DateSpan Nothing Nothing) snd (parsePeriodExpr today p)
+    showspan (DateSpan Nothing Nothing) = ""
+    showspan s = " (" ++ dateSpanAsText s ++ ")"
+
+-- | Links to the main views.
+navlinks :: TemplateData -> Hamlet AppRoute
+navlinks td = [hamlet|
+ <div#navlinks
+  ^{accountsjournallink}
+  \ | #
+  ^{accountsregisterlink}
+  \ | #
+  <a#addformlink href onclick="return addformToggle(event)">add transaction
+  <a#importformlink href onclick="return importformToggle(event)" style="display:none;">import transactions
+  \ | #
+  <a#editformlink href onclick="return editformToggle(event)">edit journal
+|]
+--  \ | #
+ where
+   accountsjournallink  = navlink td "journal" JournalR
+   accountsregisterlink = navlink td "register" RegisterR
+
+navlink :: TemplateData -> String -> AppRoute -> Hamlet AppRoute
+navlink TD{here=here,a=a,p=p} s dest = [hamlet|<a##{s}link.#{style} href=@?{u}>#{s}|]
+ where u = (dest, concat [(if null a then [] else [("a", pack a)])
+                         ,(if null p then [] else [("p", pack p)])])
+       style | dest == here = "navlinkcurrent"
+             | otherwise    = "navlink" :: Text
+
+-- | Form controlling journal filtering parameters.
+filterform :: TemplateData -> Hamlet AppRoute
+filterform TD{here=here,a=a,p=p} = [hamlet|
+ <div#filterformdiv
+  <form#filterform.form method=GET style=display:#{visible};
+   <table.form
+    <tr.#{filteringperiodclass}
+     <td
+      filter by period:
+      \ #
+     <td
+      <input name=p size=60 value=#{p}
+      ^{phelp}
+      \ #
+     <td align=right
+      ^{stopfilteringperiod}
+    <tr.#{filteringclass}
+     <td
+      filter by account/description:
+      \ #
+     <td
+      <input name=a size=60 value=#{a}
+      ^{ahelp}
+      \ #
+      <input type=submit value=filter #
+      \ #
+     <td align=right
+      ^{stopfiltering}
+|]
+ where
+  ahelp = helplink "filter-patterns" "?"
+  phelp = helplink "period-expressions" "?"
+  filtering = not $ null a
+  filteringperiod = not $ null p
+  visible = "block" :: String
+  filteringclass = if filtering then "filtering" else "" :: String
+  filteringperiodclass = if filteringperiod then "filtering" else "" :: String
+  stopfiltering = if filtering then [hamlet|<a#stopfilterlink href=@?{u}>clear filter|] else nulltemplate
+      where u = (here, if filteringperiod then [("p", pack p)] else [])
+  stopfilteringperiod = if filteringperiod then [hamlet|<a#stopfilterlink href=@?{u}>clear filter|] else nulltemplate
+      where u = (here, if filtering then [("a", pack a)] else [])
+
+-- | Link to a topic in the manual.
+helplink :: String -> String -> Hamlet AppRoute
+helplink topic label = [hamlet|<a href=#{u} target=hledgerhelp>#{label}|]
+    where u = manualurl ++ if null topic then "" else '#':topic
+
diff --git a/hledger-web/Hledger/Web/Main.hs b/hledger-web/Hledger/Web/Main.hs
deleted file mode 100644
index 7c96441e1..000000000
--- a/hledger-web/Hledger/Web/Main.hs
+++ /dev/null
@@ -1,100 +0,0 @@
-{-# LANGUAGE CPP #-}
-{-|
-hledger-web - a hledger add-on providing a web interface.
-Copyright (c) 2007-2011 Simon Michael <simon@joyful.com>
-Released under GPL version 3 or later.
--}
-
-module Hledger.Web.Main where
-
-import Control.Concurrent (forkIO, threadDelay)
-import Data.Text(pack)
-import System.Exit (exitFailure)
-import System.IO.Storage (withStore, putValue,)
-import System.Console.GetOpt
-import Yesod
-import Yesod.Helpers.Static
-
-import Hledger.Cli.Options
-import Hledger.Cli.Utils (withJournalDo, openBrowserOn)
-import Hledger.Cli.Version (progversionstr, binaryfilename)
-import Hledger.Data
-import Prelude hiding (putStr, putStrLn)
-import Hledger.Data.UTF8 (putStr, putStrLn)
-import Hledger.Web.App (App(..))
-import Hledger.Web.Files (createFilesIfMissing)
-import Hledger.Web.Settings (browserstartdelay, defhost, defport, datadir)
-
-
-progname_web = progname_cli ++ "-web"
-
-options_web :: [OptDescr Opt]
-options_web = [
-  Option ""  ["base-url"]     (ReqArg BaseUrl "URL") "use this base url (default http://localhost:PORT)"
- ,Option ""  ["port"]         (ReqArg Port "N")      "serve on tcp port N (default 5000)"
- ]
-
-usage_preamble_web =
-  "Usage: hledger-web [OPTIONS] [PATTERNS]\n" ++
-  "\n" ++
-  "Reads your ~/.journal file, or another specified by $LEDGER or -f, and\n" ++
-  "starts a web ui server. Also attempts to start a web browser (unless --debug).\n" ++
-  "\n"
-
-usage_options_web = usageInfo "hledger-web options:" options_web ++ "\n"
-
-usage_web = concat [
-             usage_preamble_web
-            ,usage_options_web
-            ,usage_options_cli
-            ,usage_postscript_cli
-            ]
-
-main :: IO ()
-main = do
-  (opts, args) <- parseArgumentsWith $ options_cli++options_web
-  run opts args
-    where
-      run opts args
-       | Help `elem` opts             = putStr usage_web
-       | Version `elem` opts          = putStrLn $ progversionstr progname_web
-       | BinaryFilename `elem` opts   = putStrLn $ binaryfilename progname_web
-       | otherwise                    = withJournalDo opts args "web" web
-
--- | The web command.
-web :: [Opt] -> [String] -> Journal -> IO ()
-web opts args j = do
-  created <- createFilesIfMissing
-  if created
-   then do
-     putStrLn $ "Installing support files in "++datadir++" - done, please run again."
-     exitFailure
-   else do
-     putStrLn $ "Using support files in "++datadir
-     let host    = defhost
-         port    = fromMaybe defport $ portFromOpts opts
-         baseurl = fromMaybe (printf "http://%s:%d" host port) $ baseUrlFromOpts opts
-     unless (Debug `elem` opts) $ forkIO (browser baseurl) >> return ()
-     server baseurl port opts args j
-
-server :: String -> Int -> [Opt] -> [String] -> Journal -> IO ()
-server baseurl port opts args j = do
-  printf "Starting http server on port %d with base url %s\n" port baseurl
-  withStore "hledger" $ do
-    putValue "hledger" "journal" j
-    warpDebug port $ App{
-              -- appConnPool=Nothing
-              appRoot=pack baseurl
-             ,appDataDir=datadir
-             ,appStaticSettings=static datadir
-             ,appOpts=opts
-             ,appArgs=args
-             ,appJournal=j
-             }
-
-browser :: String -> IO ()
-browser baseurl = do
-  threadDelay $ fromIntegral browserstartdelay
-  putStrLn "Attempting to start a web browser"
-  openBrowserOn baseurl >> return ()
-
diff --git a/hledger-web/Hledger/Web/Settings.hs b/hledger-web/Hledger/Web/Settings.hs
deleted file mode 100644
index f073f7cb8..000000000
--- a/hledger-web/Hledger/Web/Settings.hs
+++ /dev/null
@@ -1,128 +0,0 @@
-{-# LANGUAGE CPP, OverloadedStrings #-}
-module Hledger.Web.Settings
-    (
-     hamletFile
-    , cassiusFile
-    , juliusFile
-    -- , connStr
-    -- , ConnectionPool
-    -- , withConnectionPool
-    -- , runConnectionPool
-    , approot
-    , staticroot
-    , datadir
-    , defhost
-    , defport
-    , browserstartdelay
-    , hledgerorgurl
-    , manualurl
-    , style_css
-    , hledger_js
-    , jquery_js
-    , jquery_url_js
-    , dhtmlxcommon_js
-    , dhtmlxcombo_js
-    , robots_txt
-    ) where
-
-import Language.Haskell.TH.Syntax
-import System.FilePath ((</>))
-import qualified Text.Cassius as H
-import qualified Text.Hamlet as H
-import qualified Text.Julius as H
-import Text.Printf (printf)
--- import Database.Persist.Sqlite
--- import Yesod (MonadCatchIO)
-import Yesod.Helpers.Static
-
-
-browserstartdelay = 100000 -- microseconds
-
-----------------------------------------------------------------------
--- urls
-----------------------------------------------------------------------
-
-hledgerorgurl, manualurl :: String
-hledgerorgurl     = "http://hledger.org"
-manualurl         = hledgerorgurl++"/MANUAL.html"
-
-defhost           = "localhost" :: String
-defport           = 5000
-
-approot :: String
-#ifdef PRODUCTION
-approot = printf "http://%s:%d" defhost (defport :: Int) :: String
-#else
-approot = printf "http://%s:%d" defhost (defport :: Int) :: String
-#endif
-
-staticroot :: String
-staticroot = approot ++ "/static"
-
--- Some static routes we can refer to by name, without hard-coded filesystem location.
-style_css       = StaticRoute ["style.css"] []
-hledger_js      = StaticRoute ["hledger.js"] []
-jquery_js       = StaticRoute ["jquery.js"] []
-jquery_url_js   = StaticRoute ["jquery.url.js"] []
-dhtmlxcommon_js = StaticRoute ["dhtmlxcommon.js"] []
-dhtmlxcombo_js  = StaticRoute ["dhtmlxcombo.js"] []
-
--- Content for /robots.txt
-robots_txt = "User-agent: *"
-
-
-----------------------------------------------------------------------
--- filesystem
-----------------------------------------------------------------------
-
--- | Hard-coded data directory path. This must be in your current dir when
--- you compile. At run time it's also required but we'll auto-create it.
-datadir :: FilePath
-datadir = "./.hledger/web/"
-
--- The following are compile-time macros. If the file paths they point to
--- don't exist, they will give an error (at compile time). If PRODUCTION
--- is defined, files are read only once at (startup?) time, otherwise
--- repeatedly at run time.
-
-hamletFile :: FilePath -> Q Exp
-#ifdef PRODUCTION
-hamletFile x = H.hamletFile $ datadir </> (x ++ ".hamlet")
-#else
-hamletFile x = H.hamletFileDebug $ datadir </> (x ++ ".hamlet")
-#endif
-
-cassiusFile :: FilePath -> Q Exp
-#ifdef PRODUCTION
-cassiusFile x = H.cassiusFile $ datadir </> (x ++ ".cassius")
-#else
-cassiusFile x = H.cassiusFileDebug $ datadir </> (x ++ ".cassius")
-#endif
-
-juliusFile :: FilePath -> Q Exp
-#ifdef PRODUCTION
-juliusFile x = H.juliusFile $ datadir </> (x ++ ".julius")
-#else
-juliusFile x = H.juliusFileDebug $ datadir </> (x ++ ".julius")
-#endif
-
-----------------------------------------------------------------------
--- database
-----------------------------------------------------------------------
-
--- connStr :: String
--- #ifdef PRODUCTION
--- connStr = "production.db3"
--- #else
--- connStr = "debug.db3"
--- #endif
-
--- connectionCount :: Int
--- connectionCount = 10
-
--- withConnectionPool :: MonadCatchIO m => (ConnectionPool -> m a) -> m a
--- withConnectionPool = withSqlitePool connStr connectionCount
-
--- runConnectionPool :: MonadCatchIO m => SqlPersist m a -> ConnectionPool -> m a
--- runConnectionPool = runSqlPool
-
diff --git a/hledger-web/Settings.hs b/hledger-web/Settings.hs
new file mode 100644
index 000000000..1a2c6c88a
--- /dev/null
+++ b/hledger-web/Settings.hs
@@ -0,0 +1,147 @@
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE TypeFamilies #-}
+-- | Settings are centralized, as much as possible, into this file. This
+-- includes database connection settings, static file locations, etc.
+-- In addition, you can configure a number of different aspects of Yesod
+-- by overriding methods in the Yesod typeclass. That instance is
+-- declared in the hledger-web.hs file.
+module Settings
+    ( hamletFile
+    , cassiusFile
+    , juliusFile
+    , luciusFile
+    , widgetFile
+    , datadir
+    , staticdir
+    , defhost
+    , defport
+    , defapproot
+    -- , staticroot
+    -- , browserstartdelay
+    , hledgerorgurl
+    , manualurl
+    ) where
+
+import Data.Monoid (mempty) --, mappend)
+import Data.Text (Text,pack)
+import Language.Haskell.TH.Syntax
+import System.Directory (doesFileExist)
+import Text.Printf (printf)
+import qualified Text.Hamlet as H
+import qualified Text.Cassius as H
+import qualified Text.Julius as H
+import qualified Text.Lucius as H
+import Yesod.Widget (addWidget, addCassius, addJulius, addLucius)
+
+
+-- browserstartdelay = 100000 -- microseconds
+
+hledgerorgurl, manualurl :: String
+hledgerorgurl     = "http://hledger.org"
+manualurl         = hledgerorgurl++"/MANUAL.html"
+
+-- | The default TCP port to listen on. May be overridden with --port.
+defport :: Int
+defport = 5000
+
+defhost :: String
+defhost = "localhost"
+
+-- | The default base URL for your application. This will usually be different for
+-- development and production. Yesod automatically constructs URLs for you,
+-- so this value must be accurate to create valid links.
+-- For hledger-web this is usually overridden with --base-url.
+defapproot :: Text
+defapproot = pack $ printf "http://%s:%d" defhost defport
+-- #ifdef PRODUCTION
+-- #else
+-- #endif
+
+-- | Hard-coded data directory path. This must be in your current dir when
+-- you compile. At run time it's also required but we'll auto-create it.
+datadir :: FilePath
+datadir = "./.hledger/web/"
+
+-- | The location of static files on your system. This is a file system
+-- path. The default value works properly with your scaffolded site.
+staticdir :: FilePath
+staticdir = datadir++"static"
+
+-- | The base URL for your static files. As you can see by the default
+-- value, this can simply be "static" appended to your application root.
+-- A powerful optimization can be serving static files from a separate
+-- domain name. This allows you to use a web server optimized for static
+-- files, more easily set expires and cache values, and avoid possibly
+-- costly transference of cookies on static files. For more information,
+-- please see:
+--   http://code.google.com/speed/page-speed/docs/request.html#ServeFromCookielessDomain
+--
+-- If you change the resource pattern for StaticR in hledger-web.hs, you will
+-- have to make a corresponding change here.
+--
+-- To see how this value is used, see urlRenderOverride in hledger-web.hs
+-- staticroot :: Text
+-- staticroot = defapproot `mappend` "/static"
+
+
+
+-- The rest of this file contains settings which rarely need changing by a
+-- user.
+
+-- The following three functions are used for calling HTML, CSS and
+-- Javascript templates from your Haskell code. During development,
+-- the "Debug" versions of these functions are used so that changes to
+-- the templates are immediately reflected in an already running
+-- application. When making a production compile, the non-debug version
+-- is used for increased performance.
+--
+-- You can see an example of how to call these functions in Handler/Root.hs
+--
+-- Note: due to polymorphic Hamlet templates, hamletFileDebug is no longer
+-- used; to get the same auto-loading effect, it is recommended that you
+-- use the devel server.
+
+toHamletFile, toCassiusFile, toJuliusFile, toLuciusFile :: String -> FilePath
+toHamletFile x  = datadir++"templates/" ++ x ++ ".hamlet"
+toCassiusFile x = datadir++"templates/" ++ x ++ ".cassius"
+toJuliusFile x  = datadir++"templates/" ++ x ++ ".julius"
+toLuciusFile x  = datadir++"templates/" ++ x ++ ".lucius"
+
+hamletFile :: FilePath -> Q Exp
+hamletFile = H.hamletFile . toHamletFile
+
+cassiusFile :: FilePath -> Q Exp
+#ifdef PRODUCTION
+cassiusFile = H.cassiusFile . toCassiusFile
+#else
+cassiusFile = H.cassiusFileDebug . toCassiusFile
+#endif
+
+luciusFile :: FilePath -> Q Exp
+#ifdef PRODUCTION
+luciusFile = H.luciusFile . toLuciusFile
+#else
+luciusFile = H.luciusFileDebug . toLuciusFile
+#endif
+
+juliusFile :: FilePath -> Q Exp
+#ifdef PRODUCTION
+juliusFile = H.juliusFile . toJuliusFile
+#else
+juliusFile = H.juliusFileDebug . toJuliusFile
+#endif
+
+widgetFile :: FilePath -> Q Exp
+widgetFile x = do
+    let h = unlessExists toHamletFile hamletFile
+    let c = unlessExists toCassiusFile cassiusFile
+    let j = unlessExists toJuliusFile juliusFile
+    let l = unlessExists toLuciusFile luciusFile
+    [|addWidget $h >> addCassius $c >> addJulius $j >> addLucius $l|]
+  where
+    unlessExists tofn f = do
+        e <- qRunIO $ doesFileExist $ tofn x
+        if e then f x else [|mempty|]
diff --git a/hledger-web/StaticFiles.hs b/hledger-web/StaticFiles.hs
new file mode 100644
index 000000000..c62c9dd7f
--- /dev/null
+++ b/hledger-web/StaticFiles.hs
@@ -0,0 +1,18 @@
+{-# LANGUAGE QuasiQuotes, TemplateHaskell, TypeFamilies #-}
+{-| 
+
+This module exports routes for all the files in the static directory at
+compile time, allowing compile-time verification that referenced files
+exist. However, any files added during run-time can't be accessed this
+way; use their FilePath or URL to access them.
+
+This is a separate module to satisfy template haskell requirements.
+
+-}
+module StaticFiles where
+
+import Yesod.Helpers.Static
+
+import Settings (staticdir)
+
+$(staticFiles staticdir)
diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
index 0991096a9..390d13a5e 100644
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@@ -1,5 +1,5 @@
 name:           hledger-web
-version: 0.14
+version: 0.14.98
 category:       Finance
 synopsis:       A web interface for the hledger accounting tool.
 description:    
@@ -37,21 +37,31 @@ Flag production
     Description:   Build in production mode, which reads template files only once at startup.
     Default:       False
 
+Flag devel
+    Description:   Build for use with "yesod devel"
+    Default:       False
+
 executable hledger-web
   main-is:        hledger-web.hs
-  ghc-options:    -threaded -W
+  -- hs-source-dirs: ., config
+  if flag(devel)
+      Buildable: False
   if flag(production)
-      cpp-options: -DPRODUCTION
+      cpp-options:   -DPRODUCTION
+      ghc-options:   -Wall -threaded -O2
+  else
+      ghc-options:   -W -threaded
   other-modules:
-                  Hledger.Web.Main
-                  Hledger.Web.App
-                  Hledger.Web.Files
-                  Hledger.Web.Settings
+                     App
+                     EmbeddedFiles
+                     Settings
+                     StaticFiles
+                     Handlers
   build-depends:
-                  hledger == 0.14
+                  hledger == 0.14.98
                  ,hledger-lib == 0.14
                  -- ,HUnit
-                 ,base >= 3 && < 5
+                 ,base >= 4 && < 5
                  ,bytestring
                  -- ,containers
                  -- ,csv
@@ -65,15 +75,66 @@ executable hledger-web
                  -- ,regexpr >= 0.5.1
                  ,safe >= 0.2
                  -- ,split == 0.1.*
+                 ,text
                  -- ,time
                  -- ,utf8-string >= 0.3.5 && < 0.4
                  ,io-storage >= 0.3 && < 0.4
-                 ,yesod >= 0.8 && < 0.9
                  -- ,convertible-text >= 0.3.0.1 && < 0.4
                  -- ,data-object >= 0.3.1.2 && < 0.4
                  ,failure >= 0.1 && < 0.2
-                 -- ,persistent == 0.2.*
-                 -- ,persistent-sqlite == 0.2.*
-                 ,template-haskell >= 2.4 && < 2.6
-                 ,wai-extra == 0.4.*
                  ,file-embed == 0.0.*
+                 ,template-haskell >= 2.4 && < 2.6
+                 -- ,yesod >= 0.8 && < 0.9
+                 ,yesod-core   >= 0.8     && < 0.9
+                 ,yesod-static
+                 ,hamlet == 0.8.*
+                 ,transformers
+                 ,wai
+                 ,wai-extra == 0.4.*
+                 ,warp
+                 -- , blaze-builder
+                 -- , web-routes
+
+library
+    if flag(devel)
+        Buildable: True
+    else
+        Buildable: False
+    exposed-modules: 
+                     Controller
+    other-modules:
+                     App
+                     EmbeddedFiles
+                     Settings
+                     StaticFiles
+                     Handlers
+
+-- executable         hledger-web
+    -- if flag(devel)
+    --     Buildable: False
+
+    -- if flag(production)
+    --     cpp-options:   -DPRODUCTION
+    --     ghc-options:   -Wall -threaded -O2
+    -- else
+    --     ghc-options:   -Wall -threaded
+
+    -- main-is:       config/hledger-web.hs
+    -- hs-source-dirs: ., config
+
+    -- build-depends: base         >= 4       && < 5
+    --              , yesod-core   >= 0.8     && < 0.9
+    --              , yesod-static
+    --              , wai-extra
+    --              , directory
+    --              , bytestring
+    --              , text
+    --              , template-haskell
+    --              , hamlet
+    --              , web-routes
+    --              , transformers
+    --              , wai
+    --              , warp
+    --              , blaze-builder
+
+
diff --git a/hledger-web/hledger-web.hs b/hledger-web/hledger-web.hs
index e41e7546f..5655fedb0 100644
--- a/hledger-web/hledger-web.hs
+++ b/hledger-web/hledger-web.hs
@@ -1,2 +1,109 @@
-#!/usr/bin/env runhaskell
-import Hledger.Web.Main (main)
+{-# LANGUAGE CPP #-}
+{-|
+hledger-web - a hledger add-on providing a web interface.
+Copyright (c) 2007-2011 Simon Michael <simon@joyful.com>
+Released under GPL version 3 or later.
+-}
+
+module Main
+where
+
+import Controller (withApp)
+import Network.Wai.Handler.Warp (run)
+#if PRODUCTION
+#else
+import Network.Wai.Middleware.Debug (debug)
+#endif
+
+import Prelude hiding (putStr, putStrLn)
+-- import Control.Concurrent (forkIO, threadDelay)
+import Data.Text(pack)
+import System.Exit (exitFailure)
+import System.IO.Storage (withStore, putValue,)
+import System.Console.GetOpt
+import Yesod.Helpers.Static
+
+import Hledger.Cli.Options
+import Hledger.Cli.Utils (withJournalDo) --, openBrowserOn)
+import Hledger.Cli.Version (progversionstr, binaryfilename)
+import Hledger.Data
+import Hledger.Data.UTF8 (putStr, putStrLn)
+
+import App
+import EmbeddedFiles (createFilesIfMissing)
+import Settings (defhost, defport, datadir, staticdir) -- , browserstartdelay)
+
+
+progname_web = progname_cli ++ "-web"
+
+options_web :: [OptDescr Opt]
+options_web = [
+  Option ""  ["base-url"]     (ReqArg BaseUrl "URL") "use this base url (default http://localhost:PORT)"
+ ,Option ""  ["port"]         (ReqArg Port "N")      "serve on tcp port N (default 5000)"
+ ]
+
+usage_preamble_web =
+  "Usage: hledger-web [OPTIONS] [PATTERNS]\n" ++
+  "\n" ++
+  "Reads your ~/.journal file, or another specified by $LEDGER or -f, and\n" ++
+  "starts a web ui server. Also attempts to start a web browser (unless --debug).\n" ++
+  "\n"
+
+usage_options_web = usageInfo "hledger-web options:" options_web ++ "\n"
+
+usage_web = concat [
+             usage_preamble_web
+            ,usage_options_web
+            ,usage_options_cli
+            ,usage_postscript_cli
+            ]
+
+main :: IO ()
+main = do
+  (opts, args) <- parseArgumentsWith $ options_cli++options_web
+  run opts args
+    where
+      run opts args
+       | Help `elem` opts             = putStr usage_web
+       | Version `elem` opts          = putStrLn $ progversionstr progname_web
+       | BinaryFilename `elem` opts   = putStrLn $ binaryfilename progname_web
+       | otherwise                    = withJournalDo opts args "web" web
+
+-- | The web command.
+web :: [Opt] -> [String] -> Journal -> IO ()
+web opts args j = do
+  created <- createFilesIfMissing
+  if created
+   then do
+     putStrLn $ "Installing support files in "++datadir++" - done, please run again."
+     exitFailure
+   else do
+     putStrLn $ "Using support files in "++datadir
+     let host    = defhost
+         port    = fromMaybe defport $ portFromOpts opts
+         baseurl = fromMaybe (printf "http://%s:%d" host port) $ baseUrlFromOpts opts
+     -- unless (Debug `elem` opts) $ forkIO (browser baseurl) >> return ()
+     server baseurl port opts args j
+
+-- browser :: String -> IO ()
+-- browser baseurl = do
+--   threadDelay $ fromIntegral browserstartdelay
+--   putStrLn "Attempting to start a web browser"
+--   openBrowserOn baseurl >> return ()
+
+server :: String -> Int -> [Opt] -> [String] -> Journal -> IO ()
+server baseurl port opts args j = do
+  printf "Starting http server on port %d with base url %s\n" port baseurl
+  let a = App{getStatic=static staticdir
+             ,appRoot=pack baseurl
+             ,appOpts=opts
+             ,appArgs=args
+             ,appJournal=j
+             }
+  withStore "hledger" $ do
+    putValue "hledger" "journal" j
+#if PRODUCTION
+    withApp a (run port)
+#else
+    withApp a (run port . debug)
+#endif
diff --git a/hledger-web/models b/hledger-web/models
new file mode 100644
index 000000000..e69de29bb
diff --git a/hledger-web/routes b/hledger-web/routes
new file mode 100644
index 000000000..54e14832e
--- /dev/null
+++ b/hledger-web/routes
@@ -0,0 +1,7 @@
+/static StaticR Static getStatic
+/favicon.ico FaviconR GET
+/robots.txt RobotsR GET
+/ RootR GET
+/accounts        AccountsOnlyR     GET
+/journal         JournalR          GET
+/register        RegisterR         GET