diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,10 @@
+Copyright (c) 2011, Dylan Just
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+3. Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/MissingM.cabal b/MissingM.cabal
new file mode 100644
--- /dev/null
+++ b/MissingM.cabal
@@ -0,0 +1,44 @@
+Name:               MissingM
+Version:            0.0.4
+Author:             Dylan Just <dylan@techtangents.com>
+License:            BSD3
+License-file:       LICENSE
+Copyright:          Dylan Just
+Maintainer:         Dylan Just
+Category:           Control
+Synopsis:           findM and other missing 'M's
+Description:        findM and other missing 'M's
+Cabal-version:      >= 1.14
+Build-Type:         Simple
+
+
+source-repository head
+  type:     git
+  location: https://techtangents@github.com/techtangents/missingm.git
+
+
+Library
+  Build-Depends:    base < 5 && >= 3
+  hs-source-dirs:    src
+  GHC-Options:      -Wall
+                    -fno-warn-type-defaults
+                    -fno-warn-name-shadowing
+  default-language: Haskell2010
+  Exposed-Modules:  Control.Monad.MissingM
+
+
+test-suite Main
+  type:            exitcode-stdio-1.0
+  x-uses-tf:       true
+  build-depends:
+                   base >= 4 && < 5,
+                   HUnit >= 1.2 && < 2,
+                   QuickCheck >= 2.4,
+                   test-framework >= 0.4.1,
+                   test-framework-quickcheck2,
+                   test-framework-hunit,
+                   transformers > 0.3
+  ghc-options:     -Wall -rtsopts
+  hs-source-dirs:  src, tests
+  default-language: Haskell2010
+  main-is:         Main.hs
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/src/Control/Monad/MissingM.hs b/src/Control/Monad/MissingM.hs
new file mode 100644
--- /dev/null
+++ b/src/Control/Monad/MissingM.hs
@@ -0,0 +1,30 @@
+module Control.Monad.MissingM where
+
+import Data.Maybe (isJust)
+
+findM ::
+  Monad m =>
+  (a -> m Bool)
+  -> [a]
+  -> m (Maybe a)
+findM _ [] =
+  return Nothing
+findM f (x:xs) =
+  do
+    b <- f x
+    if b
+      then (return . Just) x
+      else findM f xs
+
+findMapM ::
+  Monad m =>
+  (a -> m (Maybe b))
+  -> [a]
+  -> m (Maybe b)
+findMapM _ [] = return Nothing
+findMapM f (x:xs) =
+  do
+    mb <- f x
+    if (isJust mb)
+      then return mb
+      else findMapM f xs
diff --git a/tests/Main.hs b/tests/Main.hs
new file mode 100644
--- /dev/null
+++ b/tests/Main.hs
@@ -0,0 +1,34 @@
+module Main where
+
+import Test.Framework as TF (defaultMain, testGroup, Test)
+import Test.Framework.Providers.QuickCheck2 (testProperty)
+
+import Control.Monad.MissingM
+import Data.Maybe (listToMaybe)
+import Data.Functor.Identity
+
+main :: IO ()
+main = defaultMain tests
+
+tests :: [TF.Test]
+tests = [
+    testGroup "The" [
+      testProperty "prop_findMvsfilter" prop_findMvsfilter,
+      testProperty "prop_findMapMvsfilter" prop_findMapMvsfilter
+    ]
+  ]
+
+instance Show (a -> b) where
+  show = const "(function)"
+
+-- just testing with the Identity monad for now.
+
+prop_findMvsfilter :: (Int -> Bool) -> [Int] -> Bool
+prop_findMvsfilter f as =
+  let f' = return . f
+  in runIdentity (findM f' as) == listToMaybe (filter f as)
+
+prop_findMapMvsfilter :: (Int -> Int) -> (Int -> Bool) -> [Int] -> Bool
+prop_findMapMvsfilter mapper tester as =
+  let amb x = let b = mapper x in if tester b then Just b else Nothing
+  in runIdentity (findMapM (return . amb) as) == (listToMaybe (filter tester (fmap mapper as)))