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/Setup.lhs b/Setup.lhs
new file mode 100644
--- /dev/null
+++ b/Setup.lhs
@@ -0,0 +1,3 @@
+#! /usr/bin/env runhaskell
+> import Distribution.Simple
+> main = defaultMain
diff --git a/barrie.cabal b/barrie.cabal
new file mode 100644
--- /dev/null
+++ b/barrie.cabal
@@ -0,0 +1,38 @@
+Name:                   barrie
+Version:                0.3.1
+Synopsis:               Pure Gtk GUI library
+Description:
+    Implementation of an idea for supporting certain kinds of GUI:
+    that is state based, user-driven ones.  The GUI is intended to
+    manipulate a state, and it is responsive rather than active.
+    Configuration is an example.
+
+Category:               GUI
+License:                GPL
+License-file:           LICENSE
+Author:                 Fraser Wilson
+Maintainer:             blancolioni@gmail.com
+Copyright:              (c) Fraser Wilson
+Stability:              unstable
+cabal-version: >= 0.2
+build-type: Simple
+
+Library
+   Build-Depends:       base,filepath,gtk>=0.10.0,glib>=0.10.0,containers
+   Exposed-modules:     Barrie
+   ghc-options:         -Wall -optl-Wl,s
+   ghc-prof-options:    -prof -auto-all
+   other-modules:
+        Barrie.AbstractGadgets
+        Barrie.Config
+        Barrie.DrawPrimitive
+        Barrie.Gadgets
+        Barrie.Render
+        Barrie.Render.Gtk
+        Barrie.Style
+        Barrie.Trace
+        Barrie.Widgets
+  extensions:           MultiParamTypeClasses,FunctionalDependencies,
+                        GeneralizedNewtypeDeriving,RankNTypes,ExistentialQuantification
+ --                       ExistentialQualification
+  hs-source-dirs:       src
diff --git a/src/Barrie.lhs b/src/Barrie.lhs
new file mode 100644
--- /dev/null
+++ b/src/Barrie.lhs
@@ -0,0 +1,21 @@
+> module Barrie (
+>                module Barrie.AbstractGadgets,
+>                module Barrie.DrawPrimitive,
+>                module Barrie.Gadgets,
+>                module Barrie.Render,
+>                module Barrie.Render.Gtk,
+>                module Barrie.Style,
+>                module Barrie.Trace,
+>                module Barrie.Widgets
+>               )
+
+> where
+
+> import Barrie.AbstractGadgets
+> import Barrie.DrawPrimitive
+> import Barrie.Gadgets
+> import Barrie.Render
+> import Barrie.Render.Gtk
+> import Barrie.Style
+> import Barrie.Trace
+> import Barrie.Widgets
diff --git a/src/Barrie/AbstractGadgets.lhs b/src/Barrie/AbstractGadgets.lhs
new file mode 100644
--- /dev/null
+++ b/src/Barrie/AbstractGadgets.lhs
@@ -0,0 +1,24 @@
+> module Barrie.AbstractGadgets (AbstractGadget,
+>                                acommand, achoice, atext, alabel,
+>                                ainner, alocal)
+> where
+
+> data AbstractGadget = AG AGadget [String]
+>         deriving (Read, Show)
+
+> data AGadget = ACommand
+>              | AChoice
+>              | AText
+>              | ALabel
+>              | AInner
+>              | ALocal
+>         deriving (Read, Show)
+
+> acommand, achoice, atext, alabel,
+>             ainner, alocal :: [String] -> AbstractGadget
+> acommand   = AG ACommand
+> achoice    = AG AChoice
+> atext      = AG AText
+> alabel     = AG ALabel
+> ainner     = AG AInner
+> alocal     = AG ALocal
diff --git a/src/Barrie/Config.lhs b/src/Barrie/Config.lhs
new file mode 100644
--- /dev/null
+++ b/src/Barrie/Config.lhs
@@ -0,0 +1,39 @@
+> {-# OPTIONS_GHC -XMultiParamTypeClasses -XFunctionalDependencies #-}
+
+> module Barrie.Config where
+
+> data Config a = Cfg {
+>            cEnabled :: a -> Bool,
+>            cLabel   :: Maybe (a -> String)
+>            }
+
+> defaultConfig :: Config a
+> defaultConfig = Cfg { cEnabled = const True, cLabel = Nothing }
+
+> transformConfig :: (a -> b) -> Config b -> Config a
+> transformConfig get cfg = cfg { cEnabled = cEnabled cfg . get,
+>                                 cLabel = label'
+>                               }
+>     where label' = case cLabel cfg of
+>                      Nothing -> Nothing
+>                      Just f  -> Just $ f . get
+
+
+> enabledCfg :: (a -> Bool) -> Config a -> Config a
+> enabledCfg f config = config { cEnabled = f }
+
+> isEnabled :: Config a -> a -> Bool
+> isEnabled config state = cEnabled config state
+
+> labelConfig :: (a -> String) -> Config a -> Config a
+> labelConfig f config = config { cLabel = Just f }
+
+> configHasLabel :: Config a -> Bool
+> configHasLabel Cfg { cLabel = Nothing } = False
+> configHasLabel _ = True
+
+> configLabel :: Config a -> a -> String
+> configLabel Cfg { cLabel = Just f } st = f st
+> configLabel _ _ =
+>     error "tried to get a label from a config which has none"
+
diff --git a/src/Barrie/DrawPrimitive.lhs b/src/Barrie/DrawPrimitive.lhs
new file mode 100644
--- /dev/null
+++ b/src/Barrie/DrawPrimitive.lhs
@@ -0,0 +1,131 @@
+> module Barrie.DrawPrimitive
+>     (DrawFunction, Picture, Colour,
+>      background,
+>      setForeground,
+>      lineTo, moveTo, line, lineWidth, move, rectangle, polygon,
+>      multiLine, circle,
+>      image, showText,
+>      black, white, fromRGB,
+>      doDraw)
+>     where
+
+> import qualified Graphics.UI.Gtk as Gtk
+
+> type Picture = Gtk.Pixmap
+
+> data Colour = RGB Int Int Int deriving (Eq)
+
+> black, white :: Colour
+> black = fromRGB 0 0 0
+> white = fromRGB 65535 65535 65535
+
+> data DrawPrimitive = Background Colour
+>                    | SetForeground Colour
+>                    | SetLineThickness Int
+>                    | Line Int Int
+>                    | LineTo Int Int
+>                    | LineWidth Int
+>                    | Move Int Int
+>                    | MoveTo Int Int
+>                    | Polygon Bool [(Int, Int)]
+>                    | Circle Bool Int
+>                    | Rectangle Bool Int Int
+>                    | ShowText String
+>                    | Image String
+>                      deriving (Eq)
+
+> type DrawFunction = [DrawPrimitive] -> [DrawPrimitive]
+
+> background :: Colour -> DrawFunction
+> lineTo, moveTo, line, move :: Int -> Int -> DrawFunction
+> lineWidth :: Int -> DrawFunction
+> rectangle :: Bool -> Int -> Int -> DrawFunction
+> polygon :: Bool -> [(Int, Int)] -> DrawFunction
+> circle :: Bool -> Int -> DrawFunction
+> showText :: String -> DrawFunction
+> image :: String -> DrawFunction
+> multiLine :: [(Int,Int)] -> DrawFunction
+> setForeground :: Colour -> DrawFunction
+
+> background colour xs = Background colour : xs
+> lineTo x y xs = LineTo x y : xs
+> moveTo x y xs = MoveTo x y : xs
+> line x y xs = Line x y : xs
+> lineWidth w xs = LineWidth w : xs
+> move x y xs = Move x y : xs
+> rectangle filled width height xs = Rectangle filled width height : xs
+> polygon filled pts xs = Polygon filled pts : xs
+> circle filled r xs = Circle filled r : xs
+> showText text xs = ShowText text : xs
+> image pic = (:) (Image pic)
+
+> multiLine [] = id
+> multiLine ((x, y):pts) = moveTo x y . foldl (.) id (map (uncurry lineTo) pts)
+
+> setForeground col xs = SetForeground col : xs
+
+> fromRGB :: Int -> Int -> Int -> Colour
+> fromRGB = RGB
+
+> toGtkColour :: Colour -> IO Gtk.Color
+> toGtkColour (RGB r g b) = return $ Gtk.Color (cvt r) (cvt g) (cvt b)
+>                                      where cvt = fromInteger . toInteger
+
+> doDraw :: Gtk.Pixmap
+>        -> Gtk.GC
+>        -> Gtk.PangoContext
+>        -> (Int,Int)
+>        -> [DrawPrimitive]
+>        -> IO ()
+> doDraw _ _ _ _ [] = return ()
+> doDraw win gc context (x,y) (p:ps) = do (newP,newGC) <- drawPrimitive p
+>                                         doDraw win newGC context newP ps
+>     where noChange = return ((x,y),gc)
+>           drawPrimitive (MoveTo x' y') = return ((x', y'), gc)
+>           drawPrimitive (Move dx dy)   = return ((x + dx, y + dy), gc)
+>           drawPrimitive (LineTo x' y') = do
+>             Gtk.drawLine win gc (x,y) (x',y')
+>             return ((x',y'), gc)
+>           drawPrimitive (Line dx dy) = do
+>             let (x',y') = (x + dx, y + dy)
+>             Gtk.drawLine win gc (x,y) (x', y')
+>             return ((x',y'), gc)
+>           drawPrimitive (LineWidth w) = do
+>             Gtk.gcSetValues gc Gtk.newGCValues { Gtk.lineWidth = w }
+>             return ((x,y), gc)
+>           drawPrimitive (Rectangle filled width height) = do
+>             Gtk.drawRectangle win gc filled x y width height
+>             noChange
+>           drawPrimitive (Polygon _ []) = noChange
+>           drawPrimitive (Polygon filled pts) = do
+>             Gtk.drawPolygon win gc filled pts
+>             return (last pts, gc)
+>           drawPrimitive (Circle filled r) = do
+>             Gtk.drawArc win gc filled (x - r) (y - r)
+>                    (r * 2) (r * 2) 0 (360 * 64)
+>             return ((x,y),gc)
+>           drawPrimitive (ShowText text) = do
+>             layout <- Gtk.layoutText context text
+>             layoutLine <- Gtk.layoutGetLine layout 0
+>             Gtk.drawLayoutLine win gc x y layoutLine
+>             return ((x,y),gc)
+>           drawPrimitive (SetForeground colour) = do
+>             col <- toGtkColour colour
+>             Gtk.gcSetValues gc $ Gtk.newGCValues {
+>               Gtk.foreground = col
+>               }
+>             return ((x,y),gc)
+>           drawPrimitive (Background colour) = do
+>             backgc <- Gtk.gcNew win
+>             gtkColour <- toGtkColour colour
+>             Gtk.gcSetValues backgc Gtk.newGCValues {
+>               Gtk.foreground = gtkColour
+>             }
+>             (width, height) <- Gtk.drawableGetSize win
+>             Gtk.drawRectangle win backgc True 0 0 width height
+>             Gtk.drawRectangle win backgc False 0 0 width height
+>             return ((x,y),gc)
+>           drawPrimitive (Image pic) = do
+>             pb <- Gtk.pixbufNewFromFile pic
+>             Gtk.drawPixbuf win gc pb 0 0 x y (-1) (-1) Gtk.RgbDitherNormal 0 0
+>             return ((x,y),gc)
diff --git a/src/Barrie/Gadgets.lhs b/src/Barrie/Gadgets.lhs
new file mode 100644
--- /dev/null
+++ b/src/Barrie/Gadgets.lhs
@@ -0,0 +1,383 @@
+> module Barrie.Gadgets (Gadget, Behaviour,
+>                        findGadget, gadgets, abstract, gadgetName,
+>                        commandG,
+>                        displayG, displayG', textDisplayG,
+>                        editorG, editorG', textEditorG,
+>                        chooserG, chooserG', textChooserG, enumChooserG,
+>                        localG, innerG,
+>                        enabled, gadgetEnabled, dynamicLabel,
+>                        gadgetConfig,
+>                        connectChooserDisplay,
+>                        connectDisplayGadget,
+>                        connectEditorGadget,
+>                        connectCommandGadget,
+>                        connectInnerGadget
+>                       ) where
+
+> import Data.List
+> import Control.Monad
+
+> import Barrie.AbstractGadgets
+> import Barrie.Config
+> import Barrie.Trace
+
+> data Behaviour a = B [Gadget a]
+
+> -- |A gadget is a piece of user interface functionality (as opposed
+> -- to a widget, which is a piece of user interface rendering).
+
+> data Gadget a = G { gFullName :: [String],
+>                     gConfig   :: Config a,
+>                     gElement  :: Element a
+>                   }
+
+> -- |The semantics of a gadget are defined by its Element.
+> -- Internally, all element manipulation is perform via conversions
+> -- to and from String, which is a shame, but there it is.
+> -- It is not beyond the bounds of possibility that existential types
+> -- are a solution to this problem, but for now, this is where we
+> -- are.  The exported constructor functions hide this wart, to some
+> -- extent (e.g. you can use showG for an instance of Show, or
+> -- showG' to supply your own show function).
+
+> -- |An element comes in five flavours:
+
+> -- |Display: presents a value to the user.  For example: labels,
+> -- |read-only text boxes, check boxes, radio buttons -- anything
+> -- |with a simple display.
+
+> -- |Editor: a display that can edit, such as a text box, a check
+> -- |box, or a slider.
+
+> -- |Command: a gadget that updates the state, sort of like a
+> -- |write-only Editor for type (), where the only thing you know is
+> -- |that it's been activated (so the () argument can be dropped).
+> -- |Can be rendered with buttons, menu items, that sort of thing.
+
+> -- |Chooser: like displays and editors, but the values come from a
+> -- |restricted set of possiblities.  The value is a Maybe String,
+> -- |because it's possible (and often reasonable) to not choose
+> -- |anything.
+
+> -- |Inner: a single gadget placed inside another one.  Used to
+> -- |construct nested and pop-up gadgets.
+
+> -- |Local: gadgets nested inside another one.  Sort of a superclass
+> -- |of Inner, but it's not possible to make a pop-up out of them.
+> -- |Used to structure gadgets (functionally, not in terms of
+> -- |layout).
+
+> -- |Constructor functions are used to create gadgets, which is how
+> -- |we pretend we're not dealing with Strings only.  In general, for
+> -- |a gadget flavour F with signature SF a b, we have:
+
+> -- | fG :: (Show b, Read b) => String -> SF a b -> Gadget a
+> -- | textFG :: String -> SF a String -> Gadget a
+> -- | fG' :: (b -> String) -> (String -> b) -> SF a b -> Gadget a
+
+> -- |fG uses the built-in Read and Show to perform the conversions
+> -- |fStrG uses id for read and show
+> -- |fG' allows them to be specified.
+
+> -- |Display gadgets don't need the Read instance (or the
+> -- |corresponding function), and Command gadgets don't need either
+> -- |instance (so we have commandG but not commandG')
+
+> data Element a = Display (a -> String)
+>                | Editor  (a -> String) (String -> a -> a)
+>                | Command (a -> a)
+>                | Chooser (a -> Maybe String)
+>                          (String -> a -> a) (a -> [String])
+>                | Inner (Gadget a)
+>                | Local [Gadget a]
+
+
+> --  data InnerElement a = forall b. InnerE (a -> b) (b -> a -> a) (Gadget b)
+
+> -- |Returns the name of the gadget.  Internally (and
+> -- slightly externally), the name of a gadget is a list of Strings
+> -- containing the full path from the top to the gadget.  This is
+> -- converted to a '.'-separated String.
+
+> gadgetName :: Gadget a -> String
+> gadgetName = intercalate ['.'] . gFullName
+
+> -- |Create a command gadget
+
+> commandG :: String -> (a -> a) -> Gadget a
+> commandG name f = G [name] defaultConfig (Command f)
+
+> -- |Create a display gadget
+
+> displayG :: (Show b) => String -> (a -> b) -> Gadget a
+> displayG = displayG' show
+
+> textDisplayG :: String -> (a -> String) -> Gadget a
+> textDisplayG = displayG' id
+
+> displayG' :: (b -> String) -> String -> (a -> b) -> Gadget a
+> displayG' toString name get = G [name] defaultConfig
+>                                  (Display (toString . get))
+
+> -- |editorG allows a gadget to show and edit part of the state.
+
+> editorG' :: (b -> String)   -- ^ toString: convert to string
+>          -> (String -> b)   -- ^ fromString: convert from String
+>          -> String          -- ^ gadget name
+>          -> (a -> b)        -- ^ get value from state
+>          -> (b -> a -> a)   -- ^ update state
+>          -> Gadget a
+
+> editorG' toString fromString name get set =
+>     G [name] defaultConfig (Editor (toString . get) (set . fromString))
+
+> editorG :: (Show b, Read b) =>
+>            String          -- ^ gadget name
+>         -> (a -> b)        -- ^ get value from state
+>         -> (b -> a -> a)   -- ^ update state
+>         -> Gadget a
+
+> editorG = editorG' show read
+
+> textEditorG :: String               -- ^ gadget name
+>             -> (a -> String)        -- ^ get value from state
+>             -> (String -> a -> a)   -- ^ update state
+>             -> Gadget a
+
+> textEditorG = editorG' id id
+
+>
+> -- |localG does not perform any state transformation directly, but
+> -- can be used to structure a gadget tree.
+
+> localG :: String -> [Gadget a] -> Gadget a
+> localG name gs = G [name] defaultConfig (Local gs)
+
+
+> -- |chooserG
+
+> chooserG' :: (b -> String)        -- ^ toString: convert to string
+>           -> (String -> b)        -- ^ fromString: convert from String
+>           -> String               -- ^ the name of the chooser gadget
+>           -> (a -> Maybe b)       -- ^ current selected value
+>           -> (b -> a -> a)        -- ^ update the state with a new value
+>           -> (a -> [b])           -- ^ list of available choices
+>           -> Gadget a
+> chooserG' toString fromString name get set elems =
+>     G [name] defaultConfig
+>              (Chooser (liftM toString . get) (set . fromString)
+>                       (map toString . elems))
+
+> chooserG  :: (Read b, Show b) =>
+>              String               -- ^ the name of the chooser gadget
+>           -> (a -> Maybe b)       -- ^ current selected value
+>           -> (b -> a -> a)        -- ^ update the state with a new value
+>           -> (a -> [b])           -- ^ list of available choices
+>           -> Gadget a
+
+> chooserG = chooserG' show read
+
+
+> textChooserG :: String               -- ^ the name of the chooser gadget
+>              -> (a -> Maybe String)  -- ^ current selected value
+>              -> (String -> a -> a)   -- ^ update the state with a new value
+>              -> (a -> [String])      -- ^ list of available choices
+>              -> Gadget a
+
+> textChooserG = chooserG' id id
+
+> -- A convenient way to create a choice from a bounded enum.
+
+> enumChooserG :: (Enum b, Read b, Show b) =>
+>                 String
+>              -> (a -> Maybe b)
+>              -> (b -> a -> a)
+>              -> Gadget a
+> enumChooserG name get set = chooserG' show read name get set
+>                                       (const [toEnum 0 ..])
+
+> innerG :: String -> (a -> b) -> (b -> a -> a) -> Gadget b -> Gadget a
+> innerG name get set gadget = G [name] defaultConfig (Inner launch)
+>     where launch = transform get set gadget
+
+> transform :: (a -> b) -> (b -> a -> a) -> Gadget b -> Gadget a
+> transform get set (G name config elmt) =
+>     G name (transformConfig get config) (transformE get set elmt)
+
+> transformE :: (a -> b) -> (b -> a -> a) -> Element b -> Element a
+> transformE get set = xform
+>    where xform (Display getb) = Display (getb . get)
+>          xform (Editor getb setb) = Editor (getb . get) (xfset setb)
+>          xform (Command update) =
+>                       Command (\ st -> set (update (get st)) st)
+>          xform (Chooser getb setb getvs) =
+>                       Chooser (getb . get) (xfset setb)
+>                               (getvs . get)
+>          xform (Inner g)  = Inner (transform get set g)
+>          xform (Local gs) = Local (map (transform get set) gs)
+>          xfset setb = (\ v st -> set (setb v (get st)) st)
+
+
+> -- |Gadgets can change their properties based on the value of their state.
+> -- Currently, the following configurations are implemented:
+
+> -- dynamicLabel: for write-only gadgets like Command, this can add
+> -- some state read functionality.  It is interpreted by the
+> -- renderer.
+
+> -- enabled: a function on the state returning Bool.  If False, the
+> -- gadget is disabled in some widget- or renderer-specific way
+> -- (e.g. dimmed, hidden).
+
+> addConfig :: (Config a -> Config a) -> Gadget a -> Gadget a
+> addConfig f g = g { gConfig = f (gConfig g) }
+
+> enabled :: (a -> Bool) -> Gadget a -> Gadget a
+> enabled f = addConfig (enabledCfg f)
+
+> dynamicLabel :: (a -> String) -> Gadget a -> Gadget a
+> dynamicLabel f = addConfig (labelConfig f)
+
+> gadgetConfig :: Gadget a -> (Config a -> b) -> b
+> gadgetConfig gadget config = config $ gConfig gadget
+
+> gadgetEnabled :: Gadget a -> a -> Bool
+> gadgetEnabled g = gadgetConfig g isEnabled
+
+> findGadget :: [String] -> Behaviour a -> Maybe (Gadget a)
+> findGadget name (B gs) =
+>     case filter (match name) gs of
+>              []  -> Nothing
+>              g:_ -> Just g
+>     where match name1 (G name2 _ _) =
+>                       not (null name1) &&
+>                       isPrefixOf (reverse name1) (reverse name2)
+
+> type Fetch a = a -> String
+> type Update a = String -> a -> a
+
+> gadgetEditor :: Gadget a -> (Fetch a, Update a)
+> gadgetEditor (G _ _ (Editor get set)) = (get, set)
+> gadgetEditor (G _ _ (Chooser get set _ )) = (maybe "" id . get, set)
+> gadgetEditor g = error $ "Can't connect an editor to gadget '" ++
+>                          gadgetName g ++ "'"
+
+> gadgetChooser :: Gadget a -> (a -> [String], Fetch a)
+> gadgetChooser (G _ _ (Chooser get _ elems)) = (elems, maybe "" id . get)
+> gadgetChooser g = error $ "Can't connect a chooser to gadget '" ++
+>                          gadgetName g ++ "'"
+
+> gadgetDisplay :: Gadget a -> Fetch a
+> gadgetDisplay (G _ _ (Display get)) = get
+> gadgetDisplay (G _ _ (Editor get _)) = get
+> gadgetDisplay (G _ _ (Chooser get _ _)) = (maybe "" id . get)
+> gadgetDisplay g = error $ "Can't connect a display to gadget '" ++
+>                          gadgetName g ++ "'\n" ++ show (abstract g)
+
+> gadgetCommand :: Gadget a -> (a -> a)
+> gadgetCommand (G _ _ (Command update)) = update
+> gadgetCommand g = error $ "Can't connect a command to gadget '" ++
+>                          gadgetName g ++ "'"
+
+> gadgetInner :: Gadget a -> Gadget a
+> gadgetInner (G _ _ (Inner g)) = g
+> gadgetInner g = error $ "Can't connect a inner to gadget '" ++
+>                            gadgetName g ++ "'\n" ++ show (abstract g)
+
+
+> connectEditorGadget :: (IO () -> IO ())  -- ^ connection creator
+>                     -> IO a              -- ^ gui state retriever
+>                     -> IO String         -- ^ gadget value retriever
+>                     -> Maybe (Gadget a)  -- ^ optional gadget
+>                     -> (a -> IO ())      -- ^ state change applier
+>                     -> IO ()
+
+> connectEditorGadget onAction getState gadgetValue gadget apply = do
+>    let connectEditor get set = onAction (do st   <- getState
+>                                             curr <- gadgetValue
+>                                             when (get st /= curr) $ do
+>                                               apply $ set curr st)
+>    case liftM gadgetEditor gadget of
+>       Nothing        -> return ()
+>       Just (get,set) -> connectEditor get set
+
+
+> connectChooserDisplay :: ([String] -> IO ())
+>                       -> (Int -> IO ())
+>                       -> Maybe (Gadget a)
+>                       -> a -> IO ()
+> connectChooserDisplay setChoices setValue gadget = do
+>    let update getChoices get st = (do
+>               let choices = getChoices st
+>                   value   = get st
+>               setChoices choices
+>               case elemIndex value choices of
+>                  Nothing -> setValue (-1)
+>                  Just index -> setValue index)
+>    case liftM gadgetChooser gadget of
+>      Nothing                -> \ _ -> return ()
+>      Just (getChoices, get) -> update getChoices get
+
+> connectDisplayGadget :: (String -> IO ())   --  GUI element updater
+>                      -> Maybe (Gadget a)
+>                      -> a -> IO ()
+
+> connectDisplayGadget update gadget = do
+>    let connectDisplay get =  update . get
+>    case liftM gadgetDisplay gadget of
+>       Nothing   -> \ _ -> return ()
+>       Just get  -> connectDisplay get
+
+> connectCommandGadget :: (IO () -> IO ())  --  connection creator
+>                      -> IO a              --  state retriever
+>                      -> Maybe (Gadget a)
+>                      -> (a -> IO ())      --  state updater
+>                      -> IO ()
+> connectCommandGadget onCommand getState gadget setState = do
+>    let connectCommand update = onCommand (do st   <- getState
+>                                              setState (update st))
+>    case liftM gadgetCommand gadget of
+>       Nothing     -> return ()
+>       Just update -> connectCommand update
+
+> connectInnerGadget :: (IO () -> IO ())         --  launch connector
+>                       -> (Gadget a -> a -> IO a)  --  inner
+>                       -> IO a                     --  state retriever
+>                       -> Maybe (Gadget a)
+>                       -> (a -> IO ())             --  state updater
+>                       -> IO ()
+> connectInnerGadget onLaunch inner getState gadget setState = do
+>    let connectInner g =
+>            onLaunch (do st <- getState
+>                         traceMessage $ "connecting: " ++
+>                                        gadgetName g
+>                         st' <- inner g st
+>                         traceMessage $ "finished: " ++ gadgetName g
+>                         setState st')
+>    case liftM gadgetInner gadget of
+>       Nothing -> return ()
+>       Just g  -> connectInner g
+
+> walk :: [String] -> ([String] -> Gadget a -> [b]) -> Gadget a -> [b]
+> walk prefix f gadget@(G nm _ e) =
+>     case e of
+>       (Local ws) -> f (prefix ++ nm) gadget ++
+>                       concatMap (walk (prefix ++ nm) f) ws
+>       (Inner w)  -> f (prefix ++ nm) gadget ++ walk (prefix ++ nm) f w
+>       _          -> f (prefix ++ nm) gadget
+
+
+> abstract :: Gadget a -> [AbstractGadget]
+> abstract = walk [] abstractElem
+>     where abstractElem name e = case gElement e of
+>                                   Display _     -> [alabel name]
+>                                   Editor _ _    -> [atext name]
+>                                   Command _     -> [acommand name]
+>                                   Chooser _ _ _ -> [achoice name]
+>                                   Inner _       -> [ainner name]
+>                                   Local _       -> [alocal name]
+
+> gadgets :: Gadget a -> Behaviour a
+> gadgets = B . walk [] getGadget
+>     where getGadget name (G _ cfg elmt) = [G name cfg elmt]
+
diff --git a/src/Barrie/Render.lhs b/src/Barrie/Render.lhs
new file mode 100644
--- /dev/null
+++ b/src/Barrie/Render.lhs
@@ -0,0 +1,86 @@
+> module Barrie.Render where
+
+> import Data.List
+> import Data.Maybe
+
+> import Barrie.Gadgets
+> import Barrie.Style
+> import Barrie.Trace
+> import Barrie.Widgets
+
+        RenderF is the type of rendering functions.  A rendering
+        function should be implmeneted for each backend.  Currently,
+        we have Gtk and IO.
+
+> type RenderF a b =  String            --  name of the gui element type
+>                  -> [RunnableGUI a b] --  children of this gui element
+>                  -> Style
+>                  -> Maybe (Gadget b)  --  corresponding implementation
+>                  -> Maybe Widget      --  possible popup
+>                  -> IO (RunnableGUI a b)
+
+        RunnableGUI is a type representing a rendered set of gadgets,
+        widgets, and styles.
+
+        A rendering function retuns a single RunnableGUI, which
+        represents the top level gui element.  Each of the inner
+        elements is also a RunnableGUI, and they are rendered in the
+        same way.  Anything that can be rendered can be used as a top
+        level element, either in the main application, or in a
+        pop-up.  Of course, this isn't enforced by this module, but
+        the RenderF functions should make sure it's true, because we
+        rely on it.
+
+        A RunnableGUI contains three fields.  First is the GUI, which
+        is of a type chosen by the renderer (e.g. Gtk uses
+        Gtk.Widget).  Second is an update from state function.  When
+        the state changes, this is called for each widget, causing it
+        to display according to the latest state.  Finally comes a
+        function which, give a function to extract state from IO
+        should call when the state is updated, which allows everything
+        else to be kept up to date.  The final field is a function
+        which, given a way of extracting the current state from IO,
+        and a way of putting it back, can update it via its gadget
+        functionality.
+
+        One will rightly point out that this is all very ugly and
+        procedural, but luckily, anybody using Barrie doesn't have to
+        worry about it.  It's the sewer of side-effects beneath the
+        cathedral of functional gui-ness.
+
+> type RunnableGUI gui state =
+>     (gui,                                    --  the GUI
+>      state -> IO (),                         --  update from state
+>      IO state -> (state -> IO ()) -> IO ())  --  state update function
+
+
+    The updates function extracts all the update functions from a
+    runnable gui.  This is convenient for the implementation of
+    renderers.
+
+> updates :: [RunnableGUI gui state] -> [state -> IO ()]
+> updates = map (\ (_, update, _) -> update)
+
+    A behaviour is just a flat list of gadgets.  Gadgets are defined
+    in a hierarchical way, but are flattened for rendering.
+
+    Note that the gadget hierarchy is only tangentially related to the
+    widget layout.  The hierarchy is intended to be a functional
+    grouping, although in practice it will often look similar to the
+    widget layout.
+
+> renderWidget :: Behaviour w -> Widget -> RenderF r w
+>              -> IO (RunnableGUI r w)
+> renderWidget behaviour widget render = go widget
+>     where --  go :: StyleSheet -> Layout -> RunnableGUI r w
+>           go w = do let elmt = widgetElementName w
+>                         style = widgetStyle w
+>                         gadget = findGadget (uiElementName w) behaviour
+>                     traceMessage ("rendering element: " ++ elmt);
+>                     traceMessage ("ui name = " ++
+>                                   intercalate "." (uiElementName w))
+>                     traceMessage ("gadget = " ++
+>                                   maybe "Nothing" (gadgetName) gadget)
+>                     ws <- mapM go $ widgetChildren w
+>                     render elmt ws style gadget (widgetPopupChild w)
+
diff --git a/src/Barrie/Render/Gtk.lhs b/src/Barrie/Render/Gtk.lhs
new file mode 100644
--- /dev/null
+++ b/src/Barrie/Render/Gtk.lhs
@@ -0,0 +1,412 @@
+This is Barrie's Gtk2hs rendering engine
+
+    See module Barrie.Render for a discussion of the RunnableGUI type,
+    which renderers return.
+
+> module Barrie.Render.Gtk (gtkMain, initGtk, renderGtk, runGtk) where
+
+> import qualified Graphics.UI.Gtk as Gtk
+> import System.Glib.Attributes
+
+> import Control.Monad
+
+       IORefs are Barrie's dirty little secret.  There are three: one
+       is for saving a global state that the GUI works with, the other
+       two save the contents of lists and choosers, so that we don't
+       update them more than necessary.
+
+> import Data.IORef
+
+
+       We import approximately everything
+
+> import Barrie.Config
+> import Barrie.Render
+> import Barrie.Style
+> import Barrie.Gadgets
+> --  import Barrie.GadgetValue
+> --  import Barrie.GadgetValueType
+> import Barrie.Trace
+> import Barrie.Widgets
+
+ 
+       The rendering model is defined by the RenderF type in the
+       Barrie.Render module.  Implementations of the renderer provide
+       a type which describes the GUI.  In this case, it's just a
+       Gtk.Widget.
+
+> type GtkGUI = Gtk.Widget
+
+       All rendering functions in this module use the following type
+       GtkRenderFn.
+ 
+       It is a function from:
+           -  a list of child guis (i.e. widgets inside the one being rendered)
+           -  a style
+           -  an optional gadget, which will be connected to the
+              rendered widget if present.
+       It returns a runnable GUI.
+
+> type GtkRenderFn a = [RunnableGUI GtkGUI a]
+>                    -> Style
+>                    -> Maybe (Gadget a)
+>                    -> IO (RunnableGUI GtkGUI a)
+
+
+ gtkMain is a convenience function for launching a gadget/widget pair,
+ with a given state.  It should only be called once, at the top level,
+ since it initialises Gtk (although I think multiple calls are
+ harmless).
+
+> gtkMain :: Gadget a -> Widget -> a -> IO a
+> gtkMain gadget widget state = do
+>   initGtk
+>   gui <- renderWidget (gadgets gadget) widget renderGtk
+>   runGtk gui state False
+
+
+> initGtk :: IO ()
+> initGtk = do Gtk.initGUI
+>              return ()
+
+> renderGtk :: RenderF GtkGUI a
+> renderGtk nm gs style gadget popupChild = do
+>   let rendererList = case popupChild of
+>                         Nothing -> renderers
+>                         Just w  -> map (\ (x,y) -> (x, y w)) popupRenderers
+>   case lookup nm rendererList of
+>     Nothing -> error $ "rendering element '" ++ nm ++ "' not found"
+>     Just r  -> do traceMessage ("rendering: " ++ nm)
+>                   r gs style gadget
+
+> runGtk :: RunnableGUI GtkGUI a -> a -> Bool -> IO a
+> runGtk (top, start, connect) state modal = do
+>   stateref <- newIORef state
+>   let update st = do writeIORef stateref st
+>                      start st
+>       getState = readIORef stateref
+>   connect getState update
+>   startGtk top start state modal
+>   getState
+
+> startGtk ::  Gtk.Widget -> (a -> IO ()) -> a -> Bool -> IO ()
+> startGtk top start state modal = do
+>   Gtk.initGUI
+>   window <- Gtk.windowNew
+>   Gtk.windowSetModal window modal
+>   Gtk.onDestroy window Gtk.mainQuit
+>   set window [ Gtk.containerChild := top ]
+>   Gtk.widgetShowAll window
+>   start state
+>   Gtk.mainGUI
+
+ -----------------------------
+ Renderers and popup renderers
+ -----------------------------
+
+ Two kinds of renderers are used.  The normal one puts widgets inside
+ other widgets in the normal way.  The popup renderer instead puts
+ widgets into a modal popup.  The choice of which to used is made
+ based on the popupChild argument to renderGtk, which is taken from
+ the widget corresponding to the gadget.
+
+ I find this a bit dodgy, since one could come up with all sorts of
+ information that might be useful for a widget to pass to a gadget,
+ but we certainly don't want to add an argument for each.  If I come
+ up with a bunch, I'll change the type from Maybe Widget to a record
+ of properties.
+
+> renderers :: [(String, GtkRenderFn a)]
+> renderers = [("button", renderButton),
+>              ("label", renderLabel),
+>              ("textbox", renderTextBox),
+>              ("droplist", renderChooser),
+>              ("list", renderSingleColumnList),
+>              ("vbox", renderBox Gtk.vBoxNew),
+>              ("hbox", renderBox Gtk.hBoxNew)]
+
+    Currently, we only do popup buttons, but it should be easily
+    generalisable.
+
+> popupRenderers :: [(String, Widget -> GtkRenderFn a)]
+> popupRenderers = [("button", renderPopupButton)]
+
+    Tables will come back when I work out a nice way to make them
+    dynamic.  Yes, boxes should be dynamic too, but there's something
+    about tables which just seems to demand it.
+
+    Barrie, of course, is not terribly at ease with dynamic gadgets
+    and widgets.
+
+> {-
+> renderTable :: GtkRenderFn a
+> renderTable ss children widgets = do
+>   case tableShape children of
+>     (1, 1) -> head children
+>     (1, _) -> renderBox Gtk.hBoxNew ss (head children) widgets
+>     (_, 1) -> renderBox Gtk.vBoxNew ss (map head children) widgets
+>     (n, m) -> do table <- Gtk.tableNew n m False
+>                  return $ (table,
+>                            startTable table n m ss children widgets,
+>                            updateContainer (Gtk.castToWidget table)
+>                                             ss (concat children) widgets)
+> -}
+
+> -- |The renderBox function renders horizontal and vertical layout boxes.
+
+> -- |Note the return type: it's a RunnableGUI from module Barrie.Render.
+
+> renderBox :: (Gtk.BoxClass b) =>
+>              (Bool -> Int -> IO b)
+>           -> GtkRenderFn a
+> renderBox new gs style gadget = do
+>   box <- new (getHomogenous style) 1
+>   startBox box gs gadget
+>   let result = Gtk.castToWidget box
+>   let connectBox getS update =
+>           mapM_ (\ (_, _, connect) -> connect getS update) gs
+>   return $ (result,
+>             configureWidget box style gadget $ onUpdate result (updates gs),
+>             connectBox)
+
+> startBox :: (Gtk.BoxClass b) =>
+>             b
+>          -> [RunnableGUI GtkGUI a]
+>          -> Maybe (Gadget a)
+>          -> IO ()
+> startBox box gs _ = do
+>   mapM_ (\ (w, _, _) -> Gtk.boxPackStartDefaults box w) gs
+
+> onUpdate :: Gtk.Widget -> [a -> IO ()] -> a -> IO ()
+> onUpdate _ childUpdates state =
+>     mapM_ ($ state) childUpdates
+
+> applyStyle :: (a -> IO ()) -> Maybe a -> IO ()
+> applyStyle _ Nothing = return ()
+> applyStyle applier (Just style) = applier style
+
+> {-
+> tableShape :: [[a]] -> (Int, Int)
+> tableShape cells = (length cells, length (head cells))
+
+> startTable :: Gtk.Table
+>            -> StyleSheet -> [RunnableGUI GtkGUI a] -> [TreeWidget a]
+>            -> a -> IO ()
+> startTable table ss children widgets state = do
+>   let attachCell row col widget =
+>           Gtk.tableAttachDefaults table widget
+>                                   col (col + 1)
+>                                   row (row + 1)
+>       attachRow row cells = mapM_ attach (zip [0 ..] cells)
+>           where attach (col, (w, _, _)) = attachCell row col w
+>       attachRows = mapM_ attach (zip [0 ..] children)
+>           where attach (row, ws) = attachRow row (map (\ (w,_,_) -> w) ws)
+>   attachRows
+> -}
+
+> renderButton :: GtkRenderFn a
+> renderButton _ style gadget = do
+>   btn <- Gtk.buttonNew
+>   applyStyle (Gtk.buttonSetLabel btn) (getCaption style)
+>   let onClicked = \ handler -> Gtk.onClicked btn handler >> return ()
+>       clickUpdate = \ gets -> connectCommandGadget onClicked gets gadget
+>   return (Gtk.castToWidget btn,
+>           configureButton btn style gadget (const (return ())),
+>           clickUpdate)
+
+> renderPopupButton :: Widget -> GtkRenderFn a
+> renderPopupButton popup _ style gadget = do
+>   btn <- Gtk.buttonNew
+>   applyStyle (Gtk.buttonSetLabel btn) (getCaption style)
+>   let onClicked = \ handler -> Gtk.onClicked btn handler >> return ()
+>       inner = \ g st -> do traceMessage ("popup: gadget = " ++
+>                                          gadgetName g)
+>                            gui <- renderWidget (gadgets g) popup renderGtk
+>                            runGtk gui st True
+>       clickUpdate = \ gets -> connectInnerGadget onClicked
+>                                           inner gets gadget
+>   return (Gtk.castToWidget btn,
+>           configureButton btn style gadget (const (return ())),
+>           clickUpdate)
+
+> configureButton :: Gtk.Button -> Style -> Maybe (Gadget a)
+>                 -> (a -> IO ()) -> a -> IO ()
+> configureButton btn style (Just gadget) update state = do
+>   when (gadgetConfig gadget configHasLabel) $ do
+>     Gtk.buttonSetLabel btn (gadgetConfig gadget configLabel state)
+>   configureWidget btn style (Just gadget) update state
+
+> configureButton _ _ _ update state = update state
+
+> configureWidget :: (Gtk.WidgetClass w) =>
+>                    w
+>                 -> Style
+>                 -> Maybe (Gadget a)
+>                 -> (a -> IO ())
+>                 -> a -> IO ()
+> configureWidget widget style (Just gadget) update state = do
+>    let enable = case (gadgetEnabled gadget state, getHideDisabled style) of
+>                   (True, True)     -> Gtk.widgetShow
+>                   (False, True)    -> Gtk.widgetHide
+>                   (isEnbld, False) -> flip Gtk.widgetSetSensitivity isEnbld
+>    enable widget
+>    update state
+
+> configureWidget _ _ _ update state = update state
+
+> renderTextBox :: GtkRenderFn a
+> renderTextBox _ style gadget = do
+>   tb <- Gtk.entryNew
+>   let onChanged = \ handler -> (Gtk.onEntryActivate tb handler >>
+>                                 Gtk.onFocusOut tb (\ _ -> (handler >> return False)) >>
+>                                 return ())
+>       changeUpdate = \ getState ->
+>                      connectEditorGadget onChanged getState
+>                                   (Gtk.entryGetText tb)
+>                                   gadget
+>   return (Gtk.castToWidget tb,
+>           configureWidget tb style gadget $
+>                     connectDisplayGadget (Gtk.entrySetText tb) gadget,
+>           changeUpdate)
+
+> traceGadget :: Maybe (Gadget a) -> String -> IO ()
+> traceGadget Nothing msg = traceMessage $ "<no gadget>: " ++ msg
+> traceGadget (Just g) msg = traceMessage $ (gadgetName g) ++ msg
+
+> -- |ModelRender: a record for rendering models.
+
+> data ModelRender = MR { mrSetChoices   :: [String] -> IO (),
+>                         mrSetSelection :: Int -> IO (),
+>                         mrGetValue     :: IO String
+>                       }
+
+> -- |The function renderModel uses the Gtk combo box/list/tree
+> -- |abstraction to do some abstracting of its own.
+
+> -- |Currently, we only render single-column lists. This makes the
+> -- |implementation almost trivial.  Yay!
+
+> renderSingleColumnModel :: IO (Gtk.ListStore String)   -- ^ get model from widget
+>                         -> (IO () -> IO ())        -- ^ selection change handler
+>                         -> IO Int        -- ^ current selection from widget
+>                         -> (Int -> IO ()) -- ^ set selection
+>                         -> IO ModelRender
+> renderSingleColumnModel getModel onChanged getCursor setCursor = do
+>   elemsRef <- newIORef []
+>   let setChoices xs = do
+>           current <- readIORef elemsRef
+>           when (current /= xs) $ do
+>             model <- getModel
+>             Gtk.listStoreClear model
+>             mapM_ (Gtk.listStoreAppend model) xs
+>             writeIORef elemsRef xs
+>   let getValue = do cursor <- getCursor
+>                     model  <- getModel
+>                     if cursor < 0
+>                          then return ""
+>                          else Gtk.listStoreGetValue model cursor
+>   let setValue n | n < 0     = setCursor n
+>                  | otherwise = setCursor n
+>   return MR { mrSetChoices = setChoices,
+>               mrSetSelection = setValue,
+>               mrGetValue = getValue
+>             }
+
+> renderChooser :: GtkRenderFn a
+> renderChooser _ style gadget = do
+>   store <- Gtk.listStoreNew []
+>   chooser <- Gtk.comboBoxNewWithModel store
+>   r <- Gtk.cellRendererTextNew
+>   Gtk.cellLayoutPackStart chooser r True
+>   Gtk.cellLayoutSetAttributes chooser r store $
+>                          \ row -> [ Gtk.cellText := row ]
+>   let getModel = return store
+>       onChanged = \ handler -> Gtk.on chooser Gtk.changed handler >> return ()
+>       getSel = Gtk.comboBoxGetActive chooser
+>       setSel = Gtk.comboBoxSetActive chooser
+>   mr <- renderSingleColumnModel getModel onChanged getSel setSel
+>   let connect = connectChooserDisplay (mrSetChoices mr) (mrSetSelection mr)
+>                                       gadget
+>       update = \getState -> connectEditorGadget onChanged getState
+>                                                     (mrGetValue mr) gadget
+>   return (Gtk.castToWidget chooser,
+>           configureWidget chooser style gadget connect,
+>           update)
+
+> renderLabel :: GtkRenderFn a
+> renderLabel _ style gadget = do
+>   label <- Gtk.labelNew Nothing
+>   applyStyle (Gtk.labelSetText label) (getCaption style)
+>   return (Gtk.castToWidget label,
+>           connectDisplayGadget (Gtk.labelSetText label) gadget,
+>           \ _ _ -> return ())
+
+> renderSingleColumnList :: GtkRenderFn a
+> renderSingleColumnList children style gadget = do
+>   store <- Gtk.listStoreNew []
+>   list <- Gtk.treeViewNewWithModel store
+>   col <- Gtk.treeViewColumnNew
+>   r <- Gtk.cellRendererTextNew
+>   Gtk.cellLayoutPackStart col r True
+>   Gtk.cellLayoutSetAttributes col r store $ \ row -> [ Gtk.cellText := row ]
+>   Gtk.treeViewAppendColumn list col
+>   let getModel = return store
+>       onChanged = \ handler -> Gtk.onCursorChanged list handler >>
+>                                                return ()
+>       getSel = do (path, _) <- Gtk.treeViewGetCursor list
+>                   case path of
+>                     []  -> return (-1)
+>                     [x] -> return x
+>                     _   -> error $ "can't render tree view "
+>       setSel n | n < 0 = Gtk.treeViewSetCursor list [] Nothing
+>                | otherwise = Gtk.treeViewSetCursor list [n] Nothing
+>   mr <- renderSingleColumnModel getModel onChanged getSel setSel
+>   let connect = connectChooserDisplay (mrSetChoices mr) (mrSetSelection mr)
+>                                       gadget
+>       update = \getState -> connectEditorGadget onChanged getState
+>                                                     (mrGetValue mr) gadget
+>   return (Gtk.castToWidget list,
+>           configureWidget list style gadget connect,
+>           update)
+
+
+>   {- list <- Gtk.treeViewNew
+>   col <- Gtk.treeViewColumnNew
+>   Gtk.treeViewAppendColumn list col
+>   tr <- Gtk.cellRendererTextNew
+>   Gtk.treeViewColumnPackStart col tr True
+>   Gtk.treeViewColumnAddAttribute col tr "text" 0
+>   let onChanged = \ handler -> Gtk.onCursorChanged list handler >>
+>                                return ()
+>   let getValue rd = do Just store <- Gtk.treeViewGetModel list
+>                        (path, col) <- Gtk.treeViewGetCursor list
+>                        miter <- Gtk.treeModelGetIter store path
+>                        case miter of
+>                           Nothing   -> return gvNoValue
+>                           (Just iter) -> do
+>                              (Gtk.GVstring (Just s)) <-
+>                                       Gtk.treeModelGetValue store iter 0
+>                              return (rd s)
+>   return (Gtk.castToWidget list,
+>           setListChanger (\ m -> Gtk.treeViewSetModel list m) gadget,
+>           \ getState -> connectTextEditorGadget onChanged getState
+>                                                 getValue gadget)
+> -}
+
+> {- setListChanger :: (Gtk.ListStore -> IO ())
+>                -> Maybe (Gadget a)
+>                -> a -> IO ()
+> setListChanger update gadget st = connectDisplayGadget update' gadget st
+>     where update' gv = toListStore gv >>= update
+>           toListStore gv = case gvType gv of
+>                              (GVList t) ->
+>                                  toSingleColumnList t (gvListValues gv)
+>                              _ -> error ("can't display value in a list: " ++
+>                                          toString gv)
+>           toSingleColumnList t list = do
+>             store <- Gtk.listStoreNew [toGtkType t]
+>             mapM_ (listModelAddRow store) (map (toGtkValue t) list)
+>             return store
+>   -}
+
+
diff --git a/src/Barrie/Style.lhs b/src/Barrie/Style.lhs
new file mode 100644
--- /dev/null
+++ b/src/Barrie/Style.lhs
@@ -0,0 +1,66 @@
+> {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+> module Barrie.Style (Style, Styled(..), addStyle, emptyStyle,
+>                      caption, getCaption,
+>                      hideDisabled, getHideDisabled,
+>                      homogenous, getHomogenous,
+>                      textValue, textItems) where
+
+> import Data.Monoid
+
+> newtype Style = Style [(String, StyleValue)]
+>            deriving (Read, Show, Monoid)
+
+> type StyleValue = String
+
+> mkStyle :: String -> StyleValue -> Style
+> mkStyle name value = Style [(name, value)]
+
+> class Styled a where
+>    setStyle :: Style -> a -> a
+>    getStyle :: a -> Style
+
+> instance Styled Style where
+>    setStyle = const
+>    getStyle = id
+
+> addStyle :: (Styled a) => Style -> a -> a
+> addStyle style item = setStyle (style `mappend` getStyle item) item
+
+> emptyStyle :: Style
+> emptyStyle = Style []
+
+> styleValue :: (Styled a) => String -> a -> Maybe StyleValue
+> styleValue name ss = lookup name styleList
+>    where (Style styleList) = getStyle ss
+
+> caption :: (Styled a) => String -> a -> a
+> caption text = addStyle $ mkStyle "caption" text
+
+> getCaption :: (Styled a) => a -> Maybe StyleValue
+> getCaption = styleValue "caption"
+
+> textValue :: (Styled a) => String -> a -> a
+> textValue text = addStyle $ mkStyle "textValue" text
+
+> textItems :: (Styled a) => [String] -> a -> a
+> textItems items = addStyle $ mkStyle "textItems" (unlines items)
+
+> hideDisabled :: (Styled a) => Bool -> a -> a
+> hideDisabled hide = addStyle $ mkStyle "hideDisabled" (show hide)
+
+> getHideDisabled :: (Styled a) => a -> Bool
+> getHideDisabled style = case styleValue "hideDisabled" style of
+>                           Nothing -> False
+>                           Just text -> read text
+
+
+> homogenous :: (Styled a) => Bool -> a -> a
+> homogenous set = addStyle $ mkStyle "homogenous" (show set)
+
+> getHomogenous :: (Styled a) => a -> Bool
+> getHomogenous style = case styleValue "homogenous" style of
+>                           Nothing -> False
+>                           Just text -> read text
+
+
diff --git a/src/Barrie/Trace.lhs b/src/Barrie/Trace.lhs
new file mode 100644
--- /dev/null
+++ b/src/Barrie/Trace.lhs
@@ -0,0 +1,21 @@
+Module for enabling trace
+
+> module Barrie.Trace (enableTrace, traceMessage) where
+
+> import Data.IORef
+> import System.IO.Unsafe
+
+> traceFile :: IORef (Maybe String)
+> traceFile = unsafePerformIO $ newIORef Nothing
+
+> enableTrace :: String -> IO ()
+> enableTrace fileName = do
+>   writeIORef traceFile (Just fileName)
+
+> traceMessage :: String -> IO ()
+> traceMessage msg = do
+>   fileName <- readIORef traceFile
+>   case fileName of
+>      Nothing -> return ()
+>      Just name -> appendFile name (msg ++ "\n")
+
diff --git a/src/Barrie/Widgets.lhs b/src/Barrie/Widgets.lhs
new file mode 100644
--- /dev/null
+++ b/src/Barrie/Widgets.lhs
@@ -0,0 +1,102 @@
+> module Barrie.Widgets
+>     (Widget, widgetElementName, widgetToLines, widgetChildren, widgetStyle,
+>      widgetPopupChild,
+>      mkWidget, mkPopup,
+>      ui, ui', uiElementName,
+>      vbox, hbox, menu, menuItem, button, labelButton, textLabel,
+>      staticDropList, dropList, list, textBox, textBoxWithValue)
+>     where
+
+> import Data.List
+
+> import Barrie.Style
+
+> data Widget = Widget { elementName  :: String,
+>                        styles       :: Style,
+>                        uiName       :: [String],
+>                        wpopup       :: Maybe Widget,
+>                        children     :: [Widget]
+>                      }
+>               deriving (Read, Show)
+
+> instance Styled Widget where
+>    getStyle = styles
+>    setStyle style w = w { styles = style }
+
+> widgetElementName :: Widget -> String
+> widgetElementName = elementName
+
+> widgetToLines :: Widget -> [String]
+> widgetToLines w = widgetLine : concatMap widgetToLines (children w)
+>     where widgetLine = elementName w ++ uiLine
+>           uiLine = case uiName w of
+>                      []  -> ""
+>                      nms -> " (" ++ intercalate "." nms ++ ")"
+
+> widgetChildren :: Widget -> [Widget]
+> widgetChildren = children
+
+> widgetStyle :: Widget -> Style
+> widgetStyle = styles
+
+> widgetPopupChild :: Widget -> Maybe Widget
+> widgetPopupChild = wpopup
+
+> mkWidget :: String -> [Widget] -> Widget
+> mkWidget elmtName ws = Widget elmtName emptyStyle [] Nothing ws
+
+> mkPopup :: String -> Widget -> Widget -> Widget
+> mkPopup uiname popup w = ui uiname w { wpopup = Just popup }
+
+> ui :: String -> Widget -> Widget
+> ui name = ui' [name]
+
+> ui' :: [String] -> Widget -> Widget
+> ui' name widget = widget { uiName = name }
+
+> uiElementName :: Widget -> [String]
+> uiElementName = uiName
+
+> vbox, hbox :: [Widget] -> Widget
+> vbox = mkWidget "vbox"
+> hbox = mkWidget "hbox"
+
+> table :: [[Widget]] -> Widget
+> table = mkWidget "table" . map tableRow
+
+> tableRow :: [Widget] -> Widget
+> tableRow = mkWidget "tr" . map tableCell
+
+> tableCell :: Widget -> Widget
+> tableCell = mkWidget "td" . (:[])
+
+> menu :: [Widget] -> Widget
+> menu = mkWidget "menu"
+
+> menuItem :: [Widget] -> Widget
+> menuItem = mkWidget "menuitem"
+
+> button :: [Widget] -> Widget
+> button = mkWidget "button"
+
+> labelButton :: String -> Widget
+> labelButton text = caption text (button [])
+
+> textLabel :: String -> Widget
+> textLabel text = caption text (mkWidget "label" [])
+
+> staticDropList :: String -> [String] -> Widget
+> staticDropList val vals = textValue val $ textItems vals $
+>                                 mkWidget "droplist" []
+
+> dropList :: Widget
+> dropList = mkWidget "droplist" []
+
+> list :: Widget
+> list = mkWidget "list" []
+
+> textBox :: Widget
+> textBox  = mkWidget "textbox" []
+
+> textBoxWithValue :: String -> Widget
+> textBoxWithValue text  = textValue text textBox
