diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 # hw-int
-[![CircleCI](https://circleci.com/gh/haskell-works/hw-int/tree/0-branch.svg?style=svg)](https://circleci.com/gh/haskell-works/hw-int/tree/0-branch)
+
+[![CircleCI](https://circleci.com/gh/haskell-works/hw-int.svg?style=svg)](https://circleci.com/gh/haskell-works/hw-int)
diff --git a/hw-int.cabal b/hw-int.cabal
--- a/hw-int.cabal
+++ b/hw-int.cabal
@@ -1,37 +1,67 @@
-name:                   hw-int
-version:                0.0.0.3
-synopsis:               Integers
-description:            Please see README.md
-homepage:               http://github.com/haskell-works/hw-int#readme
-license:                BSD3
-license-file:           LICENSE
-author:                 John Ky
-maintainer:             newhoggy@gmail.com
-copyright:              2016 John Ky
-category:               Data
-stability:              Experimental
-build-type:             Simple
-extra-source-files:     README.md
-cabal-version:          >= 1.22
+cabal-version:        2.2
 
-library
-  hs-source-dirs:       src
-  exposed-modules:      HaskellWorks.Data.Int
-                      , HaskellWorks.Data.Int.Narrow
-                      , HaskellWorks.Data.Int.Narrow.Narrow8
-                      , HaskellWorks.Data.Int.Narrow.Narrow16
-                      , HaskellWorks.Data.Int.Narrow.Narrow32
-                      , HaskellWorks.Data.Int.Narrow.Narrow64
-                      , HaskellWorks.Data.Int.Widen
-                      , HaskellWorks.Data.Int.Widen.Widen8
-                      , HaskellWorks.Data.Int.Widen.Widen16
-                      , HaskellWorks.Data.Int.Widen.Widen32
-                      , HaskellWorks.Data.Int.Widen.Widen64
-  build-depends:        base                          >= 4          && < 5
+name:                 hw-int
+version:              0.0.0.4
+synopsis:             Additional facilities for Integers
+description:          Additional faciltiies for Integers. Please see README.md
+category:             Data
+stability:            Experimental
+homepage:             http://github.com/haskell-works/hw-int#readme
+bug-reports:          https://github.com/haskell-works/hw-int/issues
+author:               John Ky
+maintainer:           newhoggy@gmail.com
+copyright:            2016-2019 John Ky
+license:              BSD-3-Clause
+license-file:         LICENSE
+tested-with:          GHC == 8.8.1, GHC == 8.6.5, GHC == 8.4.4, GHC == 8.2.2
+build-type:           Simple
+extra-source-files:
+  README.md
 
+source-repository head
+  type: git
+  location: https://github.com/haskell-works/hw-int
+
+common base                 { build-depends: base                 >= 4          && < 5      }
+
+common hedgehog             { build-depends: hedgehog             >= 0.6        && < 1.1    }
+common hspec                { build-depends: hspec                >= 2.7.1      && < 3      }
+common hw-hedgehog          { build-depends: hw-hedgehog          >= 0.1.0.3    && < 0.2    }
+common hw-hspec-hedgehog    { build-depends: hw-hspec-hedgehog    >= 0.1.0.7    && < 0.2    }
+
+common config
   default-language:     Haskell2010
   ghc-options:          -Wall -O2
 
-source-repository head
-  type:     git
-  location: https://github.com/haskell-works/hw-int
+library
+  import:   base, config
+  exposed-modules:
+    HaskellWorks.Data.Int
+    HaskellWorks.Data.Int.Narrow
+    HaskellWorks.Data.Int.Narrow.Narrow16
+    HaskellWorks.Data.Int.Narrow.Narrow32
+    HaskellWorks.Data.Int.Narrow.Narrow64
+    HaskellWorks.Data.Int.Narrow.Narrow8
+    HaskellWorks.Data.Int.Widen
+    HaskellWorks.Data.Int.Widen.Widen16
+    HaskellWorks.Data.Int.Widen.Widen32
+    HaskellWorks.Data.Int.Widen.Widen64
+    HaskellWorks.Data.Int.Widen.Widen8
+  other-modules:        Paths_hw_int
+  autogen-modules:      Paths_hw_int
+  hs-source-dirs:       src
+
+test-suite hw-int-test
+  import:   base, config
+          , hedgehog
+          , hspec
+          , hw-hedgehog
+          , hw-hspec-hedgehog
+  type:                 exitcode-stdio-1.0
+  main-is:              Spec.hs
+  other-modules:        Paths_hw_int
+  autogen-modules:      Paths_hw_int
+  hs-source-dirs:       test
+  ghc-options:          -threaded -rtsopts -with-rtsopts=-N -Wall
+  build-tool-depends:   hspec-discover:hspec-discover
+  build-depends:        hw-int
diff --git a/test/Spec.hs b/test/Spec.hs
new file mode 100644
--- /dev/null
+++ b/test/Spec.hs
@@ -0,0 +1,1 @@
+{-# OPTIONS_GHC -F -pgmF hspec-discover #-}