diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+              GNU GENERAL PUBLIC LICENSE
+                Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                     Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  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.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey 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;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  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.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+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.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+              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
+state 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program 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, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU 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 Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/README b/README
new file mode 100644
--- /dev/null
+++ b/README
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/neet.cabal b/neet.cabal
new file mode 100644
--- /dev/null
+++ b/neet.cabal
@@ -0,0 +1,35 @@
+-- Initial neet.cabal generated by cabal init.  For further documentation, 
+-- see http://haskell.org/cabal/users-guide/
+
+name:                neet
+version:             0.1.0.0
+synopsis:            A NEAT library for Haskell
+-- description:         
+homepage:            https://github.com/raymoo/NEET
+bug-reports:         https://github.com/raymoo/NEET/issues
+license:             GPL-3
+license-file:        LICENSE
+author:              Leon Medvinsky
+maintainer:          lmedvinsky@hotmail.com
+copyright:           Copyright (C) 2015 Leon Medvinsky
+category:            AI
+build-type:          Simple
+extra-source-files:  README
+cabal-version:       >=1.10
+description:
+  This package provides functions for creating, training, and using NEAT neural
+  networks.
+
+
+library
+  exposed-modules:     Neet.Genome, Control.Monad.Fresh.Class, Neet.Parameters, Neet.Network,
+                       Neet.Species, Neet.Population, Neet.Examples.XOR
+  -- other-modules:       
+  other-extensions:    FunctionalDependencies, MultiParamTypeClasses
+  build-depends:       base >=4.7 && <4.8, MonadRandom >=0.4 && <0.5,
+                       containers >= 0.5 && < 0.6, multimap >= 1.2 && < 1.3,
+                       transformers == 0.4.*, graphviz == 2999.17.*
+  hs-source-dirs:      src
+  default-language:    Haskell2010
+
+  ghc-options: -Wall -fwarn-tabs
diff --git a/src/Control/Monad/Fresh/Class.hs b/src/Control/Monad/Fresh/Class.hs
new file mode 100644
--- /dev/null
+++ b/src/Control/Monad/Fresh/Class.hs
@@ -0,0 +1,54 @@
+{-
+Copyright (C) 2015 Leon Medvinsky
+
+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 3
+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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-}
+
+{-# LANGUAGE FunctionalDependencies #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+
+{-|
+Module      : Control.Monad.Fresh.Class
+Description : Monads that provide fresh values
+Copyright   : (c) Leon Medvinsky, 2015
+
+License     : GPL-3
+Maintainer  : lmedvinsky@hotmail.com
+Stability   : experimental
+Portability : portable
+-}
+
+module Control.Monad.Fresh.Class (MonadFresh(..), nFresh) where
+
+
+
+import Control.Monad
+
+
+-- | A class for monads that can give fresh values.
+--
+-- At least for Eq s, an instance of 'MonadFresh' should satisfy
+--
+-- @
+-- ('==') '<$>' 'fresh' '<*>' 'fresh' ≡ 'fresh' '*>' 'fresh' '*>' 'pure' 'False'
+-- @
+--
+-- and something similar for any number of fresh.
+class Monad m => MonadFresh s m | m -> s where
+  fresh :: m s
+
+
+nFresh :: MonadFresh s m => Int -> m [s]
+nFresh n = replicateM n fresh
diff --git a/src/Neet/Examples/XOR.hs b/src/Neet/Examples/XOR.hs
new file mode 100644
--- /dev/null
+++ b/src/Neet/Examples/XOR.hs
@@ -0,0 +1,70 @@
+{-
+Copyright (C) 2015 Leon Medvinsky
+
+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 3
+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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-}
+
+{-|
+Module      : Neet.Examples.XOR
+Description : Testing the algorithm on XOR
+Copyright   : (c) Leon Medvinsky, 2015
+
+License     : GPL-3
+Maintainer  : lmedvinsky@hotmail.com
+Stability   : experimental
+Portability : ghc
+-}
+
+module Neet.Examples.XOR (xorFit, andFit, orFit) where
+
+
+import Neet.Genome
+import Neet.Network
+
+
+boolQuestions :: [[Double]]
+boolQuestions = [ [0, 0]
+                , [0, 1]
+                , [1, 0]
+                , [1, 1]
+                ]
+
+xorAnswers :: [Double]
+xorAnswers = [0, 1, 1, 0]
+
+sampleFit :: [[Double]] -> [Double] -> Genome -> Double
+sampleFit questions answers g = (fromIntegral (length answers) - sumDiffs)**2
+  where net = mkPhenotype g
+        try samp = head . getOutput $ snapshot net samp
+        responses = map try questions
+        sumDiffs = sum $ zipWith (\x y -> abs (x - y)) responses answers
+
+xorFit :: Genome -> Double
+xorFit = sampleFit boolQuestions xorAnswers
+
+andAnswers :: [Double]
+andAnswers = [0, 0, 0, 1]
+
+
+andFit :: Genome -> Double
+andFit = sampleFit boolQuestions andAnswers
+
+
+orAnswers :: [Double]
+orAnswers = [0, 1, 1, 1]
+
+
+orFit :: Genome -> Double
+orFit = sampleFit boolQuestions orAnswers
diff --git a/src/Neet/Genome.hs b/src/Neet/Genome.hs
new file mode 100644
--- /dev/null
+++ b/src/Neet/Genome.hs
@@ -0,0 +1,431 @@
+{-
+Copyright (C) 2015 Leon Medvinsky
+
+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 3
+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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-}
+
+{-|
+Module      : Neet.Genome
+Description : Encodings NEAT genomes
+Copyright   : (c) Leon Medvinsky, 2015
+
+License     : GPL-3
+Maintainer  : lmedvinsky@hotmail.com
+Stability   : experimental
+Portability : ghc
+-}
+
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+module Neet.Genome ( -- * Genes
+                     NodeId(..)
+                   , NodeType(..)
+                   , NodeGene(..)
+                   , ConnGene(..)
+                   , InnoId(..)
+                   , ConnSig
+                     -- * Genome
+                   , Genome(..)
+                     -- ** Construction
+                   , fullConn
+                     -- ** Breeding
+                   , mutate
+                   , crossover
+                   , breed
+                     -- ** Distance
+                   , distance
+                     -- ** Visualization
+                   , renderGenome
+                   ) where
+
+import Control.Applicative
+import Control.Monad
+import Control.Monad.Random
+import Data.Map.Strict (Map)
+import qualified Data.Traversable as T
+import qualified Data.Map.Strict as M
+
+import qualified Data.Set as S
+
+import Data.Maybe
+
+import Control.Monad.Fresh.Class
+import Neet.Parameters
+
+import Data.GraphViz
+import Data.GraphViz.Attributes.Complete
+
+-- | The IDs node genes use to refer to nodes.
+newtype NodeId = NodeId Int
+               deriving (Show, Eq, Ord, PrintDot)
+
+
+-- | Types of nodes
+data NodeType = Input | Hidden | Output
+              deriving (Show, Eq)
+
+
+-- | Node genes
+data NodeGene = NodeGene { nodeType :: NodeType
+                         , yHint :: Rational -- ^ A hint for recurrency
+                         }
+              deriving (Show)
+
+
+-- | Connection genes
+data ConnGene = ConnGene { connIn :: NodeId
+                         , connOut :: NodeId
+                         , connWeight :: Double
+                         , connEnabled :: Bool
+                         , connRec :: Bool -- ^ A hint for recurrency
+                         }
+              deriving (Show)
+
+
+-- | Innovation IDs
+newtype InnoId = InnoId Int
+               deriving (Show, Eq, Ord)
+
+
+-- | A NEAT genome. The innovation numbers are stored in here, and not the genes,
+-- to prevent data duplication.
+data Genome =
+  Genome { nodeGenes :: Map NodeId NodeGene
+         , connGenes :: Map InnoId ConnGene
+         , nextNode :: NodeId
+         }
+  deriving (Show)
+
+
+-- | Takes the number of inputs, the number of outputs, and gives a genome with
+-- the inputs fully connected to the outputs with random weights. The order of
+-- the connections are deterministic, so when generating a population, you
+-- can just start the innovation number at (iSize + 1) * oSize, since the network
+-- includes an additional input for the bias.
+fullConn :: MonadRandom m => Parameters -> Int -> Int -> m Genome
+fullConn Parameters{..} iSize oSize = do
+  let inCount = iSize + 1
+      inIDs = map NodeId [1..inCount]
+      outIDs = map NodeId [inCount + 1..oSize + inCount]
+      inputGenes = zip inIDs $ repeat (NodeGene Input 0)
+      outputGenes = zip outIDs $ repeat (NodeGene Output 1)
+      nodeGenes = M.fromList $ inputGenes ++ outputGenes
+      nextNode = NodeId $ inCount + oSize + 1
+      nodePairs = (,) <$> inIDs <*> outIDs
+  conns <- zipWith (\(inN, outN) w -> ConnGene inN outN w True False) nodePairs `liftM` getRandomRs (-weightRange,weightRange)
+  let connGenes = M.fromList $ zip (map InnoId [1..]) conns
+  return $ Genome{..}
+
+
+-- | Mutate the weights - perturb or make entirely new weights
+mutateWeights :: MonadRandom m => Parameters -> Genome -> m Genome
+mutateWeights Parameters{..} gen@Genome{..} = do
+  roll <- getRandomR (0,1)
+  if roll > mutWeightRate
+    then return gen
+    else setConns gen `liftM` T.mapM mutOne connGenes
+  where setConns g cs = g { connGenes = cs }
+        mutOne conn = do
+          roll <- getRandomR (0,1)
+          let newWeight
+                | roll <= newWeightRate = getRandomR (-weightRange,weightRange)
+                | otherwise = do
+                    pert <- getRandomR (-pertAmount,pertAmount)
+                    return $ connWeight conn + pert
+          w <- newWeight
+          return $ conn { connWeight = w }
+
+
+-- | Signature of a connection, used in matching innovations fromthe same generation.
+data ConnSig = ConnSig NodeId NodeId
+             deriving (Show, Eq, Ord)
+
+
+-- | Get a 'ConnSig'
+toConnSig :: ConnGene -> ConnSig
+toConnSig gene = ConnSig (connIn gene) (connOut gene)
+
+-- | Adds a single connection, updating the innovation context
+addConn :: MonadFresh InnoId m => ConnGene ->
+           (Map ConnSig InnoId, Map InnoId ConnGene) ->
+           m (Map ConnSig InnoId, Map InnoId ConnGene)
+addConn conn (innos, conns) = case M.lookup siggy innos of
+  Just inno -> return (innos, M.insert inno conn conns)
+  Nothing -> do
+    newInno <- fresh
+    return (M.insert siggy newInno innos, M.insert newInno conn conns)
+  where siggy = toConnSig conn
+
+
+-- | Mutation of additional connection. 'Map' parameter is context of previous
+-- innovations. This could be global, or per species generation.
+mutateConn :: (MonadFresh InnoId m, MonadRandom m) =>
+              Parameters -> Map ConnSig InnoId -> Genome -> m (Map ConnSig InnoId, Genome)
+mutateConn params innos g = do
+  roll <- getRandomR (0,1)
+  if roll > addConnRate params
+    then return (innos, g)
+    else case allowed of
+          [] -> return (innos, g)
+          _  -> do
+             (innos', conns') <- addRandConn innos (connGenes g)
+             return $ (innos', g { connGenes = conns' })
+             
+  where 
+        -- | Which connections are already filled up by genes. Value is a dummy
+        -- value because taken is only used in difference anyway.
+        taken :: Map ConnSig Bool
+        taken = M.fromList . map (\c -> (toConnSig c, True)) . M.elems . connGenes $ g
+
+        -- | Whether a gene is an input gene
+        notInput (NodeGene Input _) = False
+        notInput _                  = True
+
+        -- | The genome's nodes, in an assoc list
+        nodes = M.toList $ nodeGenes g
+
+        -- | Nodes that are not input
+        nonInputs = filter (notInput . snd) nodes
+
+        -- | Make a pair of 'ConnSig' and the recurrentness
+        makePair (n1,g1) (n2,g2) = (ConnSig n1 n2, yHint g2 <= yHint g1)
+
+        -- | Possible input -> output pairs
+        candidates = M.fromList $ makePair <$> nodes <*> nonInputs
+
+        -- | Which pairs are not taken
+        allowed = M.toList $ M.difference candidates taken
+
+        -- | Picks one of the available pairs
+        pickOne :: MonadRandom m => m (ConnSig, Bool)
+        pickOne = uniform allowed
+
+        pickWeight :: MonadRandom m => m Double
+        pickWeight = let r = weightRange params in getRandomR (-r,r)
+
+        -- | Randomly chooses one of the available connections and creates a
+        -- gene for it
+        addRandConn :: (MonadRandom m, MonadFresh InnoId m) =>
+                       Map ConnSig InnoId -> Map InnoId ConnGene ->
+                       m (Map ConnSig InnoId, Map InnoId ConnGene)
+        addRandConn innos' conns = do
+          (ConnSig inNode outNode, recc) <- pickOne
+          w <- pickWeight
+          let newConn = ConnGene inNode outNode w True recc
+          addConn newConn (innos',conns)
+
+
+-- | Mutation of additional node.
+mutateNode :: (MonadRandom m, MonadFresh InnoId m) =>
+              Parameters -> Map ConnSig InnoId ->
+              Genome -> m (Map ConnSig InnoId, Genome)
+mutateNode params innos g = do
+  roll <- getRandomR (0,1)
+  if roll <= addNodeRate params then addRandNode else return (innos, g)
+  where conns = connGenes g
+        nodes = nodeGenes g
+
+        -- | Pick one of the 'InnoId' 'ConnGene' pairs from conns
+        pickConn :: MonadRandom m => m (InnoId, ConnGene)
+        pickConn = uniform $ M.toList conns
+
+        -- | What will the new node's ID be
+        newId = nextNode g
+
+        -- | What should 'nextNode' be updated to
+        newNextNode = case newId of NodeId x -> NodeId (x + 1)
+
+        -- | Takes a connection gene and its associated InnoID, and splits
+        -- it with a node
+        addNode :: MonadFresh InnoId m =>
+                   InnoId -> ConnGene -> m (Map ConnSig InnoId, Genome)
+        addNode inno gene = do
+          let ConnSig inId outId = toConnSig gene
+
+              -- | Gene of the input node of this connection
+              inGene = nodes M.! inId
+
+              -- | Gene of the output node of this connection
+              outGene = nodes M.! outId
+
+              -- | The new node gene
+              newGene = NodeGene Hidden ((yHint inGene + yHint outGene) / 2)
+
+              -- | The new map of nodes, after inserting the new one
+              newNodes = M.insert newId newGene nodes
+
+              -- | The disabled version of the old connection
+              disabledConn = gene { connEnabled = False }
+
+              -- | The gene for the connection between the input and the new node
+              backGene = ConnGene inId newId 1 True (connRec gene)
+
+              -- | The gene for the connection between the new node and the output
+              forwardGene = ConnGene newId outId (connWeight gene) True (connRec gene)
+              
+          (innos', newConns) <-
+            addConn backGene >=> addConn forwardGene $ (innos, conns)
+
+          return $ (innos', g { nodeGenes = newNodes
+                              , connGenes = M.insert inno disabledConn newConns
+                              , nextNode = newNextNode
+                              })
+
+        -- | Pick an available connection randomly and make a gene for it
+        addRandNode :: (MonadRandom m, MonadFresh InnoId m) => m (Map ConnSig InnoId, Genome)
+        addRandNode =
+          pickConn >>= uncurry addNode
+
+
+-- | Mutates the genome, using the specified parameters and innovation context.
+mutate :: (MonadRandom m, MonadFresh InnoId m) => Parameters -> Map ConnSig InnoId ->
+          Genome -> m (Map ConnSig InnoId, Genome)
+mutate params innos g = do
+  g' <- mutateWeights params g
+  uncurry (mutateNode params) >=> uncurry (mutateConn params) $ (innos, g')
+
+
+-- | Super left biased merge -- loners on the right map don't get in
+superLeft :: Ord k => (a -> b -> c) -> (a -> c) -> Map k a -> Map k b -> Map k c
+superLeft comb mk = M.mergeWithKey (\_ a b -> Just $ comb a b) (M.map mk) (const M.empty)
+
+
+-- | Choose between two alternatives with coin chance
+flipCoin :: MonadRandom m => a -> a -> m a
+flipCoin a1 a2 = uniform [a1, a2]
+
+
+-- | Crossover on just the connections. Put the fittest map first.
+crossConns :: MonadRandom m => Parameters -> Map InnoId ConnGene -> Map InnoId ConnGene ->
+              m (Map InnoId ConnGene)
+crossConns params m1 m2 = T.sequence $ superLeft flipConn return m1 m2
+  where flipConn c1 c2 = do
+          if connEnabled c1 && connEnabled c2
+            then flipCoin c1 c2
+            else do
+            c <- flipCoin c1 c2
+            roll <- getRandomR (0,1)
+            let enabled
+                  | roll <= disableChance params = False
+                  | otherwise = True
+            return c { connEnabled = enabled }
+
+
+-- | Crossover on just nodes
+crossNodes :: MonadRandom m => Map NodeId NodeGene -> Map NodeId NodeGene ->
+              m (Map NodeId NodeGene)
+crossNodes m1 m2 = T.sequence $ superLeft flipCoin return m1 m2
+
+
+-- | Crossover. The first argument is the fittest genome.
+crossover :: MonadRandom m => Parameters -> Genome -> Genome -> m Genome
+crossover params g1 g2 = Genome `liftM` newNodes `ap` newConns `ap` return newNextNode
+  where newNextNode = max (nextNode g1) (nextNode g2)
+        newConns = crossConns params (connGenes g1) (connGenes g2)
+        newNodes = crossNodes (nodeGenes g1) (nodeGenes g2)
+
+
+-- | Breed two genomes together
+breed :: (MonadRandom m, MonadFresh InnoId m) =>
+         Parameters -> Map ConnSig InnoId -> Genome -> Genome ->
+         m (Map ConnSig InnoId, Genome)
+breed params innos g1 g2 =
+  crossover params g1 g2 >>= mutate params innos
+
+
+-- | Gets differences where they exist
+differences :: Map InnoId ConnGene -> Map InnoId ConnGene -> Map InnoId Double
+differences = M.mergeWithKey (\_ c1 c2 -> Just $ oneDiff c1 c2) (const M.empty) (const M.empty)
+  where oneDiff c1 c2 = abs $ connWeight c1 - connWeight c2
+
+
+-- | Genetic distance between two genomes
+distance :: Parameters -> Genome -> Genome -> Double
+distance params g1 g2 = c1 * exFactor + c2 * disFactor + c3 * weightFactor
+  where DistParams c1 c2 c3 _ = distParams params
+
+        conns1 = connGenes g1
+        conns2 = connGenes g2
+        
+        weightDiffs = differences conns1 conns2
+
+        weightFactor = M.foldl (+) 0 weightDiffs / fromIntegral (M.size weightDiffs)
+
+        ids1 = M.keysSet conns1
+        ids2 = M.keysSet conns2
+
+        -- | The lower of the top bounds of innovation numbers
+        edge = min (S.findMax ids1) (S.findMax ids2)
+
+        -- | Excess and Disjoint
+        exJoints = (ids1 `S.difference` ids2) `S.union` (ids2 `S.difference` ids1)
+
+        (excess, disjoint) = S.partition (<= edge) exJoints
+
+        exFactor = fromIntegral $ S.size excess
+
+        disFactor = fromIntegral $ S.size disjoint
+
+
+graphParams :: GraphvizParams NodeId NodeGene Double Rational Rational
+graphParams =
+  Params { isDirected = True
+         , globalAttributes = [ GraphAttrs [ RankDir FromLeft
+                                           , Splines LineEdges
+                                           ]
+                              , NodeAttrs [ FixedSize SetNodeSize
+                                          ]
+                              ]
+         , clusterBy = categorizer
+         , isDotCluster = const True
+         , clusterID = iderizer
+         , fmtCluster = clusterizer
+         , fmtNode = const []
+         , fmtEdge = \(_,_,w) -> [ toLabel w ]
+         }
+  where categorizer (nId, ng) = C (yHint ng) (N (nId, yHint ng))
+        iderizer 0 = Str "Input Layer"
+        iderizer 1 = Str "Output Layer"
+        iderizer rat = Num (Dbl $ fromRational rat)
+        whiteAttr = Color [WC (X11Color White) Nothing]
+        blueAttr = Color [WC (X11Color Blue4) Nothing ]
+        redAttr = Color [WC (X11Color Red2) Nothing ]
+        greenAttr = Color [WC (X11Color SeaGreen) Nothing ]
+        solidAttr = Style [ SItem Solid [] ]
+        circAttr = Shape Circle
+        clusterizer 0 = [ GraphAttrs [ whiteAttr, rank MinRank ]
+                        , NodeAttrs [ solidAttr, blueAttr, circAttr ]
+                        ]
+        clusterizer 1 = [ GraphAttrs [ whiteAttr, rank MaxRank ]
+                        , NodeAttrs [ solidAttr, redAttr, circAttr ]
+                        ]
+        clusterizer _ = [ GraphAttrs [ whiteAttr ]
+                        , NodeAttrs [ solidAttr, greenAttr, circAttr ]
+                        ]
+
+
+-- | This graph produced is ugly and janky and will have bugs, like hidden nodes
+-- occasionally appearing with output nodes, and weird clustering overall. If you
+-- see some problems in the graph, confirm with the Show instance or something
+-- else that there really is a problem.
+renderGenome :: Genome -> IO ()
+renderGenome g = runGraphvizCanvas Dot graph Xlib
+  where nodes = M.toList . nodeGenes $ g
+        edges = mapMaybe mkEdge . M.elems . connGenes $ g
+        mkEdge ConnGene{..} = if connEnabled then Just (connIn, connOut, connWeight) else Nothing
+        graph = graphElemsToDot graphParams nodes edges
diff --git a/src/Neet/Network.hs b/src/Neet/Network.hs
new file mode 100644
--- /dev/null
+++ b/src/Neet/Network.hs
@@ -0,0 +1,141 @@
+{-
+Copyright (C) 2015 Leon Medvinsky
+
+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 3
+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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-}
+
+{-|
+Module      : Neet.Network
+Description : Networks produced from NEAT Genomes
+Copyright   : (c) Leon Medvinsky, 2015
+
+License     : GPL-3
+Maintainer  : lmedvinsky@hotmail.com
+Stability   : experimental
+Portability : ghc
+-}
+
+{-# LANGUAGE RecordWildCards #-}
+module Neet.Network (
+                      -- * Sigmoid
+                      modSig
+                      -- * Network
+                    , Network(..)
+                      -- ** Neuron
+                    , Neuron(..)
+                      -- ** Construction
+                    , mkPhenotype
+                      -- ** Updates
+                    , stepNeuron
+                    , stepNetwork
+                    , snapshot
+                      -- ** Output
+                    , getOutput
+                    ) where
+
+import Data.Map (Map)
+import Data.Set (Set)
+import qualified Data.Set as S
+
+import qualified Data.Map as M
+import Data.List (foldl')
+
+import Neet.Genome
+
+
+-- | Modified sigmoid function from the original NEAT paper
+modSig :: Double -> Double
+modSig d = 1 / (1 + exp (-4.9 * d))
+
+
+-- | A single neuron
+data Neuron =
+  Neuron { activation  :: Double            -- ^ The current activation
+         , connections :: Map NodeId Double -- ^ The inputs to this Neuron
+         , yHint       :: Rational          -- ^ Visualization height
+         }
+  deriving (Show)
+           
+
+-- | Sparse recurrent network, like those made by NEAT
+data Network =
+  Network { netInputs   :: [NodeId] -- ^ Which nodes are inputs
+          , netOutputs  :: [NodeId] -- ^ Which nodes are outputs
+          , netState    :: Map NodeId Neuron
+          , netDepth    :: Int      -- ^ Upper bound on depth
+          } 
+  deriving (Show)
+
+
+-- | Takes the previous step's activations and current inputs and gives a
+-- function to update a neuron.
+stepNeuron :: Map NodeId Double -> Neuron -> Neuron
+stepNeuron acts (Neuron _ conns yh) = Neuron (modSig weightedSum) conns yh
+  where oneFactor nId w = (acts M.! nId) * w
+        weightedSum = M.foldlWithKey' (\acc k w -> acc + oneFactor k w) 0 conns
+
+
+-- | Steps a network one step. Takes the network and the current input, minus
+-- the bias.
+stepNetwork :: Network -> [Double] -> Network
+stepNetwork net@Network{..} ins = net { netState = newNeurons }
+  where pairs = zip netInputs (ins ++ [1])
+
+        acts = M.map activation netState
+
+        -- | The previous state, except updated to have new inputs
+        modState = foldl' (flip $ uncurry M.insert) acts pairs
+
+        newNeurons = M.map (stepNeuron modState) netState
+
+
+-- | Steps a network for at least its depth
+snapshot :: Network -> [Double] -> Network
+snapshot net = go (netDepth net - 1)
+  where go 0 _  = net
+        go n ds = stepNetwork (go (n - 1) ds) ds
+
+
+mkPhenotype :: Genome -> Network
+mkPhenotype Genome{..} = (M.foldl' addConn nodeHusk connGenes) { netInputs = ins
+                                                               , netOutputs = outs
+                                                               , netDepth = dep }
+  where addNode n@(Network _ _ s _) nId (NodeGene _ yh) =
+          n { netState = M.insert nId (Neuron 0 M.empty yh) s
+            }
+
+        ins = M.keys . M.filter (\ng -> nodeType ng == Input) $ nodeGenes
+        outs = M.keys . M.filter (\ng -> nodeType ng == Output) $ nodeGenes
+
+        -- | Network without connections added
+        nodeHusk = M.foldlWithKey' addNode (Network [] [] M.empty 0) nodeGenes
+
+        depthSet :: Set Rational
+        depthSet = M.foldl' (flip S.insert) S.empty $ M.map Neet.Genome.yHint nodeGenes
+
+        dep = S.size depthSet
+
+        addConn2Node nId w (Neuron a cs yh) = Neuron a (M.insert nId w cs) yh
+
+        addConn net@Network{ netState = s } ConnGene{..}
+          | not connEnabled = net
+          | otherwise =
+              let newS = M.adjust (addConn2Node connIn connWeight) connOut s
+              in net { netState = newS }
+
+
+-- | Gets the output of the current state
+getOutput :: Network -> [Double]
+getOutput Network{..} = map (activation . (netState M.!)) netOutputs
diff --git a/src/Neet/Parameters.hs b/src/Neet/Parameters.hs
new file mode 100644
--- /dev/null
+++ b/src/Neet/Parameters.hs
@@ -0,0 +1,86 @@
+{-
+Copyright (C) 2015 Leon Medvinsky
+
+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 3
+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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-}
+
+{-|
+Module      : Neet.Parameters
+Description : Learning parameters
+Copyright   : (c) Leon Medvinsky, 2015
+
+License     : GPL-3
+Maintainer  : lmedvinsky@hotmail.com
+Stability   : experimental
+Portability : portable
+-}
+
+module Neet.Parameters (Parameters(..), DistParams(..), defParams, defDP, smallParams ) where
+
+
+-- | The genetic parameters
+data Parameters =
+  Parameters { mutWeightRate  :: Double -- ^ How often weights are mutated
+             , newWeightRate  :: Double -- ^ How often weights are replaced if mutated
+             , pertAmount     :: Double -- ^ Max amount of perturbation
+             , weightRange    :: Double -- ^ A new max is between negative this and positive this
+             , addConnRate    :: Double -- ^ How often new connections are made
+             , addNodeRate    :: Double -- ^ How often new nodes are added
+             , largeSize      :: Int    -- ^ The minimum size for a species to be considered large
+             , disableChance  :: Double -- ^ How likely that a disabled parent results
+                                        -- in a disabled child
+             , distParams     :: DistParams -- ^ Parameters for the distance function
+             , dropTime       :: Maybe Int -- ^ Drop a species if it doesn't improve for this long,
+                                           -- and it hasn't hosted the most successful genome.
+             , noCrossover    :: Double -- ^ Percent of population that mutates without crossover
+             }
+  deriving (Show)
+
+
+data DistParams =
+  DistParams { dp1 :: Double -- ^ Coefficient to the number of excess genes
+             , dp2 :: Double -- ^ Coefficient to the number of disjoint genes
+             , dp3 :: Double -- ^ Coefficient to the average weight differences
+             , delta_t :: Double -- ^ How close counts as the same species
+             } 
+  deriving (Show)
+
+
+-- | The parameters used in the original NEAT paper, except the perturbation amount
+-- and threshold for size.
+defParams :: Parameters
+defParams =
+  Parameters { mutWeightRate = 0.8
+             , newWeightRate = 0.1
+             , pertAmount = 0.1    -- This value I made up
+             , weightRange = 10    -- This one too
+             , addConnRate = 0.3
+             , addNodeRate = 0.03
+             , largeSize = 20
+             , disableChance = 0.75
+             , distParams = defDP
+             , dropTime = Just 15
+             , noCrossover = 0.25
+             } 
+
+
+-- | Parameters used in the paper for small populations
+smallParams :: Parameters
+smallParams = defParams { addConnRate = 0.05 }
+
+
+-- | Parameters used for distance in the paper
+defDP :: DistParams
+defDP = DistParams 1 1 0.4 3
diff --git a/src/Neet/Population.hs b/src/Neet/Population.hs
new file mode 100644
--- /dev/null
+++ b/src/Neet/Population.hs
@@ -0,0 +1,363 @@
+{-
+Copyright (C) 2015 Leon Medvinsky
+
+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 3
+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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-}
+
+{-|
+Module      : Neet.Population
+Description : Population of NEAT organisms
+Copyright   : (c) Leon Medvinsky, 2015
+
+License     : GPL-3
+Maintainer  : lmedvinsky@hotmail.com
+Stability   : experimental
+Portability : ghc
+-}
+
+{-# LANGUAGE DeriveFunctor #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE BangPatterns #-}
+module Neet.Population (
+                         Population(..)
+                         -- * PopM
+                       , PopM
+                       , PopContext
+                       , runPopM
+                         -- * Construction
+                       , PopSettings(..)
+                       , newPop
+                         -- * Training
+                       , trainOnce
+                       , trainN
+                       , trainUntil
+                       ) where
+
+import Neet.Species
+import Neet.Genome
+import Neet.Parameters
+
+import Data.MultiMap (MultiMap)
+import qualified Data.MultiMap as MM
+
+import Data.Map (Map)
+import qualified Data.Map as M
+
+import Data.List (foldl', maximumBy)
+
+import Data.Maybe
+
+import Control.Monad.Random
+import Control.Monad.Fresh.Class
+import Control.Monad.Trans.State
+
+import Control.Applicative
+import Control.Monad
+
+
+
+import Data.Function
+
+newtype SpecId = SpecId Int
+               deriving (Show, Eq, Ord)
+
+
+-- | A NEAT Population
+data Population =
+  Population { popSize   :: Int                -- ^ Size of the population
+             , popSpecs  :: !(Map SpecId Species) -- ^ The species
+             , popBScore :: !Double             -- ^ Best score so far
+             , popBOrg   :: !Genome             -- ^ Best genome so far
+             , popBSpec  :: !SpecId             -- ^ Id of the species that hosted the best score
+             , popCont   :: !PopContext         -- ^ Tracking state and fresh values
+             , nextSpec  :: !SpecId             -- ^ The next species ID
+             , popParams  :: Parameters        -- ^ Parameters for large species
+             , popParamsS :: Parameters        -- ^ Parameters for small species
+             }
+  deriving (Show)
+
+
+data PopContext =
+  PC { nextInno :: InnoId
+     , randGen  :: StdGen
+     } 
+  deriving (Show)
+
+-- | Custom state monad
+newtype PopM a = PopM (State PopContext a)
+            deriving (Functor, Applicative, Monad)
+
+
+instance MonadRandom PopM where
+  getRandom = PopM . state $ \s ->
+    let (r, gen) = random (randGen s)
+    in (r, s { randGen = gen })
+  getRandoms = PopM . state $ \s ->
+    let (g1, g2) = split $ randGen s
+    in (randoms g1, s { randGen = g2 })
+  getRandomR range = PopM . state $ \s ->
+    let (r, gen) = randomR range (randGen s)
+    in (r, s { randGen = gen })
+  getRandomRs range = PopM . state $ \s ->
+    let (g1, g2) = split $ randGen s
+    in (randomRs range g1, s { randGen = g2 })
+
+
+instance MonadFresh InnoId PopM where
+  fresh = PopM . state $ \s ->
+    let inno@(InnoId x) = nextInno s
+    in (inno, s { nextInno = InnoId $ x + 1 })
+
+
+runPopM :: PopM a -> PopContext -> (a, PopContext)
+runPopM (PopM ma) = runState ma
+
+
+-- | Settings for creating a new population
+data PopSettings =
+  PS { psSize    :: Int        -- ^ How big the population should be
+     , psInputs  :: Int        -- ^ Number of inputs
+     , psOutputs :: Int        -- ^ Number of outputs
+     , psParams  :: Parameters -- ^ Parameters for large species
+     , psParamsS :: Parameters -- ^ Parameters for small species
+     } 
+  deriving (Show)
+
+
+newtype SpecM a = SM (State SpecId a)
+                deriving (Functor, Applicative, Monad)
+
+
+instance MonadFresh SpecId SpecM where
+  fresh = SM . state $ \s@(SpecId x) -> (s, SpecId $ x + 1)
+
+
+runSpecM :: SpecM a -> SpecId -> (a, SpecId)
+runSpecM (SM ma) = runState ma
+
+
+-- | Buckets for speciation
+data SpecBucket =
+  SB SpecId Genome [Genome]
+
+
+-- | Speciation helper
+shuttleOrgs :: MonadFresh SpecId m =>
+               Parameters -> [SpecBucket] -> [Genome] -> m [SpecBucket]
+shuttleOrgs p@Parameters{..} buckets = foldM shutOne buckets
+  where DistParams{..} = distParams
+        shutOne :: MonadFresh SpecId m => [SpecBucket] -> Genome -> m [SpecBucket]
+        shutOne (SB sId rep gs:bs) g
+          | distance p g rep <= delta_t = return $ SB sId rep (g:gs) : bs
+          | otherwise = liftM (SB sId rep gs :) $ shutOne bs g
+        shutOne [] g = do
+          newId <- fresh
+          return $ [SB newId g [g]]
+
+
+zipWithDefaults :: (a -> b -> Maybe c) -> (a -> Maybe c) -> (b -> Maybe c) -> [a] -> [b] -> [c]
+zipWithDefaults _ _  db [] bs = mapMaybe db bs
+zipWithDefaults _ da _  as [] = mapMaybe da as
+zipWithDefaults f da db (a:as) (b:bs) =
+  case f a b of
+   Just res -> res : zipWithDefaults f da db as bs
+   Nothing -> zipWithDefaults f da db as bs
+
+
+-- | Speciation function
+speciate :: MonadFresh SpecId m =>
+            Parameters -> Map SpecId Species -> [Genome] -> m (Map SpecId Species)
+speciate params specs gens = do
+  filled <- fill
+  let zipped = zipWithDefaults mkSpecies (const Nothing) newSpecies specL filled
+  return $ M.fromList zipped
+  where oneBucket (k, Species _ (rep:_) _ _) = SB k rep []
+        oneBucket _                          = error "(speciate) Empty species!"
+        assocs = M.toList specs
+        specL = map snd assocs
+        buckets = map oneBucket assocs
+        fill = shuttleOrgs params buckets gens
+        mkSpecies (Species _ _ scr imp) (SB sId _ gs)
+          | null gs = Nothing
+          | otherwise = Just $ (sId, Species (length gs) gs scr imp)
+        newSpecies (SB _ _ []) = Nothing
+        newSpecies (SB sId _ (g:gs)) = Just $ (sId, newSpec g gs)
+
+
+-- | Generates a fully connected starter population, given a seed.
+newPop :: Int -> PopSettings -> Population
+newPop seed PS{..} = fst $ runPopM generate initCont
+  where popSize = psSize
+        popBScore = 0
+        popBSpec = SpecId 1
+        initCont = PC (InnoId $ psInputs * psOutputs + 2) (mkStdGen seed)
+        popParams = psParams
+        popParamsS = psParamsS
+        generateGens = replicateM psSize (fullConn psParams psInputs psOutputs)
+        generate = do
+          gens <- generateGens
+          let (popSpecs, nextSpec) = runSpecM (speciate psParams M.empty gens) (SpecId 1)
+              popBOrg = head gens
+          popCont <- PopM get
+          return Population{..}
+
+
+-- | Advances the population one generation with the fitness function.
+trainOnce :: (Genome -> Double) -> Population -> Population
+trainOnce f pop = generated
+  where params = popParams pop
+        paramsS = popParamsS pop
+
+        chooseParams :: Species -> Parameters
+        chooseParams s = if specSize s >= largeSize params then params else paramsS
+        {-# INLINE chooseParams #-}
+        
+        initSpecs = popSpecs pop
+
+        -- | Map to fitness data from runFitTest
+        fits = M.map (\sp -> (sp, runFitTest f sp)) initSpecs
+
+        -- | Whether a species deserves to live (did it improve recently?)
+        eugenics :: SpecId -> (Species, (MultiMap Double Genome, SpecScore, Double)) ->
+                    Maybe (Species, MultiMap Double Genome, Double)
+        eugenics sId (sp, (fitmap, ss, adj))
+          | maybe False (lastImprovement nSpec >=) (dropTime params)
+            && sId /= popBSpec pop = Nothing
+          | otherwise = Just (nSpec, fitmap, adj)
+          where nSpec = updateSpec ss sp
+
+        -- | Species that have improved recently enough.
+        masterRace :: Map SpecId (Species, MultiMap Double Genome, Double)
+        masterRace = M.mapMaybeWithKey eugenics fits
+
+        -- | toList'd version of masterRace
+        masterList :: [(SpecId,(Species, MultiMap Double Genome, Double))]
+        masterList = M.toList masterRace
+
+        -- | The best
+        idVeryBest :: (SpecId, Species)
+        idVeryBest = maximumBy (compare `on` (bestScore . specScore . snd)) $ map clean masterList
+          where clean (sId,(sp, _, _)) = (sId,sp)
+
+        veryBest = snd idVeryBest
+
+        bestId = fst idVeryBest
+
+        -- | Species to make buckets of
+        masterSpec :: Map SpecId Species
+        masterSpec = M.map (\(s,_,_) -> s) masterRace
+
+        totalFitness = M.foldl' (+) 0 . M.map (\(_,_,x) -> x) $ masterRace
+
+        totalSize = popSize pop
+
+        dubSize = fromIntegral totalSize
+
+        -- | Distribution of species.
+        candSpecs :: MonadRandom m => [(Parameters, Int, m Genome)]
+        candSpecs = zip3 ps realShares pickers
+          where initShares = map share masterList
+                share (_,(_, _, adj)) = round $ adj / totalFitness * dubSize
+                remaining = totalSize - foldl' (+) 0 initShares
+                distributeRem _ [] = error "Should run out of numbers first"
+                distributeRem n l@(x:xs)
+                  | n > 0 = x + 1 : distributeRem (n - 1) xs
+                  | otherwise = l
+                realShares = distributeRem remaining initShares
+                pickers :: MonadRandom m => [m Genome]
+                pickers = map picker masterList
+                  where picker (_,(s, mmap, _)) =
+                          let numToTake = specSize s `div` 5 + 1
+                              desc = M.toDescList $ MM.toMap mmap
+                              toPairs (k, vs) = map (\v -> (k,v)) vs
+                              culled = take numToTake $ desc >>= toPairs
+                          in fromList . map (\(d,g) -> (g, toRational d)) $ culled
+                ps = map (\(_,(s,_,_)) -> chooseParams s) masterList
+
+        applyN :: Monad m => Int -> (a -> m a) -> a -> m a
+        applyN 0 _  x = return x
+        applyN n h !x = h x >>= applyN (n - 1) h
+
+        -- | Generate the genomes for a species
+        specGens :: (MonadFresh InnoId m, MonadRandom m) =>
+                    (Parameters, Int, m Genome) -> m [Genome]
+        specGens (p, n, gen) = liftM snd $ applyN n genOne (M.empty, [])
+          where genOne (innos, gs) = do
+                  roll <- getRandomR (0,1)
+                  if roll <= noCrossover p
+                    then do
+                    parent <- gen
+                    (innos', g) <- mutate p innos parent
+                    return (innos', g:gs)
+                    else do
+                    mom <- gen
+                    dad <- gen
+                    (innos', g) <- breed p innos mom dad
+                    return (innos', g:gs)
+
+        allGens :: (MonadRandom m, MonadFresh InnoId m) => m [Genome]
+        allGens = liftM concat $ mapM specGens candSpecs
+
+        genNewSpecies :: (MonadRandom m, MonadFresh InnoId m) => m (Map SpecId Species, SpecId)
+        genNewSpecies = do
+          gens <- allGens
+          return $ runSpecM (speciate params masterSpec gens) (nextSpec pop)
+
+        generated :: Population
+        generated = fst $ runPopM generate (popCont pop)
+
+        generate :: PopM Population
+        generate = do
+          (specs, nextSpec') <- genNewSpecies
+          let bScoreNow = (bestScore . specScore) veryBest
+              bOrgNow = (bestGen . specScore) veryBest
+              bSpecNow = bestId
+              (bScore, bOrg, bSpec) =
+                if bScoreNow > popBScore pop
+                then (bScoreNow, bOrgNow, bSpecNow)
+                else (popBScore pop, popBOrg pop, popBSpec pop)
+          cont' <- PopM get
+          return pop { popSpecs = specs
+                     , popBScore = bScore
+                     , popBOrg = bOrg
+                     , popBSpec = bSpec
+                     , popCont = cont'
+                     , nextSpec = nextSpec'
+                     } 
+
+
+-- | Train the population n times. Values less than 1 return the original.
+trainN :: Int -> (Genome -> Double) -> Population -> Population
+trainN n f p
+  | n <= 0 = p
+  | otherwise = applyN n (trainOnce f) p
+  where applyN 0  _ !x = x
+        applyN n' h !x = applyN (n' - 1) h (h x)
+
+
+-- | Train until the given fitness (first parameter) is reached, or the max number
+-- of generations (second parameter) is reached. Also gives generations needed.
+trainUntil :: Double -> Int -> (Genome -> Double) -> Population -> (Population, Int)
+trainUntil goal n f p
+  | n <= 0 = (p, 0)
+  | otherwise = go n p
+  where go 0  !p' = (p', n)
+        go n' !p'
+          | reached = (p', n - n')
+          | otherwise = go (n' - 1) (trainOnce f p')
+          where reached = popBScore p' >= goal
diff --git a/src/Neet/Species.hs b/src/Neet/Species.hs
new file mode 100644
--- /dev/null
+++ b/src/Neet/Species.hs
@@ -0,0 +1,94 @@
+{-
+Copyright (C) 2015 Leon Medvinsky
+
+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 3
+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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-}
+
+{-|
+Module      : Neet.Species
+Description : NEAT Species
+Copyright   : (c) Leon Medvinsky, 2015
+
+License     : GPL-3
+Maintainer  : lmedvinsky@hotmail.com
+Stability   : experimental
+Portability : ghc
+-}
+
+{-# LANGUAGE RecordWildCards #-}
+module Neet.Species (
+                      Species(..)
+                    , SpecScore(..)
+                      -- * Construction
+                    , newSpec
+                      -- * Update/Fitness
+                    , runFitTest
+                    , updateSpec
+                    ) where
+
+
+import Neet.Genome
+import Data.MultiMap (MultiMap)
+import qualified Data.MultiMap as MM
+import Data.List (foldl')
+
+-- | A NEAT Species.
+data Species =
+  Species { specSize :: Int
+          , specOrgs :: [Genome]    -- ^ All the organisms in this species
+          , specScore :: SpecScore
+          , lastImprovement :: Int  -- ^ Number of gens ago the best score improved
+          }
+
+
+-- | Scoring data
+data SpecScore = SpecScore { bestScore :: Double, bestGen :: Genome }
+
+
+instance Show Species where
+  show (Species siz _ (SpecScore scr _) lastImprov) =
+    "Species {specSize = " ++ show siz ++
+    ", specOrgs = <...>, bestScore = " ++ show scr ++
+    ", bestGen = <...>" ++
+    ", lastImprovement = " ++ show lastImprov ++ "}"
+
+
+-- | Creates a new 'Species' with starter stats from a 'Genome' and the rest
+newSpec :: Genome -> [Genome] -> Species
+newSpec gen gens = Species (length gens + 1) (gen:gens) (SpecScore 0 gen) 0
+
+
+-- | Output the result of testing fitness. Last value is the total adjusted fitness
+runFitTest :: (Genome -> Double) -> Species -> (MultiMap Double Genome, SpecScore, Double)
+runFitTest f Species{..} = (mmap, ss, totF / dubSize)
+  where dubSize = fromIntegral specSize :: Double
+        (mmap, totF) = foldl' accumOne (MM.empty, 0) $ map calcOne specOrgs
+        calcOne g = let fitness = f g in (fitness, g)
+        accumOne (accM, accA) (fit, g) = (MM.insert fit g accM, accA + fit)
+        ss = case MM.findMaxWithValues mmap of
+              Nothing -> error "(runFitTest) folding fitness resulted in empty map!"
+              Just (scr, (x:_)) -> SpecScore scr x
+              _       -> error "(runFitTest) MultiMap had a key with empty list!"
+
+
+-- | Takes a new SpecScore and updates the metadata of a species
+updateSpec :: SpecScore -> Species -> Species
+updateSpec ss spec = spec { specScore = newScr
+                          , lastImprovement = li
+                          }
+  where oldScr = specScore spec
+        (newScr, li)
+          | bestScore ss > bestScore oldScr = (ss, 0)
+          | otherwise                       = (oldScr, lastImprovement spec + 1)
