diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/README b/README
new file mode 100644
--- /dev/null
+++ b/README
@@ -0,0 +1,39 @@
+This contains the following tools:
+
+To build these, you will need a Haskell compiler (the most likely
+candidate begin GHC), and my bioinformatics library and the SimpleArgs
+module installed (Downloadable from: <http://malde.org/~ketil/biohaskell/>).
+
+filter - remove unwanted sequences from a clustering
+         usage: filter seq.list < cluster.L > cluster2.L
+         cluster2.L will only contain sequence labels found in seq.list
+
+hist   - produce a histogram of cluster sizes from a "label"-formatted
+         clustering.
+
+clusc  - compare clusterings, calculating numerous pair-based and
+         entropy based indices.
+
+xcerpt - given a file containing a list of sequence labels (e.g. a
+         "label" formatted clustering), extract matching sequences
+         from a FASTA file.  Like "agrep -d '^>'" without the bugs.
+
+         Usage: xcerpt list.txt fasta.seq
+         creates "fasta.seq.match" and "fasta.seq.rest"
+
+add_single - add singletons to a clustering.
+        Usage: add_single all.L clustering.L
+        creates clustering.L_s listing all sequences in all.L but not in
+        clustering.L, one per line.
+
+ace2contigs - parse an ACE assembly file, and output the contigs in a
+        FASTA file (named by tacking on .fasta to the ACE file name),
+        and the corresponding quality information (.qual).
+
+ace2fasta - parse an ACE assembly, and output each assembly in a separate
+        fasta formatted file, with the necessary gaps inserted to align the
+        sequences (suitable for import into e.g. Seaview)
+
+clusterlibs - given a table of regular expressions and library names,
+        along with a clustering (TGICL-format), output a table of clusters
+        with the library name prepended to the sequences.
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,3 @@
+#!/usr/bin/env runhaskell
+import Distribution.Simple
+main = defaultMain
diff --git a/clustertools.cabal b/clustertools.cabal
new file mode 100644
--- /dev/null
+++ b/clustertools.cabal
@@ -0,0 +1,65 @@
+Name:                clustertools
+Version:             0.1
+License:             GPL
+License-file:        LICENSE
+Author:              Ketil Malde
+Maintainer:          Ketil Malde <ketil@ii.uib.no>
+
+Category:            Bioinformatics
+Synopsis:            Tools for manipulating sequence clusters
+Description:         This is a bunch of stuff I needed at some for manipulating sequence
+                     clusters. See the README for details. The tools included are:
+                     .
+                     * filter - remove unwanted sequences from a clustering
+                     .
+                     * hist   - produce a histogram of cluster sizes from a "label"-formatted clustering.
+                     .
+                     * clusc  - compare clusterings, calculating numerous pair-based and entropy based indices.
+                     .
+                     * add_single - add singletons to a clustering.
+                     .
+                     * ace2contigs - parse an ACE assembly file, and output the contigs in a FASTA file.
+                     .
+                     * ace2fasta - parse an ACE assembly, and output each assembly in a separate FASTA file
+                     .
+                     * clusterlibs - given a table of regular expressions and library names, along with a
+                     clustering (TGICL-format), output a table of clusters with the library name
+                     prepended to the sequences.
+                     .
+                     The Darcs repository is at: <http://malde.org/~ketil/cluster_tools>.
+Homepage:            http://malde.org/~ketil/
+
+Tested-With:         GHC==6.8.2
+Build-Type:          Simple
+Cabal-Version:       >= 1.2
+
+Data-Files:          README
+
+Executable filter
+           Hs-source-dirs: src
+           Main-Is:     Filter.hs
+           Build-Depends:       base>3, containers, simpleargs>=0.1
+           ghc-options:         -Wall -O2 -funbox-strict-fields
+
+Executable clusc
+           Hs-source-dirs: src
+           Main-Is:     Cluscomp.lhs
+           Build-Depends: bytestring
+
+Executable add_single
+           Hs-source-dirs: src
+           Main-Is:     AddSingletons.hs
+
+Executable ace2contigs
+           Hs-source-dirs: src
+           Main-Is:     Ace2Contigs.hs
+           Build-depends: bio>=0.3.3
+
+Executable ace2fasta
+           Hs-source-dirs: src
+           Main-Is:     Ace2Fasta.hs
+
+Executable clusterlibs
+           Hs-source-dirs: src
+           Main-Is:     ClusterLibs.hs
+           Build-depends: regex-compat
diff --git a/src/Ace2Contigs.hs b/src/Ace2Contigs.hs
new file mode 100644
--- /dev/null
+++ b/src/Ace2Contigs.hs
@@ -0,0 +1,17 @@
+-- ace2contigs
+-- Extract the contigs with quality information from ace file
+
+module Main where
+import Prelude hiding (reads)
+
+import Bio.Alignment.ACE
+import Bio.Sequence
+
+import System.SimpleArgs (getArgs)
+
+main :: IO ()
+main = do
+  ace <- getArgs
+  a <- readACE ace
+  let cs = map (fst . contig) $ concat a
+  writeFastaQual (ace++".fasta") (ace++".qual") cs
diff --git a/src/Ace2Fasta.hs b/src/Ace2Fasta.hs
new file mode 100644
--- /dev/null
+++ b/src/Ace2Fasta.hs
@@ -0,0 +1,29 @@
+-- ace2fa
+-- Read an ACE file, output in Fasta format
+-- (for importing into seaview)
+
+module Main where
+import Prelude hiding (reads)
+
+import Bio.Alignment.ACE
+import Bio.Sequence
+import qualified Data.ByteString.Lazy.Char8 as B
+import System.SimpleArgs (getArgs)
+import System.IO
+
+main :: IO ()
+main = do 
+  a <- readACE =<< getArgs
+  mapM_ (\ss -> writeFasta (B.unpack $ seqlabel $ head ss) ss) (map pad_all $ concat a) 
+
+pad_all :: Assembly -> [Sequence]
+pad_all asm = pad 21 (contig asm) : map padRead (reads asm)
+    where padRead (off,_dir,sq,gs) = pad (20+off) (sq,gs) -- note: they are already complemented
+
+-- generate a sequence with '-' for gaps
+pad :: Offset -> (Sequence,Gaps) -> Sequence
+pad off (Seq n s _,gs) = let s' = (if off < 0 then B.drop (negate off) else B.append (B.replicate off '-')) (insertGaps '-' (s,gs))
+                         in (Seq n s' Nothing)
+
+
+
diff --git a/src/AddSingletons.hs b/src/AddSingletons.hs
new file mode 100644
--- /dev/null
+++ b/src/AddSingletons.hs
@@ -0,0 +1,30 @@
+-- add singleton clusters to clustering files
+-- read files building map over words
+-- add the difference
+
+-- usage: add_single reference clustering1 [clustering2]..
+
+import System.Environment (getArgs)
+import System.IO
+import Control.Monad
+import Data.Set
+
+main = do
+     (ref:fs) <- getArgs
+     r <- readFile ref
+     mapM_ (append_s (mkindex r)) fs
+
+append_s :: Set String -> FilePath -> IO ()
+append_s ref f = do
+     fc <- readFile f
+     let fi = mkindex fc
+     when (not . Data.Set.null . difference fi $ ref)
+          (putStrLn ("Warning: '"++f++"' contains unknown words!"))
+     let ss = difference ref fi
+     when (Data.Set.null ss) (return ())
+     h <- openFile (f++"_s") WriteMode
+     mapM_ (hPutStrLn h) (toList ss)
+     hClose h
+
+mkindex :: String -> Set String
+mkindex = foldr insert empty . words
diff --git a/src/Cluscomp.lhs b/src/Cluscomp.lhs
new file mode 100644
--- /dev/null
+++ b/src/Cluscomp.lhs
@@ -0,0 +1,175 @@
+
+Calculate the contingency matrix for two clusterings.
+For clusterings $C = {c_1,c_2,...c_n} and $K = {k_1, k_2,..k_m}$
+the matrix is defined as $ a_ij = c_i U k_j $.
+
+The matrix is calculated lazily, and arbitrary functions can
+be applied to it to derive various scores: edit distance,
+jaccard index, exact count, etc.
+
+\begin{code}
+
+module Main where
+
+import qualified Data.ByteString.Lazy.Char8 as B
+
+import Data.Map hiding (map,filter,null)
+import qualified Data.Map as M
+import Data.List
+import Data.Maybe
+import System.Environment (getArgs)
+import Text.Printf
+
+type ByteString = B.ByteString
+
+main :: IO ()
+main = do
+   (a:args) <- getArgs
+   a' <- B.readFile a
+   let ref = mkC $ readC a'
+       n   = maximum $ map length ("clustering":args)
+   putStrLn (pad n "clustering" ++ "\tVI\tMIF\tJaccard\tRand\tFowMal\tSkew")
+   mapM_ (comp n ref) args
+
+pad i s = s ++ replicate (i-length s) ' '
+
+comp :: Int -> Clustering -> FilePath -> IO ()
+comp n k f = do
+    f' <- B.readFile f
+    let mx = matrix k (readC f')
+        ct = mkPairs k mx
+        sh = printf "%.3f"
+    putStrLn $ concat $ intersperse "\t" $ (pad n f) : map sh
+            [fst $ iscore mx -- VI
+            ,snd $ iscore mx -- MIF
+            ,jaccard ct, rand ct, fowmal ct, skew ct] --  ++"\tmatrix: "++show ct)
+
+type CID = Int
+
+type Sequence     = ByteString            -- hash for efficiency?
+type Cluster = [Sequence]
+
+type Clustering   = (Map CID Cluster
+                    ,Map Sequence CID)  -- optimization option
+
+cid :: Clustering -> Sequence -> Maybe CID
+cid k x = M.lookup x (snd k)
+
+seqs :: Clustering -> CID -> Maybe Cluster
+seqs k c = M.lookup c (fst k)
+
+-- read a clustering from file
+readC :: ByteString -> [Cluster]
+readC = filter (not.null) . map B.words . B.lines
+
+-- build the Clustering from a set of clusters
+mkC :: [Cluster] -> Clustering
+mkC  = foldr ins (M.empty,M.empty) . zip [0..]
+  where ins (n,ss) (i2c,s2i) = (M.insert n ss i2c, foldr (\s -> M.insert s n) s2i ss)
+
+\end{code}
+
+Matrix construction.
+
+\begin{code}
+
+type Row    = [(Maybe CID,[Sequence])]
+type Matrix = [Row]
+
+-- reads a clustering and produces the confusion (-tingency) matrix
+matrix :: Clustering -> [[Sequence]] -> Matrix
+matrix c = map (matrixRow c)
+
+matrixRow :: Clustering -> [Sequence] -> Row
+matrixRow k c1 = comb $ sort $ map (\x -> (cid k x, [x])) c1 -- cid,seq
+    where comb ((a,b):(c,d):xs) | a==c      = comb ((a,b++d):xs)
+                                | otherwise = (a,b):comb ((c,d):xs)
+          comb [(a,b)] = [(a,b)]
+          comb []      = []
+
+\end{code}
+
+\subsection{Jaccard index, and friends}
+
+Indices based on pair counts.  This includes jaccard, rand, ...?
+"skew" is based on MacNemar's test.
+
+\begin{code}
+
+type Pairs = (Double,Double,Double,Double) -- a b c, and d
+
+jaccard, rand, fowmal, skew :: Pairs -> Double
+jaccard (a,b,c,_) = a/(a+b+c)
+rand    (a,b,c,d) = (a+d)/(a+b+c+d)
+fowmal  (a,b,c,d) = a/sqrt((a+b)*(a+c))  -- Fowlkes-Mallows index
+-- this is the same as fowmal (why?)!
+hubert  (a,b,c,d) = (a*d - b*c)/sqrt((a+b)*(c+d)*(a+c)*(b+d)) -- Gamma stat?
+
+skew     (a,b,c,d) = (b-c)/sqrt(b+c)/sqrt d
+
+mkPairs :: Clustering -> Matrix -> Pairs
+mkPairs k m = let (a,b,c,ct) = foldl (jc1 k) (0,0,0,0) m
+            in (a/2,b/2,c/2,(ct*(ct-1)-a-b-c)/2)
+
+-- this is pretty ugly!
+jc1 :: Clustering -> Pairs -> Row -> Pairs
+jc1 k j row = let row' = filter (isJust.fst) row
+                  l = sum $ map (len.snd) row'
+              in foldr (jc2 k l) j row'
+jc2 k lc (Just i,ss) (a,b,c,ct) = (a+ls*(ls-1),b+(ls*(lk-ls)),c+(ls*(lc-ls)),ct+ls)
+    where ls = len ss
+          lk = len $ fromJust (seqs k i)  -- fixme! only seqs found in C!
+
+-- todo: accumulate column sizes until end?  how does clusqual deal?
+
+\end{code}
+
+\subsection{Entropy-based measures}
+
+The \texttt{iscore} function calculates the variation of information
+between the two clustrings. Given clusterings $C$ and $K$ matrix $H$, it is
+calculated as:
+
+\(
+  \sum_C H_c\log H_c + \sum_K H_k\log H_k -2\sumH_{K,C} H_{k,c} \log H_{k,c}
+\)
+
+Todo: implement \[I/H = (H_c - H_k)/H_{c,k} - 1\]
+
+I.e. collect H_k, H_c,k, and H_c, and use it to calculate both measures.
+
+\begin{code}
+
+type Imx = (Double,Double,Double,Double)
+
+-- iscore calculates mutual information fraction and variation of information
+iscore :: Matrix -> (Double,Double) -- MIF and VI
+iscore mx = let (n,hc,hk,hck) = iscores empty (0,0,0,0) mx
+                vi  = 1/n*(-2*hck+hc+hk)
+                mif = (hc+hk-2*mlog n)/(hck-mlog n)-1
+            in (vi,mif)
+
+-- iscores - calculate n, H_c, H_k, H_c,k
+iscores:: Map Int Double -> Imx -> Matrix -> Imx
+iscores m (n,hc,hk,hck) (r:rs) =
+    let r' = map (len.snd) $ filter (isJust.fst) r
+    in iscores (accum m r)
+               (n+sum r',hc,hk+mlog (sum r'),hck+sum (map mlog r')) rs
+iscores m (n,hc,hk,hck) [] =
+    (n,(sum $ map mlog $ elems m),hk,hck)
+
+-- accumulate the column sums for the matrix.  This must be done
+-- explicitly, since one clustering may contain sequences not present
+-- in the other
+accum :: Map Int Double -> Row -> Map Int Double
+accum m row = foldr accum1 m row
+   where accum1 (Just cid,seqs) m = insertWith (+) cid (len seqs) m
+         accum1 (Nothing,_)     m = m
+
+mlog 0 = 0 -- error "log 0!"
+mlog x = x*log x/log 2
+
+len = fromIntegral . length
+
+\end{code}
+
diff --git a/src/ClusterLibs.hs b/src/ClusterLibs.hs
new file mode 100644
--- /dev/null
+++ b/src/ClusterLibs.hs
@@ -0,0 +1,66 @@
+-- clusterLibs
+-- calculate clusters by library, using the lib table
+-- read patterns from a table, first line is header
+
+{-
+import qualified Data.ByteString.Char8.Lazy as B
+import Data.Map (Map)
+import qualified Data.Map as M
+
+
+type Str = B.ByteString
+type Clusters = Map Str [Str]
+
+insert1 m k v = M.insertWith (flip (++)) k [v] m
+-}
+
+import System.Environment (getArgs)
+import Text.Regex
+import Data.List (elemIndex,sortBy,intersperse)
+
+type Cluster = (String,[String])
+
+main = do
+   [ps,cs] <- getArgs `catch` error "Usage: clusterlibs ps cs"
+   pat <- readPatternTable ps
+   clus <- classClusters pat cs
+   writeClusters clus
+
+readPatternTable :: FilePath -> IO [(Regex,String)]
+readPatternTable f = do
+  (h:ls) <- return . map words . lines =<< readFile f
+  let (p,n) = case (elemIndex "Pattern" h, elemIndex "Name" h) of
+                (Just x,Just y) -> (x,y)
+                _ -> error ("Need both 'Pattern' and 'Name' headers in '"++f++"'")
+      z l = (mkRegex (l!!p),l!!n)
+  return $ map z ls
+
+-- will need to match against all, to check for multiple matches
+-- tag names with library
+classClusters :: [(Regex,String)] -> FilePath -> IO [Cluster]
+classClusters ps f = return . getClusters (classify ps) . lines =<< readFile f
+
+classify ps str = case concatMap (class1 str) ps of
+                    [] -> error ("no match for "++str)
+                    [x] -> x++":"++str
+                    s@(_:_) -> error ("multiple matches for "++str++": "++show s)
+    where class1 str (r,s) = maybe [] (const [s]) (matchRegex r str)
+
+getClusters f []          = []
+getClusters f [_]         = error "odd number of cluster lines!"
+getClusters f (c:ss:rest) = case head $ words c of
+                              ('>':name) -> (name,map f $ words ss) : getClusters f rest
+                              _          -> error ("Cluster '"++c++"' didn't start with '>'")
+
+-- transpose and print
+writeClusters :: [Cluster] -> IO ()
+writeClusters cs = do
+  let cs' = map (\(h,s) -> (h:s)) cs
+      cs'' = sortBy (\x y -> compare (length y) (length x)) cs'
+      unwords' = concat . intersperse ","
+  putStrLn $ unlines $ map unwords' $ transpose cs''
+
+transpose :: [[String]] -> [[String]]
+transpose []  = []
+transpose ls' = let ls = filter (not . null) ls'
+                in map head ls : transpose (map tail ls)
diff --git a/src/Filter.hs b/src/Filter.hs
new file mode 100644
--- /dev/null
+++ b/src/Filter.hs
@@ -0,0 +1,10 @@
+
+import System.SimpleArgs
+import Data.Set hiding (filter,map,null)
+
+main :: IO ()
+main = interact . runFilter . fromList . words =<< readFile =<< getArgs
+     
+runFilter :: Set String -> String -> String
+runFilter s = unlines . filter (not.null) . 
+              map (unwords . filter (flip member s) . words) . lines
