diff --git a/.gitignore b/.gitignore
index c434a52..9f4008b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.hi
 *.o
 dist/
+.stack-work
diff --git a/src/Waterdeep/Actions.hs b/src/Waterdeep/Actions.hs
index c3047ed..14b9f75 100644
--- a/src/Waterdeep/Actions.hs
+++ b/src/Waterdeep/Actions.hs
@@ -61,7 +61,7 @@ import Data.Maybe
 import Data.Monoid
 import Data.Foldable (foldMap, forM_, mapM_)
 import Data.Traversable (traverse, for, forM, mapM)
-import Lens.Family2
+import Lens.Family2 hiding ((&))
 import Lens.Family2.State
 import Lens.Family2.Stock
 import Prelude hiding (forM, mapM)
diff --git a/src/Waterdeep/Util.hs b/src/Waterdeep/Util.hs
index a38e3e1..4228ad0 100644
--- a/src/Waterdeep/Util.hs
+++ b/src/Waterdeep/Util.hs
@@ -24,7 +24,7 @@ import Data.List
 import Data.Function
 import Data.Maybe
 import Data.Monoid
-import Lens.Family2
+import Lens.Family2 hiding ((&))
 import Lens.Family2.State
 import Lens.Family2.Stock
 
@@ -37,9 +37,6 @@ deleteAt n l = left ++ drop 1 right
 nubOn :: Eq b => (a -> b) -> [a] -> [a]
 nubOn f = nubBy ((==) `on` f)
 
-sortOn :: Ord b => (a -> b) -> [a] -> [a]
-sortOn f = sortBy (compare `on` f)
-
 countOf :: Num r => FoldLike (Sum r) a a' b b' -> (b -> Bool) -> a -> r
 countOf l f = getSum . views l (\b -> if f b then Sum 1 else Sum 0)
 
diff --git a/stack.yaml b/stack.yaml
new file mode 100644
index 0000000..f93402e
--- /dev/null
+++ b/stack.yaml
@@ -0,0 +1,32 @@
+# For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
+
+# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
+resolver: lts-3.9
+
+# Local packages, usually specified by relative directory name
+packages:
+- '.'
+
+# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
+extra-deps: []
+
+# Override default flag values for local packages and extra-deps
+flags: {}
+
+# Extra package databases containing global packages
+extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: >= 0.1.4.0
+
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+
+# Extra directories used by stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
diff --git a/waterdeep.cabal b/waterdeep.cabal
index a96f492..4fe1470 100644
--- a/waterdeep.cabal
+++ b/waterdeep.cabal
@@ -14,7 +14,15 @@ cabal-version:       >=1.10
 
 executable waterdeep
   main-is:             ConsoleUI.hs
-  -- other-modules:       
+  other-modules:       Waterdeep.Actions,
+                       Waterdeep.Buildings,
+                       Waterdeep.Factions,
+                       Waterdeep.Intrigues,
+                       Waterdeep.Logic,
+                       Waterdeep.Lords,
+                       Waterdeep.Quests,
+                       Waterdeep.Types,
+                       Waterdeep.Util
   other-extensions:    FlexibleContexts,
                        FlexibleInstances,
                        GADTs,
@@ -25,16 +33,16 @@ executable waterdeep
                        RankNTypes,
                        TemplateHaskell,
                        TupleSections
-  build-depends:       base >=4.6 && <4.8,
+  build-depends:       base >=4.6 && <4.9,
                        MonadPrompt >=1.0 && <1.1,
-                       MonadRandom >=0.1 && <0.4,
+                       MonadRandom >=0.1 && <0.5,
                        containers >=0.5 && <0.6,
                        lens-family >=1.0 && <1.3,
                        lens-family-th >=0.3 && <0.5,
-                       mtl >=2.1 && <2.2,
-                       multiset >=0.2 && <0.3,
-                       random >=1.0 && <1.1,
+                       mtl >=2.1 && <2.3,
+                       multiset >=0.2 && <0.4,
+                       random >=1.0 && <1.2,
                        random-shuffle >=0.0 && <0.1,
-                       transformers >=0.3 && <0.4
+                       transformers >=0.3 && <0.5
   hs-source-dirs:      src
   default-language:    Haskell2010