diff --git a/Control/Comonad/Cofree.hs b/Control/Comonad/Cofree.hs
new file mode 100644
--- /dev/null
+++ b/Control/Comonad/Cofree.hs
@@ -0,0 +1,20 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Control.Comonad.Cofree
+-- Copyright   :  (C) 2008-2011 Edward Kmett
+-- License     :  BSD-style (see the file LICENSE)
+--
+-- Maintainer  :  Edward Kmett <ekmett@gmail.com>
+-- Stability   :  experimental
+-- Portability :  non-portable (fundeps, MPTCs)
+----------------------------------------------------------------------------
+module Control.Comonad.Cofree 
+  ( ComonadCofree(..)
+  , Cofree(..)
+  , coiter
+  , unfold
+  , section
+  ) where
+
+import Control.Comonad.Cofree.Class
+import Control.Comonad.Trans.Cofree
diff --git a/Control/Comonad/Cofree/Class.hs b/Control/Comonad/Cofree/Class.hs
new file mode 100644
--- /dev/null
+++ b/Control/Comonad/Cofree/Class.hs
@@ -0,0 +1,74 @@
+{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, UndecidableInstances #-}
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Control.Comonad.Cofree.Class
+-- Copyright   :  (C) 2008-2011 Edward Kmett
+-- License     :  BSD-style (see the file LICENSE)
+--
+-- Maintainer  :  Edward Kmett <ekmett@gmail.com>
+-- Stability   :  experimental
+-- Portability :  non-portable (fundeps, MPTCs)
+----------------------------------------------------------------------------
+module Control.Comonad.Cofree.Class 
+  ( ComonadCofree(..)
+  ) where
+
+import Control.Applicative
+import Control.Comonad
+import Control.Comonad.Trans.Cofree (Cofree(..))
+import qualified Control.Comonad.Trans.Cofree as Cofree
+-- import Control.Comonad.Trans.Class
+import qualified Control.Comonad.Trans.Env.Strict as Strict
+import qualified Control.Comonad.Trans.Store.Strict as Strict
+import qualified Control.Comonad.Trans.Discont.Strict as Strict
+import qualified Control.Comonad.Trans.Env.Lazy as Lazy
+import qualified Control.Comonad.Trans.Store.Lazy as Lazy
+import qualified Control.Comonad.Trans.Discont.Lazy as Lazy
+import qualified Control.Comonad.Trans.Traced as Simple
+import qualified Control.Comonad.Trans.Traced.Memo as Memo
+import qualified Control.Comonad.Trans.Store.Memo as Memo
+import qualified Control.Comonad.Trans.Discont.Memo as Memo
+import Control.Comonad.Trans.Identity 
+import Data.Monoid
+import Data.Semigroup
+
+class (Functor f, Comonad w) => ComonadCofree f w | w -> f where
+  unwrap :: w a -> f (w a)
+
+instance Functor f => ComonadCofree f (Cofree f) where
+  unwrap = Cofree.unwrap
+
+instance ComonadCofree f w => ComonadCofree f (IdentityT w) where
+  unwrap = fmap IdentityT . unwrap . runIdentityT
+  
+instance ComonadCofree f w => ComonadCofree f (Strict.EnvT e w) where
+  unwrap (Strict.EnvT e wa) = Strict.EnvT e <$> unwrap wa
+
+instance ComonadCofree f w => ComonadCofree f (Lazy.EnvT e w) where
+  unwrap (Lazy.EnvT e wa) = Lazy.EnvT e <$> unwrap wa
+
+instance ComonadCofree f w => ComonadCofree f (Strict.StoreT s w) where
+  unwrap (Strict.StoreT wsa s) = flip Strict.StoreT s <$> unwrap wsa
+
+instance ComonadCofree f w => ComonadCofree f (Lazy.StoreT s w) where
+  unwrap (Lazy.StoreT wsa s) = flip Lazy.StoreT s <$> unwrap wsa
+
+instance ComonadCofree f w => ComonadCofree f (Memo.StoreT s w) where
+  unwrap w = flip Memo.storeT s <$> unwrap wsa
+    where (wsa, s) = Memo.runStoreT w
+
+instance (ComonadCofree f w, Semigroup m, Monoid m) => ComonadCofree f (Simple.TracedT m w) where
+  unwrap (Simple.TracedT wma) = Simple.TracedT <$> unwrap wma
+
+instance (ComonadCofree f w, Semigroup m, Monoid m) => ComonadCofree f (Memo.TracedT m w) where
+  unwrap = fmap Memo.tracedT . unwrap . Memo.runTracedT
+
+instance ComonadCofree f w => ComonadCofree f (Strict.DiscontT k w) where
+  unwrap (Strict.DiscontT f ws) = Strict.DiscontT f <$> unwrap ws
+
+instance ComonadCofree f w => ComonadCofree f (Lazy.DiscontT k w) where
+  unwrap (Lazy.DiscontT f ws) = Lazy.DiscontT f <$> unwrap ws
+
+instance ComonadCofree f w => ComonadCofree f (Memo.DiscontT k w) where
+  unwrap w = Memo.discontT f <$> unwrap wa
+    where (f, wa) = Memo.runDiscontT w
diff --git a/Control/Comonad/Discont/Class.hs b/Control/Comonad/Discont/Class.hs
--- a/Control/Comonad/Discont/Class.hs
+++ b/Control/Comonad/Discont/Class.hs
@@ -17,20 +17,6 @@
 import qualified Control.Comonad.Trans.Discont.Strict as Strict
 import qualified Control.Comonad.Trans.Discont.Lazy as Lazy
 import qualified Control.Comonad.Trans.Discont.Memo as Memo
-{-
-import Control.Comonad.Trans.Class
-import qualified Control.Comonad.Trans.Env.Strict as Strict
-import qualified Control.Comonad.Trans.Store.Strict as Strict
-import qualified Control.Comonad.Trans.Env.Lazy as Lazy
-import qualified Control.Comonad.Trans.Store.Lazy as Lazy
-import qualified Control.Comonad.Trans.Traced as Simple
-import qualified Control.Comonad.Trans.Traced.Memo as Memo
-import qualified Control.Comonad.Trans.Store.Memo as Memo
-import Control.Comonad.Trans.Stream
-import Control.Comonad.Trans.Identity 
-import Data.Monoid
-import Data.Semigroup
--}
 
 class Comonad w => ComonadDiscont s w | w -> s where
   callCV :: w (w (w a -> a) -> b) -> b
@@ -44,22 +30,3 @@
 instance ComonadDiscont s w => ComonadDiscont s (Strict.DiscontT k w) where
   callCV = Strict.callCV
 
-{-
-instance Comonad w => ComonadDiscont s (Strict.StoreT s w) where
-
-instance Comonad w => ComonadDiscont s (Lazy.StoreT s w) where
-
-instance Comonad w => ComonadDiscont s (Memo.StoreT s w) where
-
-instance ComonadDiscont s w => ComonadDiscont s (IdentityT w) where
-
-instance ComonadDiscont s w => ComonadDiscont s (Lazy.EnvT e w) where
-
-instance ComonadDiscont s w => ComonadDiscont s (Strict.EnvT e w) where
-
-instance (ComonadDiscont s w, Semigroup m, Monoid m) => ComonadDiscont s (Simple.TracedT m w) where
-
-instance (ComonadDiscont s w, Monoid m) => ComonadDiscont s (Memo.TracedT m w) where
-
-instance (ComonadDiscont s w, Functor f) => ComonadDiscont s (StreamT f w) where
--}
diff --git a/Control/Comonad/Env/Class.hs b/Control/Comonad/Env/Class.hs
--- a/Control/Comonad/Env/Class.hs
+++ b/Control/Comonad/Env/Class.hs
@@ -16,6 +16,7 @@
 
 import Control.Comonad
 import Control.Comonad.Trans.Class
+import Control.Comonad.Trans.Cofree
 import qualified Control.Comonad.Trans.Env.Lazy as Lazy
 import qualified Control.Comonad.Trans.Store.Lazy as Lazy
 import qualified Control.Comonad.Trans.Discont.Lazy as Lazy
@@ -26,7 +27,6 @@
 import qualified Control.Comonad.Trans.Traced.Memo as Memo
 import qualified Control.Comonad.Trans.Store.Memo as Memo
 import qualified Control.Comonad.Trans.Discont.Memo as Memo
-import Control.Comonad.Trans.Stream
 import Control.Comonad.Trans.Identity 
 import Data.Monoid
 import Data.Semigroup
@@ -84,5 +84,5 @@
 instance (ComonadEnv e w, Monoid m) => ComonadEnv e (Memo.TracedT m w) where
   ask = lowerAsk
 
-instance (ComonadEnv e w, Functor f) => ComonadEnv e (StreamT f w) where
-  ask = lowerAsk
+instance ComonadEnv e w => ComonadEnv e (Cofree w) where
+  ask = lowerAsk 
diff --git a/Control/Comonad/Store/Class.hs b/Control/Comonad/Store/Class.hs
--- a/Control/Comonad/Store/Class.hs
+++ b/Control/Comonad/Store/Class.hs
@@ -30,7 +30,7 @@
 import qualified Control.Comonad.Trans.Traced.Memo as Memo
 import qualified Control.Comonad.Trans.Store.Memo as Memo
 import qualified Control.Comonad.Trans.Discont.Memo as Memo
--- import Control.Comonad.Trans.Stream
+import Control.Comonad.Trans.Cofree
 import Control.Comonad.Trans.Identity 
 import Data.Monoid
 import Data.Semigroup
@@ -47,6 +47,10 @@
     
   seeks :: (s -> s) -> w a -> w a
   seeks f = peeks f . duplicate
+
+instance ComonadStore s w => ComonadStore s (Cofree w) where
+  pos (_ :< as) = pos as
+  peek s (_ :< as) = extract (peek s as)
 
 instance Comonad w => ComonadStore s (Strict.StoreT s w) where
   pos = Strict.pos
diff --git a/Control/Comonad/Stream.hs b/Control/Comonad/Stream.hs
deleted file mode 100644
--- a/Control/Comonad/Stream.hs
+++ /dev/null
@@ -1,15 +0,0 @@
------------------------------------------------------------------------------
--- |
--- Module      :  Control.Comonad.Stream
--- Copyright   :  (C) 2008-2011 Edward Kmett
--- License     :  BSD-style (see the file LICENSE)
---
--- Maintainer  :  Edward Kmett <ekmett@gmail.com>
--- Stability   :  experimental
--- Portability :  non-portable (fundeps, MPTCs)
-----------------------------------------------------------------------------
-module Control.Comonad.Stream ( 
-    module Control.Comonad.Trans.Stream
-  ) where
-
-import Control.Comonad.Trans.Stream
diff --git a/Control/Comonad/Traced/Class.hs b/Control/Comonad/Traced/Class.hs
--- a/Control/Comonad/Traced/Class.hs
+++ b/Control/Comonad/Traced/Class.hs
@@ -16,6 +16,7 @@
 
 import Control.Comonad
 import Control.Comonad.Trans.Class
+import Control.Comonad.Trans.Cofree
 import qualified Control.Comonad.Trans.Env.Strict as Strict
 import qualified Control.Comonad.Trans.Store.Strict as Strict
 import qualified Control.Comonad.Trans.Discont.Strict as Strict
@@ -26,7 +27,6 @@
 import qualified Control.Comonad.Trans.Traced.Memo as Memo
 import qualified Control.Comonad.Trans.Store.Memo as Memo
 import qualified Control.Comonad.Trans.Discont.Memo as Memo
-import Control.Comonad.Trans.Stream
 import Control.Comonad.Trans.Identity 
 import Data.Monoid
 import Data.Semigroup
@@ -77,5 +77,5 @@
 instance ComonadTraced m w => ComonadTraced m (Memo.StoreT s w) where
   trace = lowerTrace
 
-instance (Functor s, ComonadTraced m w) => ComonadTraced m (StreamT s w) where
+instance ComonadTraced m w => ComonadTraced m (Cofree w) where
   trace = lowerTrace
diff --git a/Control/Monad/Free.hs b/Control/Monad/Free.hs
new file mode 100644
--- /dev/null
+++ b/Control/Monad/Free.hs
@@ -0,0 +1,19 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Control.Monad.Free
+-- Copyright   :  (C) 2008-2011 Edward Kmett
+-- License     :  BSD-style (see the file LICENSE)
+--
+-- Maintainer  :  Edward Kmett <ekmett@gmail.com>
+-- Stability   :  experimental
+-- Portability :  non-portable (fundeps, MPTCs)
+----------------------------------------------------------------------------
+module Control.Monad.Free 
+  ( MonadFree(..)
+  , Free(..)
+  , iter
+  , retract
+  ) where
+
+import Control.Monad.Free.Class
+import Control.Monad.Trans.Free
diff --git a/Control/Monad/Free/Class.hs b/Control/Monad/Free/Class.hs
new file mode 100644
--- /dev/null
+++ b/Control/Monad/Free/Class.hs
@@ -0,0 +1,69 @@
+{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, UndecidableInstances #-}
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Control.Monad.Free.Class
+-- Copyright   :  (C) 2008-2011 Edward Kmett
+-- License     :  BSD-style (see the file LICENSE)
+--
+-- Maintainer  :  Edward Kmett <ekmett@gmail.com>
+-- Stability   :  experimental
+-- Portability :  non-portable (fundeps, MPTCs)
+----------------------------------------------------------------------------
+module Control.Monad.Free.Class 
+  ( MonadFree(..)
+  ) where
+
+import Control.Applicative
+import Control.Monad.Trans.Free (Free(..))
+import Control.Monad.Trans.Reader
+import qualified Control.Monad.Trans.State.Strict as Strict
+import qualified Control.Monad.Trans.State.Lazy as Lazy
+import qualified Control.Monad.Trans.Writer.Strict as Strict
+import qualified Control.Monad.Trans.Writer.Lazy as Lazy
+import qualified Control.Monad.Trans.RWS.Strict as Strict
+import qualified Control.Monad.Trans.RWS.Lazy as Lazy
+import Control.Monad.Trans.Maybe
+import Control.Monad.Trans.List
+import Control.Monad.Trans.Error
+import Control.Monad.Trans.Identity 
+import Data.Monoid
+
+class (Functor f, Monad m) => MonadFree f m | m -> f where
+  wrap :: f (m a) -> m a
+
+instance Functor f => MonadFree f (Free f) where
+  wrap = Free
+
+instance MonadFree f m => MonadFree f (ReaderT e m) where
+  wrap fm = ReaderT $ \e -> wrap $ flip runReaderT e <$> fm
+
+instance MonadFree f m => MonadFree f (Lazy.StateT s m) where
+  wrap fm = Lazy.StateT $ \s -> wrap $ flip Lazy.runStateT s <$> fm
+
+instance MonadFree f m => MonadFree f (Strict.StateT s m) where
+  wrap fm = Strict.StateT $ \s -> wrap $ flip Strict.runStateT s <$> fm
+
+instance (MonadFree f m, Monoid w) => MonadFree f (Lazy.WriterT w m) where
+  wrap = Lazy.WriterT . wrap . fmap Lazy.runWriterT
+
+instance (MonadFree f m, Monoid w) => MonadFree f (Strict.WriterT w m) where
+  wrap = Strict.WriterT . wrap . fmap Strict.runWriterT
+
+instance (MonadFree f m, Monoid w) => MonadFree f (Strict.RWST r w s m) where
+  wrap fm = Strict.RWST $ \r s -> wrap $ fmap (\m -> Strict.runRWST m r s) fm
+
+instance (MonadFree f m, Monoid w) => MonadFree f (Lazy.RWST r w s m) where
+  wrap fm = Lazy.RWST $ \r s -> wrap $ fmap (\m -> Lazy.runRWST m r s) fm
+
+instance MonadFree f m => MonadFree f (MaybeT m) where
+  wrap = MaybeT . wrap . fmap runMaybeT
+
+instance MonadFree f m => MonadFree f (IdentityT m) where
+  wrap = IdentityT . wrap . fmap runIdentityT 
+
+instance MonadFree f m => MonadFree f (ListT m) where
+  wrap = ListT . wrap . fmap runListT
+
+instance (MonadFree f m, Error e) => MonadFree f (ErrorT e m) where
+  wrap = ErrorT . wrap . fmap runErrorT
+  
diff --git a/comonads-fd.cabal b/comonads-fd.cabal
--- a/comonads-fd.cabal
+++ b/comonads-fd.cabal
@@ -1,6 +1,6 @@
 name:          comonads-fd
 category:      Control, Comonads
-version:       1.6.3
+version:       1.7
 license:       BSD3
 cabal-version: >= 1.6
 license-file:  LICENSE
@@ -24,9 +24,11 @@
     mtl >= 2.0.1.0 && <= 2.1,
     semigroups >= 0.5 && < 0.6,
     comonad >= 1.1 && < 1.2,
-    comonad-transformers >= 1.6.3 && < 1.7
+    comonad-transformers >= 1.7 && < 1.8
 
   exposed-modules:
+    Control.Comonad.Cofree
+    Control.Comonad.Cofree.Class
     Control.Comonad.Discont
     Control.Comonad.Discont.Class
     Control.Comonad.Discont.Lazy
@@ -42,10 +44,13 @@
     Control.Comonad.Store.Strict
     Control.Comonad.Store.Lazy
     Control.Comonad.Store.Memo
-    Control.Comonad.Stream
     Control.Comonad.Traced
     Control.Comonad.Traced.Class
     Control.Comonad.Traced.Memo
+
+    Control.Monad.Free
+    Control.Monad.Free.Class
+
     Data.Lens
 
   ghc-options:      -Wall