diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,8 +1,12 @@
 # Changelog for chassis
 
+## v0.0.5.0
+
+* Export `NonEmpty`
+
 ## v0.0.4.0
 
-* Export Env and EnvT constructors.
+* Export `Env` and `EnvT` constructors.
 
 ## v0.0.3.0
 
diff --git a/chassis.cabal b/chassis.cabal
--- a/chassis.cabal
+++ b/chassis.cabal
@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.2.
+-- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
 
 name:           chassis
-version:        0.0.4.0
+version:        0.0.5.0
 synopsis:       Prelude with algebraic constructs and polykinds on.
 category:       Prelude
 author:         Daniel Firth
diff --git a/src/Chassis.hs b/src/Chassis.hs
--- a/src/Chassis.hs
+++ b/src/Chassis.hs
@@ -1,127 +1,201 @@
 {-# LANGUAGE ExplicitNamespaces #-}
 {-# LANGUAGE PolyKinds          #-}
 module Chassis (
-  Bool(..)
+-- * Void
+  Void
+, absurd
+
+-- * Bool
+, Bool(..)
+, not
+
+-- * Numbers
 , Int
+, Num(..)
+
+-- * String/Text/ByteString
 , String
-, Void
 , ByteString
 , Text
-, Maybe(..)
-, Either(..)
-, IO
-, Eq(..)
-, Ord(..)
 , Show(..)
+
+-- * Classic Algebra
 , Semigroup(..)
 , Monoid(..)
+, Eq(..)
+, Ord(..)
+
+-- * Function Composition
 , (.)
 , ($)
-, not
-, whenM
+
+-- * IO
+, IO
+
+-- * Maybe
+, Maybe(..)
+, maybe
+
+-- * Either
+, Either(..)
+, either
+
+-- * NonEmpty
+, NonEmpty(..)
+
+-- * Map
+, Map(..)
+
+-- * Tuples & Currying
 , fst
 , snd
-, (>>>)
-, (>=>)
-, (=>=)
 , const
 , curry
 , uncurry
+
+-- * Foldable
+, Foldable(..)
+
+-- * Functor
 , Functor(..)
+, (<$>)
+, void
+
+-- * Applicative
 , Applicative(..)
-, Monad(..)
-, Foldable(..)
+, when
+, unless
+, whenM
+, whenJust
+
+-- * Traversable
 , Traversable(..)
+, traverse_
+, for_
+, filterM
+
+-- * Monad
+, Monad(..)
+, join
+, forM_
+, forM
+, mapM_
+, sequence_
+, (=<<)
+, (>=>)
+
+-- * Contravariant
 , Contravariant(..)
+, (>$<)
+
+-- * Distributive
+, Distributive(..)
+
+-- * Comonad
 , ComonadApply(..)
 , Comonad(..)
+, (=>=)
+, (<<=)
+
+-- * Profunctor
 , Profunctor(..)
 , Strong(..)
 , Choice(..)
+
+-- * Category
 , Category(..)
 , Arrow(..)
+, (>>>)
 , ArrowChoice(..)
 , ArrowLoop(..)
-, Distributive(..)
+
+-- * EnvT
+, Env(..)
+, EnvT(..)
+, env
+, runEnv
+, runEnvT
+
+-- * Extensible Records
 , Rec(..)
+, RMap
 , rtraverse
+, rcast
+, CoRec(..)
+, type (∈)
+
+-- * Compose
 , (:.)
 , Compose(..)
 , onCompose
+
+-- * Generic
 , Generic
+
+-- * Time
 , UTCTime
+
+-- * Path
 , Path
 , Rel
 , Abs
 , File
 , Dir
-, Num(..)
-, (<$>)
+, mkRelDir
+, mkRelFile
+, mkAbsDir
+, mkAbsFile
+, (</>)
+
 , flip
 , rights
 , Type
+
+-- * First Class Families
 , Exp
 , Eval
+, FMap
+
+-- * Exceptions
 , Exception(..)
 , SomeException(..)
+
+-- * Undefined
 , undefined
-, fail
-, either
+
+-- * Lists
 , fromMaybe
-, Map
 , headMaybe
 , tailMaybe
 , initMaybe
-, FMap
-, type (∈)
-, filterM
-, unless
-, forM_
-, forM
-, mapM_
-, whenJust
-, join
-, (=<<)
-, CoRec(..)
-, Env(..)
-, EnvT(..)
-, env
-, runEnv
-, runEnvT
-, mkRelDir
-, mkRelFile
-, mkAbsDir
-, mkAbsFile
-, (</>)
-, RMap
-, rcast
-, (>$<)
 ) where
 
-import RIO.List (headMaybe, tailMaybe, initMaybe)
-import Control.Exception
-import Data.Maybe
-import Data.Map (Map)
-import Fcf (Eval, Exp)
-import Fcf.Class.Functor (FMap)
-import Data.Kind
-import Control.Category hiding ((.))
-import Data.Functor.Contravariant
-import Data.Void
-import Data.Distributive
-import Control.Arrow
-import Prelude
+import Composite.CoRecord
 import Control.Applicative
+import Control.Arrow
+import Control.Category hiding ((.))
+import Control.Comonad.Env
+import Control.Exception
 import Control.Monad
 import Control.Monad.Extra
+import Data.ByteString
+import Data.Distributive
+import Data.Either
+import Data.Foldable
+import Data.Functor.Contravariant
+import Data.Kind
+import Data.List.NonEmpty
+import Data.Map (Map)
+import Data.Maybe
+import Data.Profunctor
+import Data.Text
+import Data.Time (UTCTime)
 import Data.Vinyl
 import Data.Vinyl.Functor
+import Data.Void
+import Fcf (Eval, Exp)
+import Fcf.Class.Functor (FMap)
 import GHC.Generics
-import Data.ByteString
-import Data.Text
-import Control.Comonad.Env
+import RIO.List (headMaybe, tailMaybe, initMaybe)
 import Path
-import Data.Profunctor
-import Data.Either
-import Composite.CoRecord
-import Data.Time (UTCTime)
+import Prelude
