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/Network/Tremulous/ByteStringUtils.hs b/Network/Tremulous/ByteStringUtils.hs
new file mode 100644
--- /dev/null
+++ b/Network/Tremulous/ByteStringUtils.hs
@@ -0,0 +1,25 @@
+module Network.Tremulous.ByteStringUtils where
+import Prelude as P
+import Control.Applicative
+import Control.DeepSeq
+import Data.ByteString.Char8 as B
+import Data.Char
+
+instance NFData ByteString 
+
+stripPrefix :: ByteString -> ByteString -> Maybe ByteString
+stripPrefix p xs
+	| p `isPrefixOf` xs	= Just $ B.drop (B.length p) xs
+	| otherwise		= Nothing	
+
+maybeInt :: ByteString -> Maybe Int
+maybeInt x = fst <$> readInt x
+
+splitlines :: ByteString -> [ByteString]
+splitlines = splitfilter '\n'
+
+stripw :: ByteString -> ByteString
+stripw = B.dropWhile isSpace
+
+splitfilter :: Char -> ByteString -> [ByteString]
+splitfilter f = P.filter (not . B.null) . split f
diff --git a/Network/Tremulous/NameInsensitive.hs b/Network/Tremulous/NameInsensitive.hs
new file mode 100644
--- /dev/null
+++ b/Network/Tremulous/NameInsensitive.hs
@@ -0,0 +1,49 @@
+module Network.Tremulous.NameInsensitive (
+	TI(..), mk, mkColor, mkAlphaNum, mkColorAlpha, unpackorig
+) where
+import Control.DeepSeq
+import Data.ByteString.Char8 as B
+import Data.Char
+import Data.Ord
+
+data TI = TI { 
+	  original :: !ByteString
+	, cleanedCase :: !ByteString
+	}
+
+-- Already strict
+instance NFData TI
+
+instance Eq TI where
+	a == b = cleanedCase a == cleanedCase b
+	
+instance Ord TI where
+	compare = comparing cleanedCase
+	
+instance Show TI where
+	show = show . original
+
+unpackorig :: TI -> String
+unpackorig = B.unpack . original
+	
+mk :: ByteString -> TI
+mk bs = TI bs (B.map toLower bs)
+
+mkColor :: ByteString -> TI
+mkColor bs = TI bs (B.map toLower $ removeColors bs)
+
+mkAlphaNum :: ByteString -> TI
+mkAlphaNum bs = TI bs (B.map toLower $ B.filter isAlphaNum bs)
+
+mkColorAlpha :: ByteString -> TI
+mkColorAlpha bs = TI bs (B.map toLower $ B.filter isPrint $ removeColors bs)
+
+removeColors :: ByteString -> ByteString
+removeColors = B.pack . rc . B.unpack
+
+rc :: String -> String
+rc ('^' : x : xs) | isAlphaNum x	= rc xs
+rc (x : xs)				= x : rc xs
+rc [] 					= []
+
+
diff --git a/Network/Tremulous/Polling.hs b/Network/Tremulous/Polling.hs
new file mode 100644
--- /dev/null
+++ b/Network/Tremulous/Polling.hs
@@ -0,0 +1,179 @@
+module Network.Tremulous.Polling (
+	pollMasters, pollOne
+) where
+import Prelude hiding (all, concat, mapM_, elem, sequence_, concatMap, catch)
+
+import Control.DeepSeq
+import Control.Monad hiding (mapM_, sequence_)
+import Control.Concurrent (forkIO, threadDelay, killThread)
+import Control.Concurrent.MVar
+import Control.Applicative
+import Control.Exception
+
+import Data.Foldable
+import Data.Set (Set)
+import qualified Data.Set as S
+import Data.Map (Map)
+import qualified Data.Map as M
+import Data.String
+import Data.ByteString.Char8 (ByteString, append, pack)
+
+import Network.Socket hiding (send, sendTo, recv, recvFrom)
+import Network.Socket.ByteString
+import Network.Tremulous.Protocol
+import Network.Tremulous.ByteStringUtils as B
+import Network.Tremulous.Scheduler
+
+data QType = QMaster !Int !Int | QGame !Int | QJustWait
+
+mtu :: Int
+mtu = 2048
+
+getStatus :: IsString s => s
+getStatus = "\xFF\xFF\xFF\xFFgetstatus"
+getServers :: Int -> ByteString
+getServers proto = "\xFF\xFF\xFF\xFFgetservers " `append` pack (show proto) `append` " empty full"
+
+pollMasters :: Delay -> [MasterServer] -> IO PollResult
+pollMasters Delay{..} masterservers = do
+	sock		<- socket AF_INET Datagram defaultProtocol
+	bindSocket sock (SockAddrInet 0 0)
+	
+	-- server addresses recieved by master
+	mstate		<- newMVar S.empty
+	-- Servers that has responded
+	tstate		<- newMVar S.empty
+	
+	-- When first packet was sent to server (removed on proper response)
+	pingstate	<- newMVar (M.empty :: Map SockAddr Integer)
+
+	let sf sched host qtype = case qtype of
+		QGame n		-> do
+			now <- getMicroTime
+			pureModifyMVar pingstate $ M.insertWith' (\_ b -> b) host now
+			sendTo sock getStatus host
+			if (n > 0) then
+				addScheduled sched (now + fromIntegral packetTimeout, host, QGame (n-1))
+			else
+				addScheduled sched (now + fromIntegral packetTimeout, host, QJustWait)
+			
+		QMaster n proto	-> do
+			now <- getMicroTime
+			sendTo sock (getServers proto) host
+			if (n > 0) then
+				addScheduled sched (now + (fromIntegral packetTimeout) `div` 2 , host, QMaster (n-1) proto)
+			else
+				addScheduled sched (now + fromIntegral packetTimeout, host, QJustWait)
+				
+
+		QJustWait -> return ()
+		
+
+	sched		<- newScheduler throughputDelay sf (Just (sClose sock))
+	addScheduledInstant sched $
+		map (\MasterServer{..} -> (masterAddress, QMaster (packetDuplication*4) masterProtocol)) masterservers
+
+	startScheduler sched
+	
+	let buildResponse = do
+		packet <- ioMaybe $ recvFrom sock mtu
+		case parsePacket (masterAddress <$> masterservers) <$> packet of
+			-- The master responded, great! Now lets send requests to the new servers
+			Just (Master host x) -> do
+				deleteScheduled sched host
+				m <- takeMVar mstate
+				let m' = S.union m x
+				putMVar' mstate m'
+				let delta = S.difference x m
+				when (S.size delta > 0) $ do
+					addScheduledInstant sched $ map (,QGame packetDuplication) (S.toList delta)
+				
+				buildResponse
+
+			Just (Tremulous host x) -> do
+				now <- getMicroTime
+				t <- takeMVar tstate
+				if S.member host t then do
+					putMVar' tstate t
+					buildResponse
+				else do
+					deleteScheduled sched host
+					ps	<- takeMVar pingstate
+					start	<- return $! M.lookup host ps
+					putMVar' pingstate $ M.delete host ps
+					putMVar' tstate $ S.insert host t
+					-- This also serves as protection against
+					-- receiving responses for requests never sent
+					case start of
+						Nothing -> buildResponse
+						Just a	-> do
+							let gameping = fromInteger (now - a) `div` 1000
+							( strict x{ gameping } : ) `liftM` buildResponse			
+			Just Invalid -> buildResponse
+			
+			Nothing -> return []
+			
+	xs	<- buildResponse
+	m	<- takeMVar mstate
+	t	<- takeMVar tstate
+	return $! PollResult xs (S.size t) (S.size m) t
+
+data Packet = Master !SockAddr !(Set SockAddr) | Tremulous !SockAddr !GameServer | Invalid
+
+parsePacket :: [SockAddr] -> (ByteString, SockAddr) -> Packet
+parsePacket masters (content, host) = case B.stripPrefix "\xFF\xFF\xFF\xFF" content of
+	Just a	| Just x <- parseServer a			-> Tremulous host x
+		| Just x <- parseMaster a, host `elem` masters	-> Master host x
+	_							-> Invalid
+	where
+	parseMaster x = S.fromList . parseMasterServer <$> stripPrefix "getserversResponse" x
+	parseServer x = parseGameServer host =<< stripPrefix "statusResponse" x
+
+
+
+pollOne :: Delay -> SockAddr -> IO (Maybe GameServer)
+pollOne Delay{..} sockaddr = do
+	s <- socket AF_INET Datagram defaultProtocol
+	catch (f s) (err s)
+	where
+	f sock = do
+		connect sock sockaddr
+		pid <- forkIO $ whileJust packetDuplication $ \n -> do
+			send sock getStatus
+			threadDelay packetTimeout
+			if n > 0 then
+				return $ Just (n-1)
+			else do
+				sClose sock
+				return Nothing
+			
+		start	<- getMicroTime
+		poll	<- ioMaybe $ recv sock mtu
+		sClose sock
+		killThread pid
+		stop	<- getMicroTime
+		let gameping = fromInteger (stop - start) `div` 1000
+		return $ (\x -> x {gameping}) <$> 
+			(parseGameServer sockaddr =<< isProper =<< poll)
+	err sock (_::IOError) = sClose sock >> return Nothing
+	isProper = stripPrefix "\xFF\xFF\xFF\xFFstatusResponse"
+
+ioMaybe :: IO a -> IO (Maybe a)
+ioMaybe f = catch (Just <$> f) (\(_ :: IOError) -> return Nothing)
+
+putMVar' :: NFData a => MVar a -> a -> IO ()
+putMVar' m a = rnf a `seq` putMVar m a
+
+pureModifyMVar :: NFData a => MVar a -> (a -> a) -> IO ()
+pureModifyMVar m f = do
+	x <- takeMVar m
+	putMVar' m (f x)
+	
+strict :: NFData a => a -> a
+strict x = x `deepseq` x
+
+whileJust :: Monad m => a -> (a -> m (Maybe a)) -> m ()
+whileJust x f  = f x >>= \c -> case c of
+	Just a	-> whileJust a f
+	Nothing	-> return ()
+
diff --git a/Network/Tremulous/Protocol.hs b/Network/Tremulous/Protocol.hs
new file mode 100644
--- /dev/null
+++ b/Network/Tremulous/Protocol.hs
@@ -0,0 +1,193 @@
+module Network.Tremulous.Protocol (
+	  module Network.Tremulous.NameInsensitive
+	, Delay(..), Team(..),  GameServer(..), Player(..), MasterServer(..), PollResult(..)
+	, defaultDelay, parseGameServer, proto2string, string2proto, parseMasterServer
+	, B.unpack
+) where
+import Prelude as P
+import Control.Applicative
+import Control.DeepSeq
+import Control.Monad.State.Strict
+
+import Data.Attoparsec.Char8 as A hiding (option)
+import Data.Attoparsec (anyWord8)
+import Data.ByteString.Char8 as B
+import Data.Maybe
+import Data.String
+import Data.Char
+import Data.Bits
+import Data.Word
+import Data.Set (Set)
+
+import Network.Socket
+import Network.Tremulous.ByteStringUtils as B
+import Network.Tremulous.SocketExtensions ()
+import Network.Tremulous.NameInsensitive
+import Network.Tremulous.TupleReader
+
+data Delay = Delay {
+	  packetTimeout
+	, packetDuplication
+	, throughputDelay	:: !Int
+	} deriving (Show, Read)
+
+data MasterServer = MasterServer {
+	   masterAddress	:: !SockAddr
+	 , masterProtocol	:: !Int
+	} deriving Eq
+	
+data GameServer = GameServer {
+	  address	:: !SockAddr
+	, gameping	:: !Int
+	, protocol	:: !Int
+	, gamemod	:: !(Maybe TI)
+	, hostname	:: !TI
+	, mapname	:: !TI
+	, slots
+	, privslots	:: !Int
+	, protected	:: !Bool
+	, timelimit
+	, suddendeath	:: !(Maybe Int)
+	, unlagged	:: !Bool
+	, nplayers	:: !Int
+	, players	:: ![Player]
+	}
+
+data Team = Spectators | Aliens | Humans | Unknown deriving (Eq, Show)
+
+data Player = Player {
+	  team	:: !Team
+	, kills
+	, ping	:: !Int
+	, name	:: !TI
+	}
+
+data PollResult = PollResult {
+	  polled		:: ![GameServer]
+	, serversResponded
+	, serversRequested	:: !Int
+	, respondedCache	:: !(Set SockAddr)
+	}
+
+
+instance NFData MasterServer where
+	rnf (MasterServer a b) = rnf a `seq` rnf b
+
+instance NFData Team
+
+instance NFData GameServer where
+	rnf (GameServer a b c d e f g h i j k l m n) = rnf a `seq` rnf b `seq` rnf c `seq` rnf d
+		`seq` rnf e `seq` rnf f `seq` rnf g `seq` rnf h `seq` rnf i `seq` rnf j 
+		`seq` rnf k `seq` rnf l `seq` rnf m `seq` rnf n
+
+instance NFData Player where
+	rnf (Player a b c d)  = rnf a `seq` rnf b `seq` rnf c `seq` rnf d
+
+defaultDelay :: Delay
+defaultDelay = Delay {
+	  packetTimeout		= 400 * 1000
+	, packetDuplication	= 2
+	, throughputDelay	= 1 * 1000
+	}
+	
+-- Protocol version
+proto2string :: IsString s => Int ->  s
+proto2string x = case x of
+	69 -> "1.1"
+	70 -> "gpp"
+	_  -> "?"
+
+string2proto :: (IsString s, Eq s) => s -> Maybe Int
+string2proto x = case x of
+	"vanilla"	-> Just 69
+	"1.1"		-> Just 69
+	"gpp"		-> Just 70
+	"1.2"		-> Just 70
+	_		-> Nothing
+
+parsePlayer :: Team -> ByteString -> Maybe Player
+parsePlayer team = parseMaybe $ do
+	kills <- signed decimal
+	skipSpace
+	ping <- signed decimal
+	skipSpace
+	name <- mkColor <$> quoted
+	return Player {..}
+	
+-- cvar P
+parseP :: ByteString -> [Team]
+parseP = foldr' f [] 
+	where
+	f '-' xs = xs
+	f  a  xs = readTeam a : xs
+	
+	readTeam x = case x of
+		'0'	-> Spectators
+		'1'	-> Aliens
+		'2'	-> Humans
+		_	-> Unknown
+
+parsePlayers :: ByteString -> [ByteString] -> Maybe [Player]
+parsePlayers p = zipWithM parsePlayer (parseP p ++ repeat Unknown)
+
+parseCVars :: ByteString -> [(ByteString, ByteString)]
+parseCVars xs = f (splitfilter '\\' xs) where 
+	f (k:v:cs)	= (k, v) : f cs
+	f _		= []
+
+parseGameServer :: SockAddr -> ByteString -> Maybe GameServer
+parseGameServer address xs = case splitlines xs of
+	(cvars:players)	-> mkGameServer address players (parseCVars cvars)
+	_		-> Nothing
+
+mkGameServer :: SockAddr -> [ByteString] -> [(ByteString, ByteString)] -> Maybe GameServer
+mkGameServer address rawplayers = tupleReader $ do
+	timelimit	<- option Nothing maybeInt "timelimit"
+	hostname	<- mkColorAlpha <$> require "sv_hostname"
+	protocol	<- requireWith maybeInt "protocol"
+	mapname		<- option (TI "" "") (mk . clean) "mapname"
+	gamemod		<- option Nothing mkMod "gamename"
+	p		<- option "" id "P"
+	players		<- lift $ parsePlayers p rawplayers
+	protected	<- option False (/="0") "g_needpass"
+	privslots	<- option 0 (fromMaybe 0 . maybeInt) "sv_privateClients"
+	slots		<- requireWith maybeInt "sv_maxclients"
+	suddendeath	<- option Nothing maybeInt "g_suddenDeathTime"
+	unlagged	<- option False (/="0") "g_unlagged"
+	
+	return GameServer { gameping = -1, nplayers = P.length players, .. }
+	where
+	mkMod "base"	= Nothing
+	mkMod a		= Just (mk a)
+	clean = stripw . B.filter isPrint
+
+
+parseMasterServer :: ByteString -> [SockAddr]	
+parseMasterServer = fromMaybe [] . parseMaybe attoIP
+	where
+	attoIP = A.many (char '\\' *> addr)
+	(.<<.) :: Bits a => a -> Int -> a
+	(.<<.) = shiftL		
+	wg :: Integral i => Parser i
+	wg = fromIntegral <$> anyWord8	
+	addr = do
+		-- try $ string "EOT\0\0\0" *> endOfInput
+		i0 <- wg
+		i1 <- wg
+		i2 <- wg
+		i3 <- wg
+		p0 <- wg
+		p1 <- wg
+		let ip = (i3 .<<. 24) .|. (i2 .<<. 16) .|. (i1 .<<. 8) .|. i0 :: Word32
+		let port = (p0 .<<. 8) .|. p1 :: Word16
+		return $ SockAddrInet (fromIntegral port) ip
+
+-- /// Attoparsec utils ////////////////////////////////////////////////////////////////////////////
+
+quoted :: Parser ByteString
+quoted = char '"' *> takeTill (=='"') <* char '"'
+
+parseMaybe :: Parser a -> ByteString -> Maybe a
+parseMaybe f xs = case parseOnly f xs of
+	Right a	-> Just a
+	Left _	-> Nothing
diff --git a/Network/Tremulous/Scheduler.hs b/Network/Tremulous/Scheduler.hs
new file mode 100644
--- /dev/null
+++ b/Network/Tremulous/Scheduler.hs
@@ -0,0 +1,121 @@
+module Network.Tremulous.Scheduler(
+	  Event, Scheduler
+	, newScheduler, startScheduler, addScheduled, addScheduledBatch
+	, addScheduledInstant, deleteScheduled, getMicroTime
+) where
+import Prelude hiding (drop)
+import Control.Monad
+import Control.Applicative hiding (empty)
+import Control.Concurrent
+import Control.Exception
+import Data.Typeable
+import Data.Sequence
+import Data.Foldable
+import System.Time
+
+
+data Interrupt = Interrupt
+	deriving (Typeable, Show)
+	
+instance Exception Interrupt
+
+data (Eq id, Ord id) => Scheduler id a = Scheduler
+	{ sync		:: !(MVar ())
+	, started	:: !(MVar ())
+	, queue		:: !(MVar (Seq (Integer, id, a)))
+	}
+
+type Event id a = (Integer, id, a)
+
+-- ugly ugly ugly!
+threadBlock :: IO ()
+threadBlock = forever $ threadDelay maxBound
+
+pureModifyMVar ::MVar a -> (a -> a) -> IO ()
+pureModifyMVar m f = do
+	x <- takeMVar m
+	putMVar m (f x)
+
+newScheduler :: (Eq a, Ord a) => Int -> (Scheduler a b -> a -> b -> IO ()) -> Maybe (IO ()) -> IO (Scheduler a b)
+newScheduler throughput func finalizer = do 
+	queue		<- newMVar empty
+	sync		<- newEmptyMVar
+	started		<- newEmptyMVar
+	let sched	=  Scheduler{..}
+	uninterruptibleMask $ \a -> forkIO $ runner sched a
+	return sched
+	
+	where
+	runner sched@Scheduler{..} restore = do
+		takeMVar started
+		tid		<- myThreadId
+		syncid		<- forkIOUnmasked $ forever $ takeMVar sync >> throwTo tid Interrupt
+		let loop = do
+			q <- readMVar queue
+			case viewl q of
+				EmptyL -> case finalizer of
+					Nothing -> do
+						ignoreException $ restore threadBlock
+						loop
+					Just a -> do
+						killThread syncid
+						a
+
+				(time, idn, storage) :< _ -> do
+					now <- getMicroTime
+					let wait = fromInteger (time - now)
+					waited <- ((time == -1 || wait <= 0) ||) `liftM`
+						falseOnException (restore (threadDelay wait))
+					when waited $ do
+						pureModifyMVar queue $ deleteID idn
+						func sched idn storage
+						when (throughput > 0)
+							(threadDelay throughput)
+					loop
+		loop
+
+signal :: MVar () -> IO ()
+signal a = tryPutMVar a () >> return ()
+
+startScheduler :: (Ord id, Eq id, Show id) => Scheduler id a -> IO ()
+startScheduler Scheduler{..} = putMVar started ()
+
+addScheduled :: (Ord id, Eq id, Show id) => Scheduler id a -> Event id a -> IO ()
+addScheduled Scheduler{..} event = do
+	pureModifyMVar queue $ insertTimed event
+	signal sync
+	
+addScheduledBatch :: (Ord id, Eq id, Foldable f) => Scheduler id a -> f (Event id a) -> IO ()
+addScheduledBatch Scheduler{..} events = do
+	pureModifyMVar queue $ \q -> foldl' (flip insertTimed) q events
+	signal sync
+
+addScheduledInstant :: (Ord id, Eq id, Foldable f) => Scheduler id a -> f (id, a) -> IO ()
+addScheduledInstant Scheduler{..} events = do
+	pureModifyMVar queue $ \q -> foldl' (\acc (a, b) -> (-1, a, b) <| acc) q events
+	signal sync
+
+deleteScheduled :: (Ord id, Eq id) => Scheduler id a -> id -> IO ()
+deleteScheduled Scheduler{..} ident = do
+	pureModifyMVar queue $ deleteID ident
+	signal sync
+
+getMicroTime :: IO Integer
+getMicroTime = let f (TOD s p) = s*1000000 + p `div` 1000000 in f <$> getClockTime
+
+ignoreException :: IO () -> IO ()
+ignoreException = handle (\Interrupt -> return ())
+
+falseOnException :: IO a -> IO Bool
+falseOnException f = handle (\Interrupt -> return False) (f >> return True)
+
+
+insertTimed :: (Ord id, Eq id) => Event id a -> Seq (Event id a) -> Seq (Event id a)
+insertTimed x@(a,_,_) q = (s1 |> x) >< s2 where
+	(s1, s2) = spanl (\(b,_,_) -> a >= b) q
+
+
+deleteID :: (Ord id, Eq id) => id -> Seq (Event id a) -> Seq (Event id a)
+deleteID ident q = s1 >< s2' where
+	(s1, s2) = spanl (\(_,a,_) -> a /= ident) q
+	s2' = drop 1 s2 
diff --git a/Network/Tremulous/SocketExtensions.hs b/Network/Tremulous/SocketExtensions.hs
new file mode 100644
--- /dev/null
+++ b/Network/Tremulous/SocketExtensions.hs
@@ -0,0 +1,15 @@
+{-# LANGUAGE CPP, StandaloneDeriving #-}
+module Network.Tremulous.SocketExtensions where
+import Control.DeepSeq
+import Network.Socket
+
+deriving instance Ord SockAddr
+
+instance NFData SockAddr where
+	rnf (SockAddrInet (PortNum p) h) 	= rnf p `seq` rnf h
+	rnf (SockAddrInet6 (PortNum p) f h s)	= rnf p `seq` rnf f `seq` rnf h `seq` rnf s
+#ifdef linux_HOST_OS
+	rnf (SockAddrUnix s)			= rnf s
+#endif
+	
+
diff --git a/Network/Tremulous/TupleReader.hs b/Network/Tremulous/TupleReader.hs
new file mode 100644
--- /dev/null
+++ b/Network/Tremulous/TupleReader.hs
@@ -0,0 +1,31 @@
+module Network.Tremulous.TupleReader (
+	TupleReader, tupleReader, require, requireWith, option
+) where
+import Control.Monad.State.Strict
+
+type TupleReader k v a = StateT [(k, v)] Maybe a
+
+tupleReader :: TupleReader k v a -> [(k, v)] -> Maybe a
+tupleReader = evalStateT
+
+lookupDelete :: (Eq k) => k -> [(k, v)] -> (Maybe v, [(k, v)])
+lookupDelete key = roll where
+	roll []			= (Nothing, [])
+	roll (x@(a, b):xs)
+		| key == a	= (Just b, xs)
+		| otherwise	= let (may, xs') = roll xs in (may, x:xs')
+
+require :: Eq k => k -> TupleReader k v v
+require key = get >>= \s -> case lookupDelete key s of
+	(Nothing, _)	-> lift Nothing
+	(Just a, s')	-> put s' >> return a
+
+requireWith :: Eq k => (v -> Maybe a) -> k -> TupleReader k v a
+requireWith f key = get >>= \s -> case lookupDelete key s of
+	(Nothing, _)	-> lift Nothing
+	(Just a, s')	-> put s' >> lift (f a)
+
+option :: Eq k => a -> (v -> a) -> k -> TupleReader k v a
+option def f key = get >>= \s -> case lookupDelete key s of
+	(Nothing, _)	-> return def
+	(Just a, s')	-> put s' >> return (f a)
diff --git a/Network/Tremulous/Util.hs b/Network/Tremulous/Util.hs
new file mode 100644
--- /dev/null
+++ b/Network/Tremulous/Util.hs
@@ -0,0 +1,52 @@
+module Network.Tremulous.Util (
+	serverByAddress
+	, search
+	, makePlayerList
+	, makePlayerNameList
+	, stats
+	, partitionTeams
+	, removeColors
+) where
+import Data.List hiding (foldl')
+import Data.Foldable (foldl')
+import Data.Char
+import qualified Data.ByteString.Char8 as B
+
+import Network.Socket
+import Network.Tremulous.Protocol as T
+
+
+serverByAddress :: SockAddr -> [GameServer] -> Maybe GameServer
+serverByAddress add =  find (\x -> add == address x)
+
+search :: String -> [GameServer] -> [(TI, GameServer)]
+search ""	= makePlayerNameList 
+search rawstr	= filter (\(a,_) -> str `B.isInfixOf` cleanedCase a ) . makePlayerNameList 
+	where
+	str	= B.pack $ map toLower rawstr
+	
+makePlayerNameList :: [GameServer] -> [(TI, GameServer)]
+makePlayerNameList = concatMap $ \x -> map (\a -> (name a, x)) (players x)
+
+makePlayerList :: [GameServer] -> [(Player, GameServer)]
+makePlayerList = concatMap $ \x -> map (\a -> (a, x)) (players x)
+
+stats :: [GameServer] -> (Int, Int, Int)
+stats polled = (tot, players, bots) where
+	tot		= length polled
+	(players, bots) = foldl' trv (0, 0) (playerList polled)
+	trv (!p, !b) x	= if ping x == 0 then (p, b+1) else (p+1, b)
+	playerList	= foldr ((++) . T.players) []
+
+partitionTeams :: [Player] -> ([Player], [Player], [Player], [Player])
+partitionTeams = foldr f ([], [], [], []) where
+	f x ~(s, a, h, u) = case team x of
+		Spectators	-> (x:s, a, h, u)
+		Aliens		-> (s, x:a, h, u)
+		Humans		-> (s, a, x:h, u)
+		Unknown		-> (s, a, h, x:u)
+
+removeColors :: String -> String
+removeColors ('^' : x : xs) | isAlphaNum x	= removeColors xs
+removeColors (x : xs)				= x : removeColors xs
+removeColors [] 				= []
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/tremulous-query.cabal b/tremulous-query.cabal
new file mode 100644
--- /dev/null
+++ b/tremulous-query.cabal
@@ -0,0 +1,38 @@
+Name:			tremulous-query
+Version:		1.0
+Author:			Christoffer Öjeling
+Maintainer:		Christoffer Öjeling <christoffer@ojeling.net>
+License:		GPL-3
+License-File:		LICENSE
+Category:		Network
+Synopsis:		Library for polling Tremulous servers
+Description:		A library for polling servers from the game Tremulous.
+                        Supports both the released 1.1 version and the 1.2 Gameplay Preview commonly known as GPP.
+
+Cabal-Version:		>= 1.10
+Build-Type:		Simple
+Tested-With:            GHC==7.0.3
+
+Source-Repository head
+  Type:                 git
+  Location:             git://github.com/Cadynum/tremulous-query.git
+
+Library
+  Default-Language:     Haskell2010
+  Default-Extensions:   BangPatterns TupleSections NamedFieldPuns RecordWildCards
+                        ScopedTypeVariables OverloadedStrings DeriveDataTypeable
+  Other-Extensions:     CPP StandaloneDeriving
+  Exposed-Modules:      Network.Tremulous.Protocol
+                        Network.Tremulous.Polling
+                        Network.Tremulous.Util
+                        Network.Tremulous.NameInsensitive
+                        Network.Tremulous.SocketExtensions
+                        Network.Tremulous.ByteStringUtils
+                        Network.Tremulous.Scheduler
+  Other-Modules:        Network.Tremulous.TupleReader
+
+  Build-Depends:        base>=4.3 && < 5, old-time, network, deepseq, containers, bytestring, attoparsec, mtl
+  Ghc-Options:          -Wall -fno-warn-unused-do-bind -fno-warn-orphans -funbox-strict-fields
+
+
+