new projectv1

108 files changed, 2295 insertions, 0 deletions

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..10926e8
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,675 @@
+                    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/LetterMatch.py b/LetterMatch.py
new file mode 100644
index 0000000..2db42fb
--- /dev/null
+++ b/LetterMatch.py
@@ -0,0 +1,178 @@
+#Copyright (c) 2012 Walter Bender
+
+# 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.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+
+import gtk
+
+from sugar.activity import activity
+try:
+    from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
+    _HAVE_TOOLBOX = True
+except ImportError:
+    _HAVE_TOOLBOX = False
+
+if _HAVE_TOOLBOX:
+    from sugar.activity.widgets import ActivityToolbarButton
+    from sugar.activity.widgets import StopButton
+
+from sugar.graphics.toolbutton import ToolButton
+from sugar.graphics.combobox import ComboBox
+from sugar.graphics.toolcombobox import ToolComboBox
+from sugar.datastore import datastore
+from sugar import profile
+
+from gettext import gettext as _
+import os.path
+
+from page import Page
+from utils.play_audio import play_audio_from_file
+from utils.toolbar_utils import separator_factory, label_factory, radio_factory
+
+import logging
+_logger = logging.getLogger('lettermatch-activity')
+
+
+class LetterMatch(activity.Activity):
+    ''' Learning the alphabet. 
+
+    Level1: The alphabet appears and the user has the option to click
+    on a letter to listen the name of it and the sound of it.
+
+    Level2: The letters appear randomly and the user must place them
+    in the correct order.
+
+    Level3: The laptop says a letter and the user must click on the
+    correct one. '''
+
+    def __init__(self, handle):
+        ''' Initialize the toolbars and the reading board '''
+        super(LetterMatch, self).__init__(handle)
+
+        self.datapath = get_path(activity, 'instance')
+
+        if 'LANG' in os.environ:
+            language = os.environ['LANG'][0:2]
+        elif 'LANGUAGE' in os.environ:
+            language = os.environ['LANGUAGE'][0:2]
+        else:
+            language = 'es'  # default to Spanish
+
+        # FIXME: find some reasonable default situation
+        language = 'es'
+
+        if os.path.exists(os.path.join('~', 'Activities',
+                                       'IKnowMyABCs.activity')):
+            self._lessons_path = os.path.join('~', 'Activities',
+                                              'IKnowMyABCs.activity',
+                                              'lessons', language)
+        else:
+            self._lessons_path = os.path.join('.', 'lessons', language)
+
+        self._images_path = self._lessons_path.replace('lessons', 'images')
+        self._sounds_path = self._lessons_path.replace('lessons', 'sounds')
+        self._setup_toolbars()
+
+        # Create a canvas
+        canvas = gtk.DrawingArea()
+        width = gtk.gdk.screen_width()
+        height = int(gtk.gdk.screen_height())
+        canvas.set_size_request(width, height)
+        canvas.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("#000000"))
+        canvas.show()
+        self.set_canvas(canvas)
+
+        self.mode = 'letter'
+
+        self._page = Page(canvas, self._lessons_path,
+                          self._images_path, self._sounds_path,
+                          parent=self)
+
+    def _setup_toolbars(self):
+        ''' Setup the toolbars.. '''
+
+        # no sharing
+        self.max_participants = 1
+
+        if _HAVE_TOOLBOX:
+            toolbox = ToolbarBox()
+
+            # Activity toolbar
+            activity_button = ActivityToolbarButton(self)
+
+            toolbox.toolbar.insert(activity_button, 0)
+            activity_button.show()
+
+            self.set_toolbar_box(toolbox)
+            toolbox.show()
+            primary_toolbar = toolbox.toolbar
+        else:
+            # Use pre-0.86 toolbar design
+            primary_toolbar = gtk.Toolbar()
+            toolbox = activity.ActivityToolbox(self)
+            self.set_toolbox(toolbox)
+            toolbox.add_toolbar(_('Page'), primary_toolbar)
+            toolbox.show()
+            toolbox.set_current_toolbar(1)
+
+            # no sharing
+            if hasattr(toolbox, 'share'):
+                toolbox.share.hide()
+            elif hasattr(toolbox, 'props'):
+                toolbox.props.visible = False
+
+        button = radio_factory('letter', primary_toolbar, self._letter_cb,
+                               tooltip=_('listen to the letter names'))
+        radio_factory('picture', primary_toolbar, self._picture_cb,
+                      tooltip=_('listen to the letter names'),
+                      group=button)
+
+        self.status = label_factory(primary_toolbar, '', width=300)
+
+        if _HAVE_TOOLBOX:
+            separator_factory(primary_toolbar, True, False)
+
+            stop_button = StopButton(self)
+            stop_button.props.accelerator = '<Ctrl>q'
+            toolbox.toolbar.insert(stop_button, -1)
+            stop_button.show()
+
+    def _letter_cb(self, event=None):
+        ''' click on card to hear the letter name '''
+        self.mode = 'letter'
+        self.status.set_text(_('Click on the picture that matches the letter.'))
+        if hasattr(self, '_page'):
+            self._page.new_page()
+        return
+
+    def _picture_cb(self, event=None):
+        ''' click on card to hear the letter name '''
+        self.mode = 'picture'
+        self.status.set_text(_('Click on the letter that matches the picture.'))
+        if hasattr(self, '_page'):
+            self._page.new_page()
+        return
+
+    def write_file(self, file_path):
+        ''' Write status to the Journal '''
+        if not hasattr(self, '_page'):
+            return
+        self.metadata['page'] = str(self._page.current_card)
+
+
+def get_path(activity, subpath):
+    """ Find a Rainbow-approved place for temporary files. """
+    try:
+        return(os.path.join(activity.get_activity_root(), subpath))
+    except:
+        # Early versions of Sugar didn't support get_activity_root()
+        return(os.path.join(
+                os.environ['HOME'], ".sugar/default", SERVICE, subpath))
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..81916c5
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,5 @@
+1
+
+* New 'I Know My ABCs' activity
+
+
diff --git a/activity/activity-lettermatch.svg b/activity/activity-lettermatch.svg
new file mode 100644
index 0000000..1a09b23
--- /dev/null
+++ b/activity/activity-lettermatch.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#000">
+	<!ENTITY fill_color "#eee">
+]><svg height="55px" viewBox="0 0 55 55" width="55px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" stroke="&stroke_color;" fill="&fill_color;">
+  <g>
+    <path
+       d="m 27.503,10.705131 h -0.002 c 0,-0.002 -1.71,-2.0530005 -9.376,-2.5040005 -7.666,-0.449 -11.683,1.602 -11.686,1.603 C 4.541,10.423131 2.944,11.539131 2.944,13.298131 v 27.702 c 0,2.025 1.235,3.494 3.495,3.494 0.003,0 4.41,-1.35 10.004,-1.35 5.589,-0.001 11.061,2.253 11.061,2.253"
+       fill="&fill_color;" stroke="&stroke_color;"
+       style="fill-opacity:1;stroke-width:3.5;stroke-linejoin:round;display:inline" />
+    <path
+       d="m 27.497,10.705131 0,0 c 0,-0.002 1.715,-2.0530005 9.377,-2.5040005 7.668,-0.449 11.686,1.602 11.688,1.603 1.897,0.6190005 3.494,1.7350005 3.494,3.4940005 v 27.702 c 0,2.025 -1.233,3.494 -3.494,3.494 -0.003,0 -4.409,-1.35 -10.004,-1.35 -5.589,-0.001 -11.062,2.253 -11.062,2.253"
+       fill="&fill_color;" stroke="&stroke_color;"
+       style="fill-opacity:1;stroke-width:3.5;stroke-linejoin:round;display:inline" />
+    <line
+       fill="&fill_color;" stroke="&stroke_color;"
+       style="fill-opacity:1;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;display:inline"
+       x1="27.497002"
+       x2="27.499001"
+       y1="10.705131"
+       y2="45.399128"
+       id="line3064" />
+    <path
+       d="m 32.165,43.957131 c 0,0 -0.031,2.906 -4.666,2.906 -4.632,0 -4.663,-2.906 -4.663,-2.906"
+       fill="&stroke_color;" stroke="&stroke_color;"
+       style="stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;display:inline" />
+  </g>
+  <text
+     y="8.9589844"
+     id="text13"
+     style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill-opacity:1;stroke:none;font-family:Sans">
+    <tspan
+       x="9"
+       y="32.958984"
+       id="tspan8"
+       style="font-size:20px;fill:&stroke_color;">a</tspan>
+  </text>
+  <g
+     transform="matrix(0.89999998,0,0,0.89999998,4.1942541,-1.5198757)"
+     id="g3871">
+    <rect
+       width="18.734301"
+       height="12.831227"
+       ry="0"
+       x="30.532244"
+       y="25.828693"
+       id="rect2997"
+       style="fill:none;stroke:&stroke_color;;stroke-width:1.26569986;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 39.898972,30.238597 c -2.006978,0 -3.678968,2.001493 -3.678968,2.001493 0,0 1.67199,2.011197 3.678968,2.009932 2.006978,-0.0017 3.679811,-2.012463 3.679811,-2.012463 0,0 -1.672411,-2.000228 -3.679811,-1.998962 z m 0,3.41317 c -0.77714,0 -1.407037,-0.630318 -1.407037,-1.407458 0,-0.775874 0.629897,-1.407458 1.407037,-1.407458 0.775874,0 1.406192,0.631584 1.406192,1.407458 4.22e-4,0.77714 -0.629896,1.407458 -1.406192,1.407458 z"
+       id="path3156"
+       style="fill:#010101;stroke:&stroke_color;;stroke-width:0.63284993;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+  </g>
+</svg>
diff --git a/activity/activity.info b/activity/activity.info
new file mode 100644
index 0000000..a186720
--- /dev/null
+++ b/activity/activity.info
@@ -0,0 +1,8 @@
+[Activity]
+name = Letter Match
+activity_version = 1
+license = GPLv3
+bundle_id = org.sugarlabs.LetterMatch
+exec = sugar-activity LetterMatch.LetterMatch
+icon = activity-lettermatch
+show_launcher = yes
diff --git a/genpieces.py b/genpieces.py
new file mode 100755
index 0000000..f4d8485
--- /dev/null
+++ b/genpieces.py
@@ -0,0 +1,156 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+#Copyright (c) 2009-11 Walter Bender
+
+# 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.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+import os
+
+
+class SVG:
+    ''' SVG generators '''
+
+    def __init__(self):
+        self._scale = 1
+        self._stroke_width = 1
+        self._fill = '#FFFFFF'
+        self._stroke = '#000000'
+
+    def _svg_style(self, stroke=False, extras=""):
+        if stroke:
+            return "%s%s%s%s%s%f%s%s%s" % ("style=\"fill:", self._fill,
+                                           ";stroke:", "#000000",
+                                           ";stroke-width:",
+                                           self._stroke_width, ";", extras,
+                                           "\" />\n")
+        else:
+            return "%s%s%s%s%s%f%s%s%s" % ("style=\"fill:", self._fill,
+                                           ";stroke:", self._stroke,
+                                           ";stroke-width:",
+                                           self._stroke_width, ";", extras,
+                                           "\" />\n")
+
+    def _svg_text(self, x, y, font_size, text_string, stroke=False,
+                  center=False):
+        if center:
+            align = 'text-align:center;text-anchor:middle'
+        else:
+            align = ''
+        svg_string = "<text x=\"%d\" y=\"%d\" " % (x, y)
+        if stroke:
+            svg_string += "style=\"font-size:%dpx;font-weight:bold;font-family:Sans;fill:%s;\
+stroke:#000000;%s\">" % (font_size, self._stroke, align)
+        else:
+            svg_string += "style=\"font-size:%dpx;font-weight:bold;font-family:Sans;fill:%s;\
+%s\">" % (font_size, self._stroke, align)
+        svg_string += "<tspan x=\"%d\" y=\"%d\">%s</tspan></text>" % \
+            (x, y, text_string)
+        return svg_string
+
+    def _svg_line(self, x1, y1, x2, y2):
+        svg_string = "<line x1=\"%f\" y1=\"%f\" x2=\"%f\" y2=\"%f\"\n" % \
+                      (x1, y1, x2, y2)
+        svg_string += self._svg_style("stroke-linecap:square;")
+        return svg_string
+
+    def _svg_rect(self, w, h, rx, ry, x, y, stroke=False):
+        svg_string = "       <rect\n"
+        svg_string += "          width=\"%f\"\n" % (w)
+        svg_string += "          height=\"%f\"\n" % (h)
+        svg_string += "          rx=\"%f\"\n" % (rx)
+        svg_string += "          ry=\"%f\"\n" % (ry)
+        svg_string += "          x=\"%f\"\n" % (x)
+        svg_string += "          y=\"%f\"\n" % (y)
+        self.set_stroke_width(1.0)
+        svg_string += self._svg_style(stroke=stroke)
+        return svg_string
+
+    def _background(self, scale, stroke=False):
+        return self._svg_rect(79.5 * scale, 59.5 * scale, 1, 1, 0.25, 0.25,
+                              stroke=stroke)
+
+    def header(self, scale=1, background=True, stroke=False):
+        svg_string = "<?xml version=\"1.0\" encoding=\"UTF-8\""
+        svg_string += " standalone=\"no\"?>\n"
+        svg_string += "<!-- Created with Emacs -->\n"
+        svg_string += "<svg\n"
+        svg_string += "   xmlns:svg=\"http://www.w3.org/2000/svg\"\n"
+        svg_string += "   xmlns=\"http://www.w3.org/2000/svg\"\n"
+        svg_string += "   version=\"1.0\"\n"
+        svg_string += "%s%f%s" % ("   width=\"", scale * 80 * self._scale,
+                                  "\"\n")
+        svg_string += "%s%f%s" % ("   height=\"", scale * 60 * self._scale,
+                                  "\">\n")
+        svg_string += "%s%f%s%f%s" % ("<g\n       transform=\"matrix(",
+                                      self._scale, ",0,0,", self._scale,
+                                      ",0,0)\">\n")
+        if background:
+            svg_string += self._background(scale, stroke=stroke)
+        return svg_string
+
+    def footer(self):
+        svg_string = "</g>\n"
+        svg_string += "</svg>\n"
+        return svg_string
+
+    def set_scale(self, scale=1.0):
+        self._scale = scale
+
+    def set_colors(self, colors):
+        self._stroke = colors[0]
+        self._fill = colors[1]
+
+    def set_stroke_width(self, stroke_width=1.0):
+        self._stroke_width = stroke_width
+
+
+def generate_card(string='a', colors=['#FF0000', '#FFFFFF'],
+                  background=True, scale=1, stroke=False, center=False,
+                  font_size=40):
+    svg = SVG()
+    svg.set_scale(scale)
+    svg.set_colors(colors)
+    svg_string = svg.header(background=background, stroke=stroke)
+    if center:
+        x = 40
+    else:
+        x = 5
+    svg_string += svg._svg_text(x, 45, font_size, string, stroke=stroke,
+                                    center=center)
+    svg_string += svg.footer()
+    return svg_string
+
+
+def open_file(datapath, filename):
+    return file(os.path.join(datapath, filename), "w")
+
+
+def close_file(f):
+    f.close()
+
+
+def generator(datapath):
+    i = 1
+    filename = "tile-%d.svg" % (i)
+    f = open_file(datapath, filename)
+    f.write(generate_card(string='b', background=False))
+    close_file(f)
+
+
+def main():
+    return 0
+
+if __name__ == "__main__":
+    if not os.path.exists(os.path.join(os.path.abspath('.'), 'images')):
+        os.mkdir(os.path.join(os.path.abspath('.'), 'images'))
+    generator(os.path.join(os.path.abspath('.'), 'images'))
+    main()
diff --git a/icons/letter.svg b/icons/letter.svg
new file mode 100644
index 0000000..201a280
--- /dev/null
+++ b/icons/letter.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg2"
+   style="fill:#ffffff;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs18" />
+  <rect
+     width="44.404602"
+     height="30.412962"
+     ry="0"
+     x="6.1161056"
+     y="11.935916"
+     id="rect2997"
+     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <text
+     x="16.159618"
+     y="38.136364"
+     id="text13"
+     style="font-size:38.96828842px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill-opacity:1;stroke:none;font-family:Sans">
+    <tspan
+       x="16.159618"
+       y="38.136364"
+       id="tspan8"
+       style="font-size:38.96828842px;fill:#000000">a</tspan>
+  </text>
+</svg>
diff --git a/icons/picture.svg b/icons/picture.svg
new file mode 100644
index 0000000..e94d2b2
--- /dev/null
+++ b/icons/picture.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg2">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs18">
+	
+	
+	
+	
+	
+	
+	
+
+		
+	
+			
+			
+		</defs>
+  <rect
+     width="44.404602"
+     height="30.412962"
+     ry="0"
+     x="5.297699"
+     y="12.293519"
+     id="rect2997"
+     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 27.499,22.746 c -4.757,0 -8.72,4.744 -8.72,4.744 0,0 3.963,4.767 8.72,4.764 4.757,-0.004 8.722,-4.77 8.722,-4.77 0,0 -3.964,-4.741 -8.722,-4.738 z m 0,8.09 c -1.842,0 -3.335,-1.494 -3.335,-3.336 0,-1.839 1.493,-3.336 3.335,-3.336 1.839,0 3.333,1.497 3.333,3.336 10e-4,1.842 -1.493,3.336 -3.333,3.336 z"
+     id="path3156"
+     style="fill:#010101;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+</svg>
diff --git a/images/COPYING b/images/COPYING
new file mode 100644
index 0000000..f31c49e
--- /dev/null
+++ b/images/COPYING
@@ -0,0 +1,3 @@
+Images are provided by Paraguay Educa and are licensed under a Creative Commons Attribution-Share Alike 3.0 Unported license.
+
+More details regarding the Creative Commons licenses can be found at http://creativecommons.org/
diff --git a/images/es/ave.png b/images/es/ave.png
new file mode 100644
index 0000000..e250e53
--- /dev/null
+++ b/images/es/ave.png
diff --git a/images/es/burro.png b/images/es/burro.png
new file mode 100644
index 0000000..aa5bb9e
--- /dev/null
+++ b/images/es/burro.png
diff --git a/images/es/conejo.png b/images/es/conejo.png
new file mode 100644
index 0000000..87a406d
--- /dev/null
+++ b/images/es/conejo.png
diff --git a/images/es/dado.png b/images/es/dado.png
new file mode 100644
index 0000000..daf3f6b
--- /dev/null
+++ b/images/es/dado.png
diff --git a/images/es/elefante.png b/images/es/elefante.png
new file mode 100644
index 0000000..5c337ee
--- /dev/null
+++ b/images/es/elefante.png
diff --git a/images/es/flor.png b/images/es/flor.png
new file mode 100644
index 0000000..1534cc8
--- /dev/null
+++ b/images/es/flor.png
diff --git a/images/es/gato.png b/images/es/gato.png
new file mode 100644
index 0000000..8191f8d
--- /dev/null
+++ b/images/es/gato.png
diff --git a/images/es/helado.png b/images/es/helado.png
new file mode 100644
index 0000000..32b3a62
--- /dev/null
+++ b/images/es/helado.png
diff --git a/images/es/iglesia.png b/images/es/iglesia.png
new file mode 100644
index 0000000..4a494c1
--- /dev/null
+++ b/images/es/iglesia.png
diff --git a/images/es/jirafa.png b/images/es/jirafa.png
new file mode 100644
index 0000000..c5b6935
--- /dev/null
+++ b/images/es/jirafa.png
diff --git a/images/es/kilo.png b/images/es/kilo.png
new file mode 100644
index 0000000..86a0bc8
--- /dev/null
+++ b/images/es/kilo.png
diff --git a/images/es/llama.png b/images/es/llama.png
new file mode 100644
index 0000000..a611c88
--- /dev/null
+++ b/images/es/llama.png
diff --git a/images/es/loro.png b/images/es/loro.png
new file mode 100644
index 0000000..22b936b
--- /dev/null
+++ b/images/es/loro.png
diff --git a/images/es/mesa.png b/images/es/mesa.png
new file mode 100644
index 0000000..4f35411
--- /dev/null
+++ b/images/es/mesa.png
diff --git a/images/es/nandu.png b/images/es/nandu.png
new file mode 100644
index 0000000..71aa1f5
--- /dev/null
+++ b/images/es/nandu.png
diff --git a/images/es/nube.png b/images/es/nube.png
new file mode 100644
index 0000000..a50c859
--- /dev/null
+++ b/images/es/nube.png
diff --git a/images/es/oso.png b/images/es/oso.png
new file mode 100644
index 0000000..059f7a4
--- /dev/null
+++ b/images/es/oso.png
diff --git a/images/es/paraguay.png b/images/es/paraguay.png
new file mode 100644
index 0000000..9a8be8c
--- /dev/null
+++ b/images/es/paraguay.png
diff --git a/images/es/pato.png b/images/es/pato.png
new file mode 100644
index 0000000..4ddb8c7
--- /dev/null
+++ b/images/es/pato.png
diff --git a/images/es/perro.png b/images/es/perro.png
new file mode 100644
index 0000000..3cd38f1
--- /dev/null
+++ b/images/es/perro.png
diff --git a/images/es/queso.png b/images/es/queso.png
new file mode 100644
index 0000000..a4b999e
--- /dev/null
+++ b/images/es/queso.png
diff --git a/images/es/raton.png b/images/es/raton.png
new file mode 100644
index 0000000..f2e087d
--- /dev/null
+++ b/images/es/raton.png
diff --git a/images/es/sapo.png b/images/es/sapo.png
new file mode 100644
index 0000000..bb1f137
--- /dev/null
+++ b/images/es/sapo.png
diff --git a/images/es/taza.png b/images/es/taza.png
new file mode 100644
index 0000000..6a48834
--- /dev/null
+++ b/images/es/taza.png
diff --git a/images/es/uva.png b/images/es/uva.png
new file mode 100644
index 0000000..25bcc84
--- /dev/null
+++ b/images/es/uva.png
diff --git a/images/es/vaca.png b/images/es/vaca.png
new file mode 100644
index 0000000..7569ac0
--- /dev/null
+++ b/images/es/vaca.png
diff --git a/images/es/waterpolo.png b/images/es/waterpolo.png
new file mode 100644
index 0000000..88472a0
--- /dev/null
+++ b/images/es/waterpolo.png
diff --git a/images/es/xilofono.png b/images/es/xilofono.png
new file mode 100644
index 0000000..e766487
--- /dev/null
+++ b/images/es/xilofono.png
diff --git a/images/es/yate.png b/images/es/yate.png
new file mode 100644
index 0000000..097fe04
--- /dev/null
+++ b/images/es/yate.png
diff --git a/images/es/zapato.png b/images/es/zapato.png
new file mode 100644
index 0000000..db8648c
--- /dev/null
+++ b/images/es/zapato.png
diff --git a/lessons/es/alphabet.csv b/lessons/es/alphabet.csv
new file mode 100644
index 0000000..4dced1d
--- /dev/null
+++ b/lessons/es/alphabet.csv
@@ -0,0 +1,36 @@
+# Copyright (c) 2011 Walter Bender y Pacita Pena,,,,,,
+# This work is licensed under a Creative Commons,,,,,,
+# Attribution-NonCommercial 3.0 Unported License.,,,,,,
+# These words represent Nivel 1 in Spanish,,,,,,
+# Use () for highlighted letter in phrase.,,,,,,
+# letter, phrase, RGB color, color name, vowel or consonant, sound file,
+A, (a)ve, #FFFFFF, ave.png, ave.ogg, a.ogg
+B, (b)urro, #2080A0, burro.png, burro.ogg, b.ogg
+C, (c)onejo, #FFC040, conejo.png, conejo.ogg, c.ogg
+D, (d)a(d)o, #20C060, dado.png, dado.ogg, d.ogg
+E, (e)l(e)fant(e), #70A9CE, elefante.png, elefante.ogg, e.ogg
+F, (f)lor, #C160D2, flor.png, flor.ogg, f.ogg
+G, (g)ato, #A0A0A0, gato.png, gato.ogg, g.ogg
+H, (h)elado, #FFFFFF, helado.png, helado.ogg, h.ogg
+I, (i)gles(i)a, #DE1C23, iglesia.png, iglesia.ogg, i.ogg
+J, (j)irafa, #C93C7E, jirafa.png, jirafa.ogg, j.ogg
+K, (k)ilo, #FFC040, kilo.png, kilo.ogg, k.ogg
+L, (l)oro, #00A0FF, loro.png, loro.ogg, l.ogg
+M, (m)esa, #C72020, mesa.png, mesa.ogg, m.ogg
+N, (n)ube, #7A6BBD, nube.png, nube.ogg, n.ogg
+Ñ, (ñ)andú, #80C040/#C93C7E, nandu.png, nandu.ogg, ny.ogg
+O, (o)s(o), #A4221E, oso.png, oso.ogg, o.ogg
+P, (p)ato, #A4221E, pato.png, pato.ogg, p.ogg
+Q, (q)ueso, #FFC040, queso.png, queso.ogg, q.ogg
+R, (r)atón, #F08020, raton.png, raton.ogg, r.ogg
+S, (s)apo, #7EC93C, sapo.png, sapo.ogg, s.ogg
+T, (t)aza, #EE3C8E, taza.png, taza.ogg, t.ogg
+U, (u)va, #00A000, uva.png, uva.ogg, u.ogg
+V, (v)aca, #2080A0, vaca.png, vaca.ogg, v.ogg
+W, (w)aterpolo, #808080, waterpolo.png, waterpolo.ogg, w.ogg
+X, (x)ilófono, #7EC93C, xilofono.png, xilofono.ogg, x.ogg
+Y, (y)ate, #BA6C71, yate.png, yate.ogg, y.ogg
+# Y, Paragua(y), #DE1C23, paraguay.png, paraguay.ogg, y.ogg
+Z, (z)apato, #7EC93C, zapato.png, zapato.ogg, z.ogg
+# RR, pe(rr)o, #F08020, perro.png, perro.ogg, rr.ogg
+# LL, (ll)ama, #C93C7E, llama.png, llama.ogg, ll.ogg
diff --git a/page.py b/page.py
new file mode 100644
index 0000000..b2ac3ef
--- /dev/null
+++ b/page.py
@@ -0,0 +1,364 @@
+# -*- coding: utf-8 -*-
+#Copyright (c) 2012 Walter Bender
+
+# 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.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+import gtk
+import gobject
+import os
+import codecs
+from random import uniform
+
+from gettext import gettext as _
+
+from utils.play_audio import play_audio_from_file
+
+import logging
+_logger = logging.getLogger('iknowmyabcs-activity')
+
+try:
+    from sugar.graphics import style
+    GRID_CELL_SIZE = style.GRID_CELL_SIZE
+except ImportError:
+    GRID_CELL_SIZE = 0
+
+from genpieces import generate_card
+from utils.sprites import Sprites, Sprite
+
+
+XDIM = 3
+YDIM = 3
+GUTTER = 4
+
+
+class Page():
+    ''' Pages from Infuse Reading method '''
+
+    def __init__(self, canvas, lessons_path, images_path, sounds_path,
+                 parent=None):
+        ''' The general stuff we need to track '''
+        self._activity = parent
+        self._lessons_path = lessons_path
+        self._images_path = images_path
+        self._sounds_path = sounds_path
+
+        self._card_data = []
+        self._color_data = []
+        self._image_data = []
+        self._media_data = []  # (image sound, letter sound)
+        self._word_data = []
+
+        # Starting from command line
+        if self._activity is None:
+            self._sugar = False
+            self._canvas = canvas
+        else:
+            self._sugar = True
+            self._canvas = canvas
+            self._activity.show_all()
+
+        self._canvas.set_flags(gtk.CAN_FOCUS)
+        self._canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK)
+        self._canvas.add_events(gtk.gdk.BUTTON_RELEASE_MASK)
+        self._canvas.connect("expose-event", self._expose_cb)
+        self._canvas.connect("button-press-event", self._button_press_cb)
+        self._canvas.connect("button-release-event", self._button_release_cb)
+        self._canvas.connect("key_press_event", self._keypress_cb)
+        self._width = gtk.gdk.screen_width()
+        self._height = gtk.gdk.screen_height()
+        self._card_width = int((self._width / XDIM)) - GUTTER * 2
+        self._card_height = int((self._height - GRID_CELL_SIZE) / YDIM) \
+            - GUTTER * 2
+        self._grid_x_offset = int(
+            (self._width - XDIM * (self._card_width + GUTTER * 2)) / 2)
+        self._grid_y_offset = 0
+        # self._scale = self._width / 240.
+        self._scale = self._card_width / 80
+        self._sprites = Sprites(self._canvas)
+        self.current_card = 0
+        self._cards = []
+        self._pictures = []
+        self._press = None
+        self._release = None
+        self.timeout = None
+        self.target = 0
+        self.answers = [0, 0, 0, 0, 0, 0]
+
+        self.load_level(os.path.join(self._lessons_path, 'alphabet' + '.csv'))
+
+        # Create the cards we'll need
+        self._alpha_cards()
+        self._image_cards()
+
+        self.new_page()
+
+    def new_page(self):
+        ''' Load a page of cards '''
+        if self.timeout is not None:
+            gobject.source_remove(self.timeout)
+        self._hide_cards()
+        self.new_target()
+        x = self._grid_x_offset + self._card_width + GUTTER * 3
+        y = self._grid_y_offset + GUTTER
+        if self._activity.mode == 'letter':
+            self._cards[self.target].move((x, y))
+            self._cards[self.target].set_layer(100)
+            x = self._grid_x_offset + GUTTER
+            y = self._grid_y_offset + self._card_height + GUTTER * 3
+            for i in range(len(self.answers)):
+                self._pictures[self.answers[i]].move((x, y))
+                self._pictures[self.answers[i]].set_layer(100)
+                x += self._card_width + GUTTER * 2
+                if x > self._width - (self._card_width / 2):
+                    x = self._grid_x_offset + GUTTER
+                    y += self._card_height + GUTTER * 2
+        else:
+            self._pictures[self.target].move((x, y))
+            self._pictures[self.target].set_layer(100)
+            x = self._grid_x_offset + GUTTER
+            y = self._grid_y_offset + self._card_height + GUTTER * 3
+            for i in range(len(self.answers)):
+                self._cards[self.answers[i]].move((x, y))
+                self._cards[self.answers[i]].set_layer(100)
+                x += self._card_width + GUTTER * 2
+                if x > self._width - (self._card_width / 2):
+                    x = self._grid_x_offset + GUTTER
+                    y += self._card_height + GUTTER * 2
+
+    def _hide_cards(self):
+        if len(self._cards) > 0:
+            for card in self._cards:
+                card.hide()
+        if len(self._pictures) > 0:
+            for card in self._pictures:
+                card.hide()
+
+    def _image_cards(self):
+        for card in self._card_data:
+            self.current_card = self._card_data.index(card)
+            imagefilename = self._image_data[self.current_card]
+            imagepath = os.path.join(self._images_path, imagefilename)
+            pixbuf = image_file_to_pixbuf(imagepath, self._card_width,
+                                          self._card_height)
+            self._pictures.append(Sprite(self._sprites, 0, 0, pixbuf))
+
+    def _alpha_cards(self):
+        for card in self._card_data:
+            self.current_card = self._card_data.index(card)
+            # Two-tone cards add some complexity.
+            if type(self._color_data[self.current_card][0]) == type([]):
+                stroke = self._test_for_stroke()
+                top = svg_str_to_pixbuf(generate_card(
+                        string=card[0].lower(),
+                        colors=[self._color_data[self.current_card][0][0],
+                                '#FFFFFF'],
+                        scale=self._scale,
+                        center=True))
+                bot = svg_str_to_pixbuf(generate_card(
+                        string=card[0].lower(),
+                        colors=[self._color_data[self.current_card][0][1],
+                                '#FFFFFF'],
+                        scale=self._scale,
+                        center=True))
+                # Where to draw the line
+                h1 = 9 / 16.
+                h2 = 1.0 - h1
+                bot.composite(top, 0, int(h1 * top.get_height()),
+                              top.get_width(), int(h2 * top.get_height()),
+                              0, 0, 1, 1, gtk.gdk.INTERP_NEAREST, 255)
+                self._cards.append(Sprite(self._sprites, 0, 0, top))
+            else:
+                stroke = self._test_for_stroke()
+                self._cards.append(Sprite(self._sprites, 0, 0,
+                                          svg_str_to_pixbuf(generate_card(
+                                string=card[0].lower(),
+                                colors=[self._color_data[self.current_card][0],
+                                        '#FFFFFF'],
+                                stroke=stroke,
+                                scale=self._scale, center=True))))
+
+    def _test_for_stroke(self):
+        ''' Light colors get a surrounding stroke '''
+        if self._color_data[self.current_card][0][0:4] == '#FFF':
+            return True
+        else:
+            return False
+
+    def new_target(self):
+        ''' Generate a new target and answer list '''
+        self._activity.status.set_text(
+            _('Click on the card that corresponds to the sound.'))
+        self.target = int(uniform(0, len(self._cards)))
+
+        for i in range(6):
+            self.answers[i] = self.target
+        for i in range(6):
+            while self._bad_answer(i):
+                self.answers[i] = int(uniform(0, len(self._cards)))
+        i = int(uniform(0, 6))
+        self.answers[i] = self.target
+
+        if self.timeout is not None:
+            gobject.source_remove(self.timeout)
+        self.timeout = gobject.timeout_add(1000, self._play_target_sound)
+
+    def _bad_answer(self, i):
+        ''' Make sure answer is unique '''
+        if self.answers[i] == self.target:
+            return True
+        for j in range(6):
+            if i == j:
+                continue
+            if self.answers[i] == self.answers[j]:
+                return True
+        return False
+
+    def _play_target_sound(self):
+        if self._activity.mode == 'letter':
+            play_audio_from_file(self, os.path.join(
+                    self._sounds_path,
+                    self._media_data[self.target][1]))
+        else:
+            play_audio_from_file(self, os.path.join(
+                    self._sounds_path,
+                    self._media_data[self.target][0]))
+        self.timeout = None
+
+    def _button_press_cb(self, win, event):
+        ''' Either a card or list entry was pressed. '''
+        win.grab_focus()
+        x, y = map(int, event.get_coords())
+
+        spr = self._sprites.find_sprite((x, y))
+        self._press = spr
+        self._release = None
+        return True
+
+    def _button_release_cb(self, win, event):
+        ''' Play a sound or video or jump to a card as indexed in the list. '''
+        win.grab_focus()
+
+        x, y = map(int, event.get_coords())
+        spr = self._sprites.find_sprite((x, y))
+        self.current_card = -1
+        if spr in self._cards:
+            self.current_card = self._cards.index(spr)
+        elif spr in self._pictures:
+            self.current_card = self._pictures.index(spr)
+        if self.current_card == -1:
+            return
+
+        if self._activity.mode == 'letter':
+            if spr in self._cards:
+                play_audio_from_file(self, os.path.join(
+                        self._sounds_path,
+                        self._media_data[self.current_card][1]))
+                return
+            play_audio_from_file(self, os.path.join(
+                    self._sounds_path,
+                    self._media_data[self.current_card][0]))
+        else:
+            if spr in self._pictures:
+                play_audio_from_file(self, os.path.join(
+                        self._sounds_path,
+                        self._media_data[self.current_card][0]))
+                return
+            play_audio_from_file(self, os.path.join(
+                    self._sounds_path,
+                    self._media_data[self.current_card][1]))
+
+        if self.current_card == self.target:
+            self._activity.status.set_text(_('Very good!'))
+            if self.timeout is not None:
+                gobject.source_remove(self.timeout)
+            self.timeout = gobject.timeout_add(1000, self.new_page)
+        else:
+            self._activity.status.set_text(_('Please try again.'))
+            self._play_target_sound()
+
+    def _keypress_cb(self, area, event):
+        ''' No keyboard shortcuts at the moment. Perhaps jump to the page
+        associated with the key pressed? '''
+        return True
+
+    def _expose_cb(self, win, event):
+        ''' Callback to handle window expose events '''
+        self.do_expose_event(event)
+        return True
+
+    # Handle the expose-event by drawing
+    def do_expose_event(self, event):
+
+        # Create the cairo context
+        cr = self._canvas.window.cairo_create()
+
+        # Restrict Cairo to the exposed area; avoid extra work
+        cr.rectangle(event.area.x, event.area.y,
+                event.area.width, event.area.height)
+        cr.clip()
+
+        # Refresh sprite list
+        self._sprites.redraw_sprites(cr=cr)
+
+    def _destroy_cb(self, win, event):
+        ''' Make a clean exit. '''
+        gtk.main_quit()
+
+    def invalt(self, x, y, w, h):
+        ''' Mark a region for refresh '''
+        self._canvas.window.invalidate_rect(
+            gtk.gdk.Rectangle(int(x), int(y), int(w), int(h)), False)
+
+    def load_level(self, path):
+        ''' Load a level (CSV) from path: letter, word, color, image,
+        image sound, letter sound '''
+        self._card_data = []
+        self._color_data = []
+        self._image_data = []
+        self._media_data = []  # (image sound, letter sound)
+        f = codecs.open(path, encoding='utf-8')
+        for line in f:
+            if len(line) > 0 and line[0] not in '#\n':
+                words = line.split(', ')
+                self._card_data.append([words[0], 
+                                        words[1].replace('-', ', ')])
+                if words[2].count('#') > 1:
+                    self._color_data.append(
+                        [words[2].split('/')])
+                else:
+                    self._color_data.append(
+                        [words[2]])
+                self._image_data.append(words[3])
+                self._media_data.append((words[4], words[5]))
+        f.close()
+
+        self._clear_all()
+        self._cards = []
+        self._colored_letters_lower = []
+        self._colored_letters_upper = []
+
+    def _clear_all(self):
+        ''' Hide everything so we can begin a new page. '''
+        self._hide_cards()
+
+def svg_str_to_pixbuf(svg_string):
+    ''' Load pixbuf from SVG string. '''
+    pl = gtk.gdk.PixbufLoader('svg')
+    pl.write(svg_string)
+    pl.close()
+    pixbuf = pl.get_pixbuf()
+    return pixbuf
+
+
+def image_file_to_pixbuf(file_path, w, h):
+    ''' Load pixbuf from file '''
+    return gtk.gdk.pixbuf_new_from_file_at_size(file_path, int(w), int(h))
+        
diff --git a/setup.py b/setup.py
new file mode 100755
index 0000000..e5026ee
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if len(sys.argv) > 1 and '--no-sugar' == sys.argv[1]:
+    # Remove the argument from the stack so we don't cause problems
+    # for distutils
+    sys.argv.pop(1)
+    
+    import glob, os.path, string
+    from distutils.core import setup
+    
+    DATA_FILES = [
+        ('icons', glob.glob('icons/*')),
+        ('images', glob.glob('images/*')),
+        ('/usr/share/applications', ['turtleart.desktop'])
+        ]
+
+    setup (name = 'Turtle Art',
+           description = "A LOGO-like tool for teaching programming",
+           author = "Walter Bender",
+           author_email = "walter.bender@gmail.com",
+           version = '0.9.4',
+           packages = ['TurtleArt'],
+           scripts = ['turtleart'],
+           data_files = DATA_FILES,
+           )
+else: 
+    from sugar.activity import bundlebuilder
+
+    if __name__ == "__main__":
+        bundlebuilder.start()
diff --git a/sounds/es/a.ogg b/sounds/es/a.ogg
new file mode 100644
index 0000000..d2dbb48
--- /dev/null
+++ b/sounds/es/a.ogg
diff --git a/sounds/es/ave.ogg b/sounds/es/ave.ogg
new file mode 100644
index 0000000..29860b4
--- /dev/null
+++ b/sounds/es/ave.ogg
diff --git a/sounds/es/b.ogg b/sounds/es/b.ogg
new file mode 100644
index 0000000..4483573
--- /dev/null
+++ b/sounds/es/b.ogg
diff --git a/sounds/es/bar.ogg b/sounds/es/bar.ogg
new file mode 100644
index 0000000..af6bf63
--- /dev/null
+++ b/sounds/es/bar.ogg
diff --git a/sounds/es/burro.ogg b/sounds/es/burro.ogg
new file mode 100644
index 0000000..4f31bc8
--- /dev/null
+++ b/sounds/es/burro.ogg
diff --git a/sounds/es/c.ogg b/sounds/es/c.ogg
new file mode 100644
index 0000000..54cbaf3
--- /dev/null
+++ b/sounds/es/c.ogg
diff --git a/sounds/es/conejo.ogg b/sounds/es/conejo.ogg
new file mode 100644
index 0000000..b380e97
--- /dev/null
+++ b/sounds/es/conejo.ogg
diff --git a/sounds/es/d.ogg b/sounds/es/d.ogg
new file mode 100644
index 0000000..0154d53
--- /dev/null
+++ b/sounds/es/d.ogg
diff --git a/sounds/es/dado.ogg b/sounds/es/dado.ogg
new file mode 100644
index 0000000..1803e13
--- /dev/null
+++ b/sounds/es/dado.ogg
diff --git a/sounds/es/e.ogg b/sounds/es/e.ogg
new file mode 100644
index 0000000..d554ade
--- /dev/null
+++ b/sounds/es/e.ogg
diff --git a/sounds/es/elefante.ogg b/sounds/es/elefante.ogg
new file mode 100644
index 0000000..6927c4b
--- /dev/null
+++ b/sounds/es/elefante.ogg
diff --git a/sounds/es/f.ogg b/sounds/es/f.ogg
new file mode 100644
index 0000000..49fd4a4
--- /dev/null
+++ b/sounds/es/f.ogg
diff --git a/sounds/es/flor.ogg b/sounds/es/flor.ogg
new file mode 100644
index 0000000..3d7fd8c
--- /dev/null
+++ b/sounds/es/flor.ogg
diff --git a/sounds/es/foo.ogg b/sounds/es/foo.ogg
new file mode 100644
index 0000000..3228300
--- /dev/null
+++ b/sounds/es/foo.ogg
diff --git a/sounds/es/g.ogg b/sounds/es/g.ogg
new file mode 100644
index 0000000..baadadc
--- /dev/null
+++ b/sounds/es/g.ogg
diff --git a/sounds/es/gato.ogg b/sounds/es/gato.ogg
new file mode 100644
index 0000000..fb12f26
--- /dev/null
+++ b/sounds/es/gato.ogg
diff --git a/sounds/es/h.ogg b/sounds/es/h.ogg
new file mode 100644
index 0000000..0bf97f2
--- /dev/null
+++ b/sounds/es/h.ogg
diff --git a/sounds/es/helado.ogg b/sounds/es/helado.ogg
new file mode 100644
index 0000000..6ef18c4
--- /dev/null
+++ b/sounds/es/helado.ogg
diff --git a/sounds/es/i.ogg b/sounds/es/i.ogg
new file mode 100644
index 0000000..efafdc2
--- /dev/null
+++ b/sounds/es/i.ogg
diff --git a/sounds/es/iglesia.ogg b/sounds/es/iglesia.ogg
new file mode 100644
index 0000000..bf715a0
--- /dev/null
+++ b/sounds/es/iglesia.ogg
diff --git a/sounds/es/j.ogg b/sounds/es/j.ogg
new file mode 100644
index 0000000..9c2b5ba
--- /dev/null
+++ b/sounds/es/j.ogg
diff --git a/sounds/es/jirafa.ogg b/sounds/es/jirafa.ogg
new file mode 100644
index 0000000..851017a
--- /dev/null
+++ b/sounds/es/jirafa.ogg
diff --git a/sounds/es/k.ogg b/sounds/es/k.ogg
new file mode 100644
index 0000000..a26e808
--- /dev/null
+++ b/sounds/es/k.ogg
diff --git a/sounds/es/kilo.ogg b/sounds/es/kilo.ogg
new file mode 100644
index 0000000..a1c60fc
--- /dev/null
+++ b/sounds/es/kilo.ogg
diff --git a/sounds/es/l.ogg b/sounds/es/l.ogg
new file mode 100644
index 0000000..64b8bf1
--- /dev/null
+++ b/sounds/es/l.ogg
diff --git a/sounds/es/ll.ogg b/sounds/es/ll.ogg
new file mode 100644
index 0000000..f3b5ae5
--- /dev/null
+++ b/sounds/es/ll.ogg
diff --git a/sounds/es/llama.ogg b/sounds/es/llama.ogg
new file mode 100644
index 0000000..f89a27d
--- /dev/null
+++ b/sounds/es/llama.ogg
diff --git a/sounds/es/loro.ogg b/sounds/es/loro.ogg
new file mode 100644
index 0000000..34dfed1
--- /dev/null
+++ b/sounds/es/loro.ogg
diff --git a/sounds/es/m.ogg b/sounds/es/m.ogg
new file mode 100644
index 0000000..b678041
--- /dev/null
+++ b/sounds/es/m.ogg
diff --git a/sounds/es/mesa.ogg b/sounds/es/mesa.ogg
new file mode 100644
index 0000000..6f892f4
--- /dev/null
+++ b/sounds/es/mesa.ogg
diff --git a/sounds/es/n.ogg b/sounds/es/n.ogg
new file mode 100644
index 0000000..70d6423
--- /dev/null
+++ b/sounds/es/n.ogg
diff --git a/sounds/es/nandu.ogg b/sounds/es/nandu.ogg
new file mode 100644
index 0000000..0050650
--- /dev/null
+++ b/sounds/es/nandu.ogg
diff --git a/sounds/es/nube.ogg b/sounds/es/nube.ogg
new file mode 100644
index 0000000..ffdee11
--- /dev/null
+++ b/sounds/es/nube.ogg
diff --git a/sounds/es/ny.ogg b/sounds/es/ny.ogg
new file mode 100644
index 0000000..71496f8
--- /dev/null
+++ b/sounds/es/ny.ogg
diff --git a/sounds/es/o.ogg b/sounds/es/o.ogg
new file mode 100644
index 0000000..dc6efda
--- /dev/null
+++ b/sounds/es/o.ogg
diff --git a/sounds/es/oso.ogg b/sounds/es/oso.ogg
new file mode 100644
index 0000000..6760ce0
--- /dev/null
+++ b/sounds/es/oso.ogg
diff --git a/sounds/es/p.ogg b/sounds/es/p.ogg
new file mode 100644
index 0000000..bf3f117
--- /dev/null
+++ b/sounds/es/p.ogg
diff --git a/sounds/es/paraguay.ogg b/sounds/es/paraguay.ogg
new file mode 100644
index 0000000..a3c6f03
--- /dev/null
+++ b/sounds/es/paraguay.ogg
diff --git a/sounds/es/pato.ogg b/sounds/es/pato.ogg
new file mode 100644
index 0000000..da9a548
--- /dev/null
+++ b/sounds/es/pato.ogg
diff --git a/sounds/es/perro.ogg b/sounds/es/perro.ogg
new file mode 100644
index 0000000..3892df9
--- /dev/null
+++ b/sounds/es/perro.ogg
diff --git a/sounds/es/q.ogg b/sounds/es/q.ogg
new file mode 100644
index 0000000..3bc4623
--- /dev/null
+++ b/sounds/es/q.ogg
diff --git a/sounds/es/queso.ogg b/sounds/es/queso.ogg
new file mode 100644
index 0000000..80153f5
--- /dev/null
+++ b/sounds/es/queso.ogg
diff --git a/sounds/es/r.ogg b/sounds/es/r.ogg
new file mode 100644
index 0000000..37f5333
--- /dev/null
+++ b/sounds/es/r.ogg
diff --git a/sounds/es/raton.ogg b/sounds/es/raton.ogg
new file mode 100644
index 0000000..a2d50a4
--- /dev/null
+++ b/sounds/es/raton.ogg
diff --git a/sounds/es/rr.ogg b/sounds/es/rr.ogg
new file mode 100644
index 0000000..7829330
--- /dev/null
+++ b/sounds/es/rr.ogg
diff --git a/sounds/es/s.ogg b/sounds/es/s.ogg
new file mode 100644
index 0000000..da88b9e
--- /dev/null
+++ b/sounds/es/s.ogg
diff --git a/sounds/es/sapo.ogg b/sounds/es/sapo.ogg
new file mode 100644
index 0000000..e36bf5d
--- /dev/null
+++ b/sounds/es/sapo.ogg
diff --git a/sounds/es/t.ogg b/sounds/es/t.ogg
new file mode 100644
index 0000000..05a412a
--- /dev/null
+++ b/sounds/es/t.ogg
diff --git a/sounds/es/taza.ogg b/sounds/es/taza.ogg
new file mode 100644
index 0000000..407e9dc
--- /dev/null
+++ b/sounds/es/taza.ogg
diff --git a/sounds/es/u.ogg b/sounds/es/u.ogg
new file mode 100644
index 0000000..da2c789
--- /dev/null
+++ b/sounds/es/u.ogg
diff --git a/sounds/es/uva.ogg b/sounds/es/uva.ogg
new file mode 100644
index 0000000..1d7a619
--- /dev/null
+++ b/sounds/es/uva.ogg
diff --git a/sounds/es/v.ogg b/sounds/es/v.ogg
new file mode 100644
index 0000000..1ab3199
--- /dev/null
+++ b/sounds/es/v.ogg
diff --git a/sounds/es/vaca.ogg b/sounds/es/vaca.ogg
new file mode 100644
index 0000000..5e28f67
--- /dev/null
+++ b/sounds/es/vaca.ogg
diff --git a/sounds/es/w doble.ogg b/sounds/es/w doble.ogg
new file mode 100644
index 0000000..df24381
--- /dev/null
+++ b/sounds/es/w doble.ogg
diff --git a/sounds/es/w.ogg b/sounds/es/w.ogg
new file mode 120000
index 0000000..0d38242
--- /dev/null
+++ b/sounds/es/w.ogg
@@ -0,0 +1 @@
+w doble.ogg
\ No newline at end of file
diff --git a/sounds/es/waterpolo.ogg b/sounds/es/waterpolo.ogg
new file mode 100644
index 0000000..c28e26b
--- /dev/null
+++ b/sounds/es/waterpolo.ogg
diff --git a/sounds/es/x.ogg b/sounds/es/x.ogg
new file mode 100644
index 0000000..863aa80
--- /dev/null
+++ b/sounds/es/x.ogg
diff --git a/sounds/es/xilofono.ogg b/sounds/es/xilofono.ogg
new file mode 100644
index 0000000..03ef577
--- /dev/null
+++ b/sounds/es/xilofono.ogg
diff --git a/sounds/es/y.ogg b/sounds/es/y.ogg
new file mode 100644
index 0000000..33f1efc
--- /dev/null
+++ b/sounds/es/y.ogg
diff --git a/sounds/es/yate.ogg b/sounds/es/yate.ogg
new file mode 100644
index 0000000..2832b76
--- /dev/null
+++ b/sounds/es/yate.ogg
diff --git a/sounds/es/z.ogg b/sounds/es/z.ogg
new file mode 100644
index 0000000..8677a4f
--- /dev/null
+++ b/sounds/es/z.ogg
diff --git a/sounds/es/zapato.ogg b/sounds/es/zapato.ogg
new file mode 100644
index 0000000..18cecb5
--- /dev/null
+++ b/sounds/es/zapato.ogg
diff --git a/utils/__init__.py b/utils/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/utils/__init__.py
diff --git a/utils/play_audio.py b/utils/play_audio.py
new file mode 100644
index 0000000..2ed445b
--- /dev/null
+++ b/utils/play_audio.py
@@ -0,0 +1,34 @@
+"""
+ aplay.py
+ refactored based on Jukebox Activity
+ Copyright (C) 2007 Andy Wingo <wingo@pobox.com>
+ Copyright (C) 2007 Red Hat, Inc.
+ Copyright (C) 2008-2010 Kushal Das <kushal@fedoraproject.org>
+ Copyright (C) 2010-11 Walter Bender
+"""
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+
+import subprocess
+
+def play_audio_from_file(parent, file_path):
+    """ Audio media """
+    command_line = ['gst-launch', 'filesrc', 'location=' + file_path,
+                    '! oggdemux', '! vorbisdec', '! audioconvert',
+                    '! alsasink']
+    subprocess.call(command_line)
+
diff --git a/utils/sprites.py b/utils/sprites.py
new file mode 100644
index 0000000..844e171
--- /dev/null
+++ b/utils/sprites.py
@@ -0,0 +1,483 @@
+# -*- coding: utf-8 -*-
+
+#Copyright (c) 2007-8, Playful Invention Company.
+#Copyright (c) 2008-11 Walter Bender
+
+#Permission is hereby granted, free of charge, to any person obtaining a copy
+#of this software and associated documentation files (the "Software"), to deal
+#in the Software without restriction, including without limitation the rights
+#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#copies of the Software, and to permit persons to whom the Software is
+#furnished to do so, subject to the following conditions:
+
+#The above copyright notice and this permission notice shall be included in
+#all copies or substantial portions of the Software.
+
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#THE SOFTWARE.
+
+'''
+
+sprites.py is a simple sprites library for managing graphics objects,
+'sprites', on a gtk.DrawingArea. It manages multiple sprites with
+methods such as move, hide, set_layer, etc.
+
+There are two classes:
+
+class Sprites maintains a collection of sprites
+class Sprite manages individual sprites within the collection.
+
+Example usage:
+        # Import the classes into your program.
+        from sprites import Sprites Sprite
+
+        # Create a new sprite collection associated with your widget
+        self.sprite_list = Sprites(widget)
+
+        # Create a "pixbuf" (in this example, from SVG).
+        my_pixbuf = svg_str_to_pixbuf("<svg>...some svg code...</svg>")
+
+        # Create a sprite at position x1, y1.
+        my_sprite = sprites.Sprite(self.sprite_list, x1, y1, my_pixbuf)
+
+        # Move the sprite to a new position.
+        my_sprite.move((x1+dx, y1+dy))
+
+        # Create another "pixbuf".
+        your_pixbuf = svg_str_to_pixbuf("<svg>...some svg code...</svg>")
+
+        # Create a sprite at position x2, y2.
+        your_sprite = sprites.Sprite(self.sprite_list, x2, y2, my_pixbuf)
+
+        # Assign the sprites to layers.
+        # In this example, your_sprite will be on top of my_sprite.
+        my_sprite.set_layer(100)
+        your_sprite.set_layer(200)
+
+        # Now put my_sprite on top of your_sprite.
+        my_sprite.set_layer(300)
+
+        cr = self.window.cairo_create()
+        # In your activity's do_expose_event, put in a call to redraw_sprites
+        self.sprites.redraw_sprites(event.area, cairo_context)
+
+# method for converting SVG to a gtk pixbuf
+def svg_str_to_pixbuf(svg_string):
+    pl = gtk.gdk.PixbufLoader('svg')
+    pl.write(svg_string)
+    pl.close()
+    pixbuf = pl.get_pixbuf()
+    return pixbuf
+
+'''
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+import pango
+import pangocairo
+import cairo
+
+
+class Sprites:
+    ''' A class for the list of sprites and everything they share in common '''
+
+    def __init__(self, widget):
+        ''' Initialize an empty array of sprites '''
+        self.widget = widget
+        self.list = []
+        self.cr = None
+
+    def set_cairo_context(self, cr):
+        ''' Cairo context may be set or reset after __init__ '''
+        self.cr = cr
+
+    def get_sprite(self, i):
+        ''' Return a sprint from the array '''
+        if i < 0 or i > len(self.list) - 1:
+            return(None)
+        else:
+            return(self.list[i])
+
+    def length_of_list(self):
+        ''' How many sprites are there? '''
+        return(len(self.list))
+
+    def append_to_list(self, spr):
+        ''' Append a new sprite to the end of the list. '''
+        self.list.append(spr)
+
+    def insert_in_list(self, spr, i):
+        ''' Insert a sprite at position i. '''
+        if i < 0:
+            self.list.insert(0, spr)
+        elif i > len(self.list) - 1:
+            self.list.append(spr)
+        else:
+            self.list.insert(i, spr)
+
+    def find_in_list(self, spr):
+        if spr in self.list:
+            return True
+        return False
+
+    def remove_from_list(self, spr):
+        ''' Remove a sprite from the list. '''
+        if spr in self.list:
+            self.list.remove(spr)
+
+    def find_sprite(self, pos, region=False):
+        ''' Search based on (x, y) position. Return the 'top/first' one. '''
+        list = self.list[:]
+        list.reverse()
+        for spr in list:
+            if spr.hit(pos, readpixel=not region):
+                return spr
+        return None
+
+    def redraw_sprites(self, area=None, cr=None):
+        ''' Redraw the sprites that intersect area. '''
+        # I think I need to do this to save Cairo some work
+        if cr is None:
+            cr = self.cr
+        else:
+            self.cr = cr
+        if cr is None:
+            print 'sprites.redraw_sprites: no Cairo context'
+            return
+        for spr in self.list:
+            if area is None:
+                spr.draw(cr=cr)
+            else:
+                intersection = spr.rect.intersect(area)
+                if intersection.width > 0 or intersection.height > 0:
+                    spr.draw(cr=cr)
+
+
+class Sprite:
+    ''' A class for the individual sprites '''
+
+    def __init__(self, sprites, x, y, image):
+        ''' Initialize an individual sprite '''
+        self._sprites = sprites
+        self.save_xy = (x, y)  # remember initial (x, y) position
+        self.rect = gtk.gdk.Rectangle(int(x), int(y), 0, 0)
+        self._scale = [12]
+        self._rescale = [True]
+        self._horiz_align = ["center"]
+        self._vert_align = ["middle"]
+        self._x_pos = [None]
+        self._y_pos = [None]
+        self._fd = None
+        self._bold = False
+        self._italic = False
+        self._color = None
+        self._margins = [0, 0, 0, 0]
+        self.layer = 100
+        self.labels = []
+        self.cached_surfaces = []
+        self._dx = []  # image offsets
+        self._dy = []
+        self.type = None
+        self.set_image(image)
+        self._sprites.append_to_list(self)
+
+    def set_image(self, image, i=0, dx=0, dy=0):
+        ''' Add an image to the sprite. '''
+        while len(self.cached_surfaces) < i + 1:
+            self.cached_surfaces.append(None)
+            self._dx.append(0)
+            self._dy.append(0)
+        self._dx[i] = dx
+        self._dy[i] = dy
+        if isinstance(image, gtk.gdk.Pixbuf) or \
+           isinstance(image, cairo.ImageSurface):
+            w = image.get_width()
+            h = image.get_height()
+        else:
+            w, h = image.get_size()
+        if i == 0:  # Always reset width and height when base image changes.
+            self.rect.width = w + dx
+            self.rect.height = h + dy
+        else:
+            if w + dx > self.rect.width:
+                self.rect.width = w + dx
+            if h + dy > self.rect.height:
+                self.rect.height = h + dy
+        if isinstance(image, cairo.ImageSurface):
+            self.cached_surfaces[i] = image
+        else:  # Convert to Cairo surface
+            surface = cairo.ImageSurface(
+                cairo.FORMAT_ARGB32, self.rect.width, self.rect.height)
+            context = cairo.Context(surface)
+            context = gtk.gdk.CairoContext(context)
+            context.set_source_pixbuf(image, 0, 0)
+            context.rectangle(0, 0, self.rect.width, self.rect.height)
+            context.fill()
+            self.cached_surfaces[i] = surface
+
+    def move(self, pos):
+        ''' Move to new (x, y) position '''
+        self.inval()
+        self.rect.x, self.rect.y = int(pos[0]), int(pos[1])
+        self.inval()
+
+    def move_relative(self, pos):
+        ''' Move to new (x+dx, y+dy) position '''
+        self.inval()
+        self.rect.x += int(pos[0])
+        self.rect.y += int(pos[1])
+        self.inval()
+
+    def get_xy(self):
+        ''' Return current (x, y) position '''
+        return (self.rect.x, self.rect.y)
+
+    def get_dimensions(self):
+        ''' Return current size '''
+        return (self.rect.width, self.rect.height)
+
+    def get_layer(self):
+        ''' Return current layer '''
+        return self.layer
+
+    def set_shape(self, image, i=0):
+        ''' Set the current image associated with the sprite '''
+        self.inval()
+        self.set_image(image, i)
+        self.inval()
+
+    def set_layer(self, layer=None):
+        ''' Set the layer for a sprite '''
+        self._sprites.remove_from_list(self)
+        if layer is not None:
+            self.layer = layer
+        for i in range(self._sprites.length_of_list()):
+            if self.layer < self._sprites.get_sprite(i).layer:
+                self._sprites.insert_in_list(self, i)
+                self.inval()
+                return
+        self._sprites.append_to_list(self)
+        self.inval()
+
+    def set_label(self, new_label, i=0):
+        ''' Set the label drawn on the sprite '''
+        self._extend_labels_array(i)
+        if type(new_label) is str or type(new_label) is unicode:
+            # pango doesn't like nulls
+            self.labels[i] = new_label.replace("\0", " ")
+        else:
+            self.labels[i] = str(new_label)
+        self.inval()
+
+    def set_margins(self, l=0, t=0, r=0, b=0):
+        ''' Set the margins for drawing the label '''
+        self._margins = [l, t, r, b]
+
+    def _extend_labels_array(self, i):
+        ''' Append to the labels attribute list '''
+        if self._fd is None:
+            self.set_font('Sans')
+        if self._color is None:
+            self._color = (0., 0., 0.)
+        while len(self.labels) < i + 1:
+            self.labels.append(" ")
+            self._scale.append(self._scale[0])
+            self._rescale.append(self._rescale[0])
+            self._horiz_align.append(self._horiz_align[0])
+            self._vert_align.append(self._vert_align[0])
+            self._x_pos.append(self._x_pos[0])
+            self._y_pos.append(self._y_pos[0])
+
+    def set_font(self, font):
+        ''' Set the font for a label '''
+        self._fd = pango.FontDescription(font)
+
+    def set_label_color(self, rgb):
+        ''' Set the font color for a label '''
+        COLORTABLE = {'black': '#000000', 'white': '#FFFFFF',
+                      'red': '#FF0000', 'yellow': '#FFFF00',
+                      'green': '#00FF00', 'cyan': '#00FFFF',
+                      'blue': '#0000FF', 'purple': '#FF00FF',
+                      'gray': '#808080'}
+        if rgb.lower() in COLORTABLE:
+            rgb = COLORTABLE[rgb.lower()]
+        # Convert from '#RRGGBB' to floats
+        self._color = (int('0x' + rgb[1:3], 16) / 256.,
+                       int('0x' + rgb[3:5], 16) / 256.,
+                       int('0x' + rgb[5:7], 16) / 256.)
+        return
+
+    def set_label_attributes(self, scale, rescale=True, horiz_align="center",
+                             vert_align="middle", x_pos=None, y_pos=None, i=0):
+        ''' Set the various label attributes '''
+        self._extend_labels_array(i)
+        self._scale[i] = scale
+        self._rescale[i] = rescale
+        self._horiz_align[i] = horiz_align
+        self._vert_align[i] = vert_align
+        self._x_pos[i] = x_pos
+        self._y_pos[i] = y_pos
+
+    def hide(self):
+        ''' Hide a sprite '''
+        self.inval()
+        self._sprites.remove_from_list(self)
+
+    def restore(self):
+        ''' Restore a hidden sprite '''
+        self.set_layer()
+
+    def inval(self):
+        ''' Invalidate a region for gtk '''
+        self._sprites.widget.queue_draw_area(self.rect.x,
+                                             self.rect.y,
+                                             self.rect.width,
+                                             self.rect.height)
+
+    def draw(self, cr=None):
+        ''' Draw the sprite (and label) '''
+        if cr is None:
+            print 'sprite.draw: no Cairo context.'
+            return
+        for i, surface in enumerate(self.cached_surfaces):
+            cr.set_source_surface(surface,
+                                  self.rect.x + self._dx[i],
+                                  self.rect.y + self._dy[i])
+            cr.rectangle(self.rect.x + self._dx[i],
+                         self.rect.y + self._dy[i],
+                         self.rect.width,
+                         self.rect.height)
+            cr.fill()
+
+        if len(self.labels) > 0:
+            self.draw_label(cr)
+
+    def hit(self, pos, readpixel=False):
+        ''' Is (x, y) on top of the sprite? '''
+        x, y = pos
+        if x < self.rect.x:
+            return False
+        if x > self.rect.x + self.rect.width:
+            return False
+        if y < self.rect.y:
+            return False
+        if y > self.rect.y + self.rect.height:
+            return False
+        if readpixel:
+            r, g, b, a = self.get_pixel(pos)
+            if r == g == b == a == 0:
+                return False
+            if a == -1:
+                return False
+        return self._sprites.find_in_list(self)
+
+    def draw_label(self, cr):
+        ''' Draw the label based on its attributes '''
+        # Create a pangocairo context
+        cr = pangocairo.CairoContext(cr)
+        my_width = self.rect.width - self._margins[0] - self._margins[2]
+        if my_width < 0:
+            my_width = 0
+        my_height = self.rect.height - self._margins[1] - self._margins[3]
+        for i in range(len(self.labels)):
+            if hasattr(self, 'pl'):  # Reuse the pango layout
+                pl = self.pl
+            else:
+                self.pl = cr.create_layout()
+                pl = self.pl
+            pl.set_text(str(self.labels[i]))
+            self._fd.set_size(int(self._scale[i] * pango.SCALE))
+            pl.set_font_description(self._fd)
+            w = pl.get_size()[0] / pango.SCALE
+            if w > my_width:
+                if self._rescale[i]:
+                    self._fd.set_size(
+                            int(self._scale[i] * pango.SCALE * my_width / w))
+                    pl.set_font_description(self._fd)
+                    w = pl.get_size()[0] / pango.SCALE
+                else:
+                    j = len(self.labels[i]) - 1
+                    while(w > my_width and j > 0):
+                        pl.set_text(
+                            "…" + self.labels[i][len(self.labels[i]) - j:])
+                        self._fd.set_size(int(self._scale[i] * pango.SCALE))
+                        pl.set_font_description(self._fd)
+                        w = pl.get_size()[0] / pango.SCALE
+                        j -= 1
+            if self._x_pos[i] is not None:
+                x = int(self.rect.x + self._x_pos[i])
+            elif self._horiz_align[i] == "center":
+                x = int(self.rect.x + self._margins[0] + (my_width - w) / 2)
+            elif self._horiz_align[i] == 'left':
+                x = int(self.rect.x + self._margins[0])
+            else:  # right
+                x = int(self.rect.x + self.rect.width - w - self._margins[2])
+            h = pl.get_size()[1] / pango.SCALE
+            if self._y_pos[i] is not None:
+                y = int(self.rect.y + self._y_pos[i])
+            elif self._vert_align[i] == "middle":
+                y = int(self.rect.y + self._margins[1] + (my_height - h) / 2)
+            elif self._vert_align[i] == "top":
+                y = int(self.rect.y + self._margins[1])
+            else:  # bottom
+                y = int(self.rect.y + self.rect.height - h - self._margins[3])
+
+            cr.save()
+            cr.translate(x, y)
+            cr.set_source_rgb(self._color[0], self._color[1], self._color[2])
+            cr.update_layout(pl)
+            cr.show_layout(pl)
+            cr.restore()
+
+    def label_width(self):
+        ''' Calculate the width of a label '''
+        cr = pangocairo.CairoContext(self._sprites.cr)
+        if cr is not None:
+            max = 0
+            for i in range(len(self.labels)):
+                pl = cr.create_layout()
+                pl.set_text(self.labels[i])
+                self._fd.set_size(int(self._scale[i] * pango.SCALE))
+                pl.set_font_description(self._fd)
+                w = pl.get_size()[0] / pango.SCALE
+                if w > max:
+                    max = w
+            return max
+        else:
+            return self.rect.width
+
+    def label_safe_width(self):
+        ''' Return maximum width for a label '''
+        return self.rect.width - self._margins[0] - self._margins[2]
+
+    def label_safe_height(self):
+        ''' Return maximum height for a label '''
+        return self.rect.height - self._margins[1] - self._margins[3]
+
+    def label_left_top(self):
+        ''' Return the upper-left corner of the label safe zone '''
+        return(self._margins[0], self._margins[1])
+
+    def get_pixel(self, pos, i=0):
+        ''' Return the pixel at (x, y) '''
+        x = int(pos[0] - self.rect.x)
+        y = int(pos[1] - self.rect.y)
+        if x < 0 or x > (self.rect.width - 1) or \
+                y < 0 or y > (self.rect.height - 1):
+            return(-1, -1, -1, -1)
+        # Create a new 1x1 cairo surface.
+        cs = cairo.ImageSurface(cairo.FORMAT_RGB24, 1, 1)
+        cr = cairo.Context(cs)
+        cr.set_source_surface(self.cached_surfaces[i], -x, -y)
+        cr.rectangle(0, 0, 1, 1)
+        cr.set_operator(cairo.OPERATOR_SOURCE)
+        cr.fill()
+        cs.flush()  # Ensure all the writing is done.
+        pixels = cs.get_data()  # Read the pixel.
+        return (ord(pixels[2]), ord(pixels[1]), ord(pixels[0]), 0)
diff --git a/utils/toolbar_utils.py b/utils/toolbar_utils.py
new file mode 100644
index 0000000..563147e
--- /dev/null
+++ b/utils/toolbar_utils.py
@@ -0,0 +1,164 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2011, Walter Bender
+
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
+
+import gtk
+
+from sugar.graphics.radiotoolbutton import RadioToolButton
+from sugar.graphics.toolbutton import ToolButton
+from sugar.graphics.combobox import ComboBox
+from sugar.graphics.toolcombobox import ToolComboBox
+
+
+def combo_factory(combo_array, toolbar, callback, cb_arg=None,
+                  tooltip=None, default=None):
+    '''Factory for making a toolbar combo box'''
+    combo = ComboBox()
+    if tooltip is not None and hasattr(combo, 'set_tooltip_text'):
+        combo.set_tooltip_text(tooltip)
+    if cb_arg is not None:
+        combo.connect('changed', callback, cb_arg)
+    else:
+        combo.connect('changed', callback)
+    for i, selection in enumerate(combo_array):
+        combo.append_item(i, selection, None)
+    combo.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(combo)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    if default is not None:
+        combo.set_active(combo_array.index(default))
+    return combo
+
+
+def entry_factory(default_string, toolbar, tooltip=None, max=3):
+    ''' Factory for adding a text box to a toolbar '''
+    entry = gtk.Entry()
+    entry.set_text(default_string)
+    if tooltip is not None and hasattr(entry, 'set_tooltip_text'):
+        entry.set_tooltip_text(tooltip)
+    entry.set_width_chars(max)
+    entry.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(entry)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    return entry
+
+
+def button_factory(icon_name, toolbar, callback, cb_arg=None, tooltip=None,
+                   accelerator=None):
+    '''Factory for making toolbar buttons'''
+    button = ToolButton(icon_name)
+    if tooltip is not None:
+        button.set_tooltip(tooltip)
+    button.props.sensitive = True
+    if accelerator is not None:
+        button.props.accelerator = accelerator
+    if cb_arg is not None:
+        button.connect('clicked', callback, cb_arg)
+    else:
+        button.connect('clicked', callback)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(button, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(button, -1)
+    button.show()
+    return button
+
+
+def radio_factory(button_name, toolbar, callback, cb_arg=None, tooltip=None,
+                  group=None):
+    ''' Add a radio button to a toolbar '''
+    button = RadioToolButton(group=group)
+    button.set_named_icon(button_name)
+    if callback is not None:
+        if cb_arg is None:
+            button.connect('clicked', callback)
+        else:
+            button.connect('clicked', callback, cb_arg)
+    if hasattr(toolbar, 'insert'):  # Add button to the main toolbar...
+        toolbar.insert(button, -1)
+    else:  # ...or a secondary toolbar.
+        toolbar.props.page.insert(button, -1)
+    button.show()
+    if tooltip is not None:
+        button.set_tooltip(tooltip)
+    return button
+
+
+def label_factory(toolbar, label_text, width=None):
+    ''' Factory for adding a label to a toolbar '''
+    label = gtk.Label(label_text)
+    label.set_line_wrap(True)
+    if width is not None:
+        label.set_size_request(width, -1)  # doesn't work on XOs
+    label.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(label)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    return label
+
+
+def separator_factory(toolbar, expand=False, visible=True):
+    ''' add a separator to a toolbar '''
+    separator = gtk.SeparatorToolItem()
+    separator.props.draw = visible
+    separator.set_expand(expand)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(separator, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(separator, -1)
+    separator.show()
+
+
+def image_factory(image, toolbar, tooltip=None):
+    ''' Add an image to the toolbar '''
+    img = gtk.Image()
+    img.set_from_pixbuf(image)
+    img_tool = gtk.ToolItem()
+    img_tool.add(img)
+    if tooltip is not None:
+        img.set_tooltip_text(tooltip)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(img_tool, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(img_tool, -1)
+    img_tool.show()
+    return img
+
+
+def spin_factory(default, min, max, callback, toolbar):
+    spin_adj = gtk.Adjustment(default, min, max, 1, 32, 0)
+    spin = gtk.SpinButton(spin_adj, 0, 0)
+    spin_id = spin.connect('value-changed', callback)
+    spin.set_numeric(True)
+    spin.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(spin)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    return spin