diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+              GNU GENERAL PUBLIC LICENSE
+                Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                     Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+              END OF TERMS AND CONDITIONS
+
+     How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/benchmarks/ZwirnBenchmarks.hs b/benchmarks/ZwirnBenchmarks.hs
new file mode 100644
--- /dev/null
+++ b/benchmarks/ZwirnBenchmarks.hs
@@ -0,0 +1,23 @@
+module Main where
+
+import Criterion.Main
+import Zwirn.Core.Cord
+import Zwirn.Core.Modulate (fastcat)
+import Zwirn.Core.Query
+import Zwirn.Core.Time
+
+cord :: Cord () () Int
+cord = fastcat $ map pure [1 .. 10]
+
+cord2 :: Cord () () Int
+cord2 = stack $ replicate 10 cord
+
+main :: IO ()
+main =
+  defaultMain
+    [ bgroup
+        "1"
+        [ bench "1" $ nf (map snd . findAllValuesWithTime (Time 0 1, Time 1 1) ()) cord,
+          bench "2" $ nf (map snd . findAllValuesWithTime (Time 0 1, Time 1 1) ()) cord2
+        ]
+    ]
diff --git a/src/Zwirn/Core/Conditional.hs b/src/Zwirn/Core/Conditional.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/Conditional.hs
@@ -0,0 +1,75 @@
+module Zwirn.Core.Conditional where
+
+{-
+    Conditional.hs - conditional functions
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+import Data.Bifunctor (first)
+import Data.Fixed (mod')
+import Zwirn.Core.Core
+import Zwirn.Core.Modulate
+import Zwirn.Core.Time
+import Zwirn.Core.Types
+
+ifthen :: (MultiMonad k) => ZwirnT k st i Bool -> ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+ifthen bz xz yz = innerJoin $ zwirn q
+  where
+    q t st = first (fmap f) <$> unzwirn bz t st
+      where
+        f True = xz
+        f False = yz
+
+iff :: (MultiMonad k, HasSilence k) => ZwirnT k st i Bool -> ZwirnT k st i a -> ZwirnT k st i a
+iff b x = ifthen b x silence
+
+or :: (Applicative k) => ZwirnT k st i Bool -> ZwirnT k st i Bool -> ZwirnT k st i Bool
+or = liftA2 (||)
+
+and :: (Applicative k) => ZwirnT k st i Bool -> ZwirnT k st i Bool -> ZwirnT k st i Bool
+and = liftA2 (&&)
+
+not :: (Functor k) => ZwirnT k st i Bool -> ZwirnT k st i Bool
+not = fmap Prelude.not
+
+eq :: (Eq a, Applicative k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i Bool
+eq = liftA2 (==)
+
+leq :: (Ord a, Applicative k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i Bool
+leq = liftA2 (<=)
+
+geq :: (Ord a, Applicative k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i Bool
+geq = liftA2 (>=)
+
+le :: (Ord a, Applicative k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i Bool
+le = liftA2 (<)
+
+ge :: (Ord a, Applicative k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i Bool
+ge = liftA2 (>)
+
+while :: (MultiMonad k) => ZwirnT k st i Bool -> ZwirnT k st i (ZwirnT k st i a -> ZwirnT k st i a) -> ZwirnT k st i a -> ZwirnT k st i a
+while b f x = ifthen b (squeezeApply f x) x
+
+-- | the first value controls the period the second the length of applying the function in that period
+everyFor :: (Monad k) => ZwirnT k st i Time -> ZwirnT k st i Time -> ZwirnT k st i (ZwirnT k st i a -> ZwirnT k st i a) -> ZwirnT k st i a -> ZwirnT k st i a
+everyFor t1 t2 f x = everyFor' <$> t1 <*> t2 <*> f <$$> x
+  where
+    everyFor' :: (Monad k) => Time -> Time -> (ZwirnT k st i a -> ZwirnT k st i a) -> ZwirnT k st i a -> ZwirnT k st i a
+    everyFor' per for f x = zwirn $ \t st -> if mod' t per <= for then unzwirn (f x) t st else unzwirn x t st
+
+-- | applies function every period for one cycle
+every :: (Monad k) => ZwirnT k st i Time -> ZwirnT k st i (ZwirnT k st i a -> ZwirnT k st i a) -> ZwirnT k st i a -> ZwirnT k st i a
+every x = everyFor x (pure 1)
diff --git a/src/Zwirn/Core/Cord.hs b/src/Zwirn/Core/Cord.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/Cord.hs
@@ -0,0 +1,114 @@
+{-# LANGUAGE FlexibleInstances #-}
+
+module Zwirn.Core.Cord where
+
+{-
+    Cord.hs - functions on parallel signals
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+import Control.Monad (join)
+import Data.Bifunctor (first, second)
+import Zwirn.Core.Core
+import Zwirn.Core.Query
+import Zwirn.Core.Random
+import Zwirn.Core.Time
+import Zwirn.Core.Tree
+import Zwirn.Core.Types
+
+type Cord = ZwirnT Tree
+
+liftList :: ([Tree (Value i a, st)] -> [Tree (Value i b, st)]) -> Cord st i a -> Cord st i b
+liftList f = withInner g
+  where
+    g (Leaf x) = Branch $ f [Leaf x]
+    g (Branch xs) = Branch $ f xs
+
+liftListWithTimeState :: (Time -> st -> [Tree (Value i a, st)] -> [Tree (Value i b, st)]) -> Cord st i a -> Cord st i b
+liftListWithTimeState f = withInnerTimeState g
+  where
+    g t st (Leaf x) = Branch $ f t st [Leaf x]
+    g t st (Branch xs) = Branch $ f t st xs
+
+instance HasSilence Tree where
+  silence = zwirn $ const $ const $ Branch []
+
+-- | get the current depth of the cord
+depth :: Cord st i a -> Cord st i Int
+depth = withInner (\t -> first (fmap (const $ topLength t)) <$> t)
+
+-- | group a list of cords
+stack :: [Cord st i a] -> Cord st i a
+stack zs = zwirn $ \t st -> Branch $ map (\x -> unzwirn x t st) zs
+
+-- | project cord on specific index
+project :: Cord st i Int -> Cord st i a -> Cord st i a
+project i x = withInner . look <$> i <$$> x
+
+-- | layer functions over an input
+layer :: Cord st i (Cord st i a -> Cord st i b) -> Cord st i a -> Cord st i b
+layer fs x = zwirn q
+  where
+    q t st = squeezeJoin $ (\c -> unzwirn c t st) . ($ x) . value . fst <$> unzwirn fs t st
+
+-- | insert cord a specific index
+insert :: Cord st i Int -> Cord st i a -> Cord st i a -> Cord st i a
+insert ic x y = (($ y) . ($ x)) . insert' =<< ic
+  where
+    insert' :: Int -> Cord st i a -> Cord st i a -> Cord st i a
+    insert' i x ys = zwirn $ \t st -> insertT i (unzwirn x t st) (unzwirn ys t st)
+
+-- | remove cord at specific index
+remove :: Cord st i Int -> Cord st i a -> Cord st i a
+remove i x = withInner . removeT <$> i <$$> x
+
+-- | apply function to specific index
+at :: Cord st i Int -> Cord st i (Cord st i a -> Cord st i a) -> Cord st i a -> Cord st i a
+at i f x = insert i (innerApply f $ project i x) (remove i x)
+
+arp :: Cord st i a -> Cord st i a
+arp = withInner trans
+  where
+    trans :: Tree (Value i a, st) -> Tree (Value i a, st)
+    trans (Leaf x) = Leaf x
+    trans (Branch []) = Branch []
+    trans (Branch xs) = Branch $ map (\i -> shif (length xs) i (xs !! i)) [0 .. length xs - 1]
+      where
+        shif :: Int -> Int -> Tree (Value i a, st) -> Tree (Value i a, st)
+        shif total i x = first (\v -> v {time = time v - fromIntegral i / fromIntegral total}) <$> x
+
+reverseC :: Cord st i a -> Cord st i a
+reverseC = liftList reverse
+
+rotateC :: Cord st i a -> Cord st i a
+rotateC = liftList rotateList
+  where
+    rotateList (x : xs) = xs ++ [x]
+
+invertC :: (Num a) => Cord st i a -> Cord st i a
+invertC = liftList invertList
+  where
+    invertList (x : xs) = xs ++ [fmap (first $ fmap (+ 12)) x]
+
+enumFromToStack :: (Ord a, Num a) => Cord st i a -> Cord st i a -> Cord st i a
+enumFromToStack xz yz = join $ en <$> xz <*> yz
+  where
+    en x y = stack $ map pure $ enumerateFromTo x y
+
+enumFromThenToStack :: (Ord a, Num a) => Cord st i a -> Cord st i a -> Cord st i a -> Cord st i a
+enumFromThenToStack xz yz zz = join $ en <$> xz <*> yz <*> zz
+  where
+    en x y z = stack $ map pure $ enumerateFromThenTo x y z
diff --git a/src/Zwirn/Core/Core.hs b/src/Zwirn/Core/Core.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/Core.hs
@@ -0,0 +1,168 @@
+module Zwirn.Core.Core where
+
+{-
+    Core.hs - core functions and instances
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+import Control.Applicative
+import Control.Monad (join)
+import Control.Monad.Identity
+import Data.Bifunctor
+import Data.Fixed (mod')
+import Data.Functor (void)
+import Music.Theory.Bjorklund (bjorklund, iseq)
+import Zwirn.Core.Time
+import Zwirn.Core.Tree
+import Zwirn.Core.Types
+
+-- | indicates the current time
+now :: (Applicative k) => ZwirnT k st i Time
+now = zwirn $ \t st -> pure (Value t t [], st)
+
+-- | indicates the current cycle
+cyc :: (Applicative k) => ZwirnT k st i Int
+cyc = fmap floor now
+
+-- higher level helper functions
+
+withInner :: (k (Value i a, st) -> k (Value i b, st)) -> ZwirnT k st i a -> ZwirnT k st i b
+withInner f x = zwirn $ \t st -> f $ unzwirn x t st
+
+withInnerAndTime :: (Time -> k (Value i a, st) -> k (Value i b, st)) -> ZwirnT k st i a -> ZwirnT k st i b
+withInnerAndTime f x = zwirn $ \t st -> f t (unzwirn x t st)
+
+withInnerTimeState :: (Time -> st -> k (Value i a, st) -> k (Value i b, st)) -> ZwirnT k st i a -> ZwirnT k st i b
+withInnerTimeState f x = zwirn $ \t st -> f t st (unzwirn x t st)
+
+withInner2 :: (k (Value i a, st) -> k (Value i b, st) -> k (Value i c, st)) -> ZwirnT k st i a -> ZwirnT k st i b -> ZwirnT k st i c
+withInner2 f x y = zwirn $ \t st -> f (unzwirn x t st) (unzwirn y t st)
+
+withValueState :: (Functor k) => ((Value i a, st) -> (Value i b, st)) -> ZwirnT k st i a -> ZwirnT k st i b
+withValueState f = withInner (fmap f)
+
+withValue :: (Functor k) => (Value i a -> Value i b) -> ZwirnT k st i a -> ZwirnT k st i b
+withValue f = withValueState (first f)
+
+withA :: (Functor k) => (a -> a) -> ZwirnT k st i a -> ZwirnT k st i a
+withA f = withValue (\v -> v {value = f $ value v})
+
+withTime :: (Functor k) => (Time -> Time) -> ZwirnT k st i a -> ZwirnT k st i a
+withTime f = withValue (\v -> v {time = f $ time v})
+
+withInfo :: (Functor k) => (i -> i) -> ZwirnT k st i a -> ZwirnT k st i a
+withInfo f = withValue (\v -> v {info = f <$> info v})
+
+withInfos :: (Functor k) => ([i] -> [i]) -> ZwirnT k st i a -> ZwirnT k st i a
+withInfos f = withValue (\v -> v {info = f $ info v})
+
+addInfo :: (Functor k) => i -> ZwirnT k st i a -> ZwirnT k st i a
+addInfo i = withInfos (const [i])
+
+removeInfo :: (Functor k) => ZwirnT k st i a -> ZwirnT k st i a
+removeInfo = withInfos (const [])
+
+withState :: (Functor k) => (st -> st) -> ZwirnT k st i a -> ZwirnT k st i a
+withState f = withValueState (second f)
+
+fromSignal :: (Applicative k) => (Time -> Time) -> ZwirnT k st i Time
+fromSignal f = f <$> now
+
+getInner :: (Functor k) => ZwirnT k st i a -> ZwirnT k st i Time
+getInner = withValue (\v -> v {value = time v})
+
+-- instances
+
+-- | just lifts, only operates on the values
+instance (Semigroup a, Applicative k) => Semigroup (ZwirnT k st i a) where
+  (<>) = liftA2 (<>)
+
+instance (Monoid a, Applicative k) => Monoid (ZwirnT k st i a) where
+  mempty = pure mempty
+
+instance (Functor k) => Functor (ZwirnT k st i) where
+  fmap f = withInner (fmap $ first (fmap f))
+
+instance (Applicative k) => Applicative (ZwirnT k st i) where
+  pure x = zwirn $ \t st -> pure (Value x t [], st)
+  liftA2 f = withInner2 (liftA2 (\(v1, st1) (v2, _) -> (liftA2 f v1 v2, st1)))
+
+instance (MultiApplicative k) => MultiApplicative (ZwirnT k st i) where
+  liftA2Left f = withInner2 (liftA2Left (\(v1, st1) (v2, _) -> (liftA2Left f v1 v2, st1)))
+  liftA2Right f = withInner2 (liftA2Right (\(v1, st1) (v2, _) -> (liftA2Right f v1 v2, st1)))
+
+instance (Monad k) => Monad (ZwirnT k st i) where
+  (>>=) x f = innerJoin $ fmap f x
+    where
+      innerJoin pp = zwirn q
+        where
+          q t st = (\(z, st') -> first (mergeInfo (info z)) <$> unzwirn (value z) t st') =<< outer
+            where
+              outer = unzwirn pp t st
+              mergeInfo i v = v {info = info v ++ i}
+
+instance (MultiMonad k) => MultiMonad (ZwirnT k st i) where
+  outerJoin pp = zwirn q
+    where
+      q t st = outerJoin $ (\(z, st') -> first (\v -> v {time = time z, info = info v ++ info z}) <$> unzwirn (value z) t st') <$> outer
+        where
+          outer = unzwirn pp t st
+
+  squeezeJoin pp = zwirn q
+    where
+      q t st = squeezeJoin $ (\(z, st') -> first (mergeInfo (info z)) <$> unzwirn (value z) (time z) st') <$> outer
+        where
+          outer = unzwirn pp t st
+          mergeInfo i v = v {info = info v ++ i}
+
+outerApply :: (MultiMonad m) => m (m a -> m b) -> m a -> m b
+outerApply f x = outerJoin $ f <*> pure x
+
+innerApply :: (Monad m) => m (m a -> m b) -> m a -> m b
+innerApply f x = join $ f <*> pure x
+
+squeezeApply :: (MultiMonad m) => m (m a -> m b) -> m a -> m b
+squeezeApply f x = squeezeJoin $ f <*> pure x
+
+zipApply :: (MultiMonad k) => ZwirnT k st i (ZwirnT k st i a -> ZwirnT k st i b) -> ZwirnT k st i a -> ZwirnT k st i b
+zipApply fs x = zwirn q
+  where
+    q t st = innerJoin $ (\c -> unzwirn c t st) . ($ x) . value . fst <$> unzwirn fs t st
+
+squeezeMap :: (MultiMonad m) => (m a -> m b) -> m a -> m b
+squeezeMap f x = squeezeJoin $ fmap (f . pure) x
+
+mapZ :: (MultiMonad m) => m (m a -> m b) -> m a -> m b
+mapZ fp xp = squeezeJoin $ fmap (squeezeApply fp . pure) xp
+
+infixl 4 <$$>
+
+(<$$>) :: (Monad m) => m (m a -> m b) -> m a -> m b
+(<$$>) = innerApply
+
+enumerateFromByTo :: (Ord a, Num a) => a -> a -> a -> [a]
+enumerateFromByTo x y z
+  | y <= 0 = []
+  | x < z = if z < x + y then [x] else x : enumerateFromByTo (x + y) y z
+  | otherwise = if z > x - y then [x] else x : enumerateFromByTo (x - y) y z
+
+enumerateFromThenTo :: (Ord a, Num a) => a -> a -> a -> [a]
+enumerateFromThenTo x y
+  | x < y = enumerateFromByTo x (y - x)
+  | x > y = enumerateFromByTo x (x - y)
+
+enumerateFromTo :: (Ord a, Num a) => a -> a -> [a]
+enumerateFromTo x = enumerateFromByTo x 1
diff --git a/src/Zwirn/Core/Map.hs b/src/Zwirn/Core/Map.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/Map.hs
@@ -0,0 +1,108 @@
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Zwirn.Core.Map where
+
+{-
+    Map.hs - lifting functions on maps to signals, some adapted
+    from https://github.com/tidalcycles/Tidal/blob/dev/src/Sound/Tidal/Control.hs
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+import Data.Map (Map)
+import qualified Data.Map as Map
+import Data.Maybe (fromMaybe)
+import Data.String (IsString)
+import Zwirn.Core.Core
+import Zwirn.Core.Modulate (fastcat, slow)
+import Zwirn.Core.Structure (run)
+import Zwirn.Core.Time (Time)
+import Zwirn.Core.Types
+import Prelude hiding ((*>))
+
+-- | create a singleton map with specific key
+singleton :: (MultiApplicative m) => ZwirnT m st i k -> ZwirnT m st i a -> ZwirnT m st i (Map k a)
+singleton = liftA2Right Map.singleton
+
+union :: (Applicative m, Ord k) => ZwirnT m st i (Map k a) -> ZwirnT m st i (Map k a) -> ZwirnT m st i (Map k a)
+union = liftA2 Map.union
+
+-- | lookup a value via key
+lookup :: (HasSilence m, MultiMonad m, Ord k) => ZwirnT m st i k -> ZwirnT m st i (Map k a) -> ZwirnT m st i a
+lookup tz xz = outerJoin $ liftA2Right (\t x -> fromLookup $ Map.lookup t x) tz xz
+  where
+    fromLookup (Just x) = pure x
+    fromLookup _ = silence
+
+insert :: (Applicative m, Ord k) => ZwirnT m st i k -> ZwirnT m st i a -> ZwirnT m st i (Map k a) -> ZwirnT m st i (Map k a)
+insert k a m = Map.insert <$> k <*> a <*> m
+
+-- | apply a function to a specific key, if key is absent, return the original map
+fix :: (HasSilence m, MultiMonad m, Ord k) => ZwirnT m st i k -> ZwirnT m st i (ZwirnT m st i a -> ZwirnT m st i a) -> ZwirnT m st i (Map k a) -> ZwirnT m st i (Map k a)
+fix kz fz mz = outerJoin $ fromLookup <$> lookupMaybe kz mz
+  where
+    fromLookup (Just x) = insert kz (squeezeApply fz (pure x)) mz
+    fromLookup Nothing = mz
+    lookupMaybe = liftA2Right Map.lookup
+
+chop :: (Fractional a, MultiMonad m, HasSilence m, Ord k, IsString k) => ZwirnT m st i Int -> ZwirnT m st i (Map k a) -> ZwirnT m st i (Map k a)
+chop nz = squeezeMap (quickslice nz (run nz))
+
+quickslice :: (Fractional a, MultiMonad m, Ord k, IsString k) => ZwirnT m st i Int -> ZwirnT m st i Int -> ZwirnT m st i (Map k a) -> ZwirnT m st i (Map k a)
+quickslice nz iz = squeezeMap (slice nz iz)
+
+loopAt :: (Fractional a, IsString a, HasSilence m, Monad m, Ord k, IsString k) => ZwirnT m st i Time -> ZwirnT m st i (Map k a) -> ZwirnT m st i (Map k a)
+loopAt zt zx = _loopAt <$> zt <$$> zx
+  where
+    _loopAt 0 _ = silence
+    _loopAt t x = Map.alter a "speed" . Map.insert "unit" "c" <$> slow (pure t) x
+      where
+        a (Just s) = Just (s / realToFrac t)
+        a Nothing = Just (1 / realToFrac t)
+
+slice :: (Fractional a, MultiApplicative m, Ord k, IsString k) => ZwirnT m st i Int -> ZwirnT m st i Int -> ZwirnT m st i (Map k a) -> ZwirnT m st i (Map k a)
+slice nz iz zm = _slice <$> nz *> iz <*> zm
+  where
+    _slice n i m = Map.unions [Map.singleton "begin" newb, Map.singleton "end" newe, m]
+      where
+        b = fromMaybe 0 $ Map.lookup "begin" m
+        e = fromMaybe 1 $ Map.lookup "end" m
+        newrange x = e * x + (1 - x) * b
+        newb = newrange $ div' i n
+        newe = newrange $ div' i n + div' 1 n
+        div' num den = fromIntegral (num `mod` den) / fromIntegral den
+
+striateBy :: (Fractional a, Monad m, HasSilence m, Ord k, IsString k) => ZwirnT m st i Int -> ZwirnT m st i a -> ZwirnT m st i (Map k a) -> ZwirnT m st i (Map k a)
+striateBy i f x = _striateBy <$> i <*> f <$$> x
+  where
+    _striateBy n f mz = fastcat $ map (offset . fromIntegral) [0 .. n - 1]
+      where
+        offset i = mergePlayRange (slot * i, (slot * i) + f) <$> mz
+        slot = (1 - f) / fromIntegral (n - 1)
+
+striate :: (Fractional a, Monad m, HasSilence m, Ord k, IsString k) => ZwirnT m st i Int -> ZwirnT m st i (Map k a) -> ZwirnT m st i (Map k a)
+striate i x = _striate <$> i <$$> x
+  where
+    _striate n z = fastcat $ map offset [0 .. n - 1]
+      where
+        offset i = mergePlayRange (fromIntegral i / fromIntegral n, fromIntegral (i + 1) / fromIntegral n) <$> z
+
+mergePlayRange :: (Fractional a, Ord k, IsString k) => (a, a) -> Map k a -> Map k a
+mergePlayRange (b, e) cm = Map.insert "begin" ((b * d') + b') $ Map.insert "end" ((e * d') + b') cm
+  where
+    b' = fromMaybe 0 $ Map.lookup "begin" cm
+    e' = fromMaybe 1 $ Map.lookup "end" cm
+    d' = e' - b'
diff --git a/src/Zwirn/Core/Modulate.hs b/src/Zwirn/Core/Modulate.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/Modulate.hs
@@ -0,0 +1,126 @@
+{-# LANGUAGE BangPatterns #-}
+
+module Zwirn.Core.Modulate where
+
+{-
+    Modulate.hs - functions modulating time
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+import Control.Applicative
+import Control.Monad (join)
+import Control.Monad.Identity
+import Data.Bifunctor
+import Data.Fixed (mod')
+import Data.Functor (void)
+import Music.Theory.Bjorklund (bjorklund, iseq)
+import Zwirn.Core.Core
+import Zwirn.Core.Time
+import Zwirn.Core.Tree
+import Zwirn.Core.Types
+
+modulateTime :: (a -> Time -> st -> Time) -> a -> ZwirnT k st i b -> ZwirnT k st i b
+modulateTime f x b = zwirn (\t st -> unzwirn b (f x t st) st)
+
+rev :: ZwirnT k st i a -> ZwirnT k st i a
+rev = modulateTime (\_ t _ -> -t) ()
+
+revBy :: (Monad k) => ZwirnT k st i Time -> ZwirnT k st i a -> ZwirnT k st i a
+revBy tz x = modulateTime (\x t _ -> fromIntegral (floor x) + t - frac x) <$> tz <$$> x
+
+sini :: ZwirnT k st i a -> ZwirnT k st i a
+sini = modulateTime (\_ t _ -> sin (2 * pi * t)) ()
+
+fast :: (Monad k) => ZwirnT k st i Time -> ZwirnT k st i a -> ZwirnT k st i a
+fast tz x = modulateTime (\x t _ -> t * x) <$> tz <$$> x
+
+slow :: (Monad k) => ZwirnT k st i Time -> ZwirnT k st i a -> ZwirnT k st i a
+slow tz x = modulateTime timefunc <$> tz <$$> x
+  where
+    timefunc x t _
+      | x == 0 = 0
+      | otherwise = t / x
+
+shift :: (Monad k) => ZwirnT k st i Time -> ZwirnT k st i a -> ZwirnT k st i a
+shift tz x = modulateTime (\x t _ -> t - x) <$> tz <$$> x
+
+ply :: (MultiMonad k) => ZwirnT k st i Time -> ZwirnT k st i a -> ZwirnT k st i a
+ply tz = squeezeMap (fast tz)
+
+zoom :: (Monad k) => ZwirnT k st i Time -> ZwirnT k st i Time -> ZwirnT k st i a -> ZwirnT k st i a
+zoom t1 t2 x = modulateTime timefunc <$> tup <$$> x
+  where
+    tup = liftA2 (,) t1 t2
+    timefunc (st, en) t _
+      | en > st = mod' t (en - st) + st
+      | en == st = 0
+      | en < st = st - mod' t (st - en)
+
+timeloop :: (Monad k) => ZwirnT k st i Time -> ZwirnT k st i a -> ZwirnT k st i a
+timeloop = zoom (pure 0)
+
+loopfirst :: (Monad k) => ZwirnT k st i a -> ZwirnT k st i a
+loopfirst = timeloop (pure 1)
+
+fastcat :: (HasSilence k) => [ZwirnT k st i a] -> ZwirnT k st i a
+fastcat [] = silence
+fastcat obj = zwirn q
+  where
+    q t = unzwirn item phase
+      where
+        metre = fromIntegral $ length obj
+        scaledPhase = t * metre
+        item = nth scaledPhase obj
+        cyc = floor t
+        phase = frac scaledPhase + fromIntegral cyc
+
+slowcat :: (HasSilence k, Monad k) => [ZwirnT k st i a] -> ZwirnT k st i a
+slowcat zs = slow (pure $ fromIntegral $ length zs) $ fastcat zs
+
+-- | each (t,p) indicates the amount of time t for pattern p relative
+-- | to the other lengths in the list, squeezed within one cycle
+timecat :: (HasSilence k, Monad k) => [(Time, ZwirnT k st i a)] -> ZwirnT k st i a
+timecat tps = if total == 0 then silence else cyclecat normalised
+  where
+    total = sum $ map fst tps
+    normalised = map (\(t, p) -> (t / total, p)) tps
+
+-- | each (t,p) indicates the amount of time t the pattern p is queried for
+-- | the patterns in the list will be queried in order by their respective amounts
+-- | Example: cyclecat [(1,pure 10), (2, slow 2 $ pure 20)] == < 10 20 ~ >
+-- | Note: also works with rational numbers
+cyclecat :: (HasSilence k) => [(Time, ZwirnT k st i a)] -> ZwirnT k st i a
+cyclecat [] = silence
+cyclecat xs = cyclecatrec xs (sum $ map fst xs)
+  where
+    -- len = sum $ map fst xs
+    cyclecatrec [(_, p)] _ = p
+    cyclecatrec (x : xs) !tot = cat x (tot - fst x, cyclecatrec xs (tot - fst x))
+
+cat :: (HasSilence k) => (Time, ZwirnT k st i a) -> (Time, ZwirnT k st i a) -> ZwirnT k st i a
+cat (Time 0 _, _) (Time 0 _, _) = silence
+cat (t1, p1) (t2, p2) = zwirn q
+  where
+    q t = unzwirn item phase
+      where
+        total = t1 + t2
+        cyc = t / total
+        first = frac cyc < t1 / total
+        item = if first then p1 else p2
+        phase = if first then t - fromIntegral (floor cyc) * t2 else t - (fromIntegral (floor cyc) + 1) * t1
+
+fastcyclecat :: (HasSilence k, Monad k) => [(Time, ZwirnT k st i a)] -> ZwirnT k st i a
+fastcyclecat xs = cyclecat $ map (\(t, x) -> (t, slow (pure t) x)) xs
diff --git a/src/Zwirn/Core/Number.hs b/src/Zwirn/Core/Number.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/Number.hs
@@ -0,0 +1,121 @@
+module Zwirn.Core.Number where
+
+{-
+    Number.hs - lifting functions on numbers to signals
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+import Data.Fixed (mod')
+import Zwirn.Core.Core
+import Zwirn.Core.Modulate (fastcat)
+import Zwirn.Core.Time (Time)
+import Zwirn.Core.Types
+
+instance (Num a, Applicative k) => Num (ZwirnT k st i a) where
+  (+) = liftA2 (+)
+  (-) = liftA2 (-)
+  (*) = liftA2 (*)
+  negate = fmap negate
+  abs = fmap abs
+  signum = fmap signum
+  fromInteger = pure . fromInteger
+
+instance (Eq a, Fractional a, MultiMonad k, HasSilence k) => Fractional (ZwirnT k st i a) where
+  fromRational = pure . fromRational
+  recip xz = innerJoin $ fmap (\x -> if x == 0 then silence else pure $ recip x) xz
+
+instance (Ord a, Floating a, MultiMonad k, HasSilence k) => Floating (ZwirnT k st i a) where
+  pi = pure pi
+  exp = fmap exp
+  log xz = innerJoin $ fmap (\x -> if x <= 0 then silence else pure $ log x) xz
+  sqrt xz = innerJoin $ fmap (\x -> if x < 0 then silence else pure $ sqrt x) xz
+  (**) xz yz = innerJoin $ liftA2 (\x y -> if x <= 0 && abs y < 1 then silence else pure $ x ** y) xz yz
+  logBase bz xz = innerJoin $ liftA2 (\b x -> if b < 0 || x <= 0 then silence else pure $ logBase b x) bz xz
+  sin = fmap sin
+  cos = fmap cos
+  tan = fmap tan
+  asin = fmap asin
+  acos = fmap acos
+  atan = fmap atan
+  sinh = fmap sinh
+  cosh = fmap cosh
+  tanh = fmap tanh
+  asinh = fmap asinh
+  acosh = fmap acosh
+  atanh = fmap atanh
+
+mod :: (Real a, HasSilence k, MultiMonad k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+mod xz yz = innerJoin $ liftA2 (\x y -> if y == 0 then silence else pure $ mod' x y) xz yz
+
+frac :: (Real a, MultiMonad k) => ZwirnT k st i a -> ZwirnT k st i a
+frac = fmap (`mod'` 1)
+
+trunc :: (RealFrac a, Integral b, Functor k) => ZwirnT k st i a -> ZwirnT k st i b
+trunc = fmap truncate
+
+ceil :: (RealFrac a, Integral b, Functor k) => ZwirnT k st i a -> ZwirnT k st i b
+ceil = fmap ceiling
+
+floor :: (RealFrac a, Integral b, Functor k) => ZwirnT k st i a -> ZwirnT k st i b
+floor = fmap Prelude.floor
+
+round :: (RealFrac a, Integral b, Functor k) => ZwirnT k st i a -> ZwirnT k st i b
+round = fmap Prelude.round
+
+gcd :: (Integral a, Applicative k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+gcd = liftA2 Prelude.gcd
+
+lcm :: (Integral a, Applicative k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+lcm = liftA2 Prelude.lcm
+
+range :: (Num a, Applicative k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+range lx lu lv = (\l u v -> (1 - v) * l + v * u) <$> lx <*> lu <*> lv
+
+sine :: (Applicative k) => ZwirnT k st i Time
+sine = fromSignal (\t -> (sin (2 * pi * t) + 1) / 2)
+
+sine2 :: (Applicative k) => ZwirnT k st i Time
+sine2 = fromSignal (\t -> sin (2 * pi * t))
+
+cosine :: (Applicative k) => ZwirnT k st i Time
+cosine = fromSignal (\t -> (cos (2 * pi * t) + 1) / 2)
+
+cosine2 :: (Applicative k) => ZwirnT k st i Time
+cosine2 = fromSignal (\t -> cos (2 * pi * t))
+
+saw :: (Applicative k) => ZwirnT k st i Time
+saw = fromSignal (`mod'` 1)
+
+saw2 :: (Applicative k) => ZwirnT k st i Time
+saw2 = fromSignal (\t -> (mod' t 1 * 2) - 1)
+
+isaw :: (Applicative k) => ZwirnT k st i Time
+isaw = fromSignal (\t -> 1 - mod' t 1)
+
+isaw2 :: (Applicative k) => ZwirnT k st i Time
+isaw2 = fromSignal (\t -> 1 - (mod' t 1 * 2))
+
+square :: (Applicative k) => ZwirnT k st i Time
+square = fromSignal (\t -> fromIntegral $ Prelude.floor $ mod' t 1 * 2)
+
+square2 :: (Applicative k) => ZwirnT k st i Time
+square2 = fromSignal (\t -> fromIntegral $ Prelude.floor (mod' t 1 * 2) - 1)
+
+tri :: (Applicative k, HasSilence k) => ZwirnT k st i Time
+tri = fastcat [saw, isaw]
+
+tri2 :: (Applicative k, HasSilence k) => ZwirnT k st i Time
+tri2 = fastcat [saw2, isaw2]
diff --git a/src/Zwirn/Core/Query.hs b/src/Zwirn/Core/Query.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/Query.hs
@@ -0,0 +1,98 @@
+{-# LANGUAGE BangPatterns #-}
+
+module Zwirn.Core.Query where
+
+{-
+    Query.hs - querying signals for breakpoints
+    (i.e. the zeroes of the fractional part of the inner time of a signal)
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+import Data.Bifunctor
+import Zwirn.Core.Core
+import Zwirn.Core.Time
+import Zwirn.Core.Tree
+import Zwirn.Core.Types
+
+type Breakpoint st i a = (Time, Value i a, st)
+
+precision :: Time
+precision = 0.001
+
+instance (Show a, Num st, ToList k) => Show (ZwirnT k st i a) where
+  show cord = show $ findAllValuesWithTime (Time 0 1, Time 1 1) 0 cord
+
+findAllValuesWithTimeStateInfo :: (ToList k) => (Time, Time) -> st -> ZwirnT k st i a -> [(Time, a, st, [i])]
+findAllValuesWithTimeStateInfo (from, to) st z = map fixTime $ findAllBreakpoints from to precision st z
+  where
+    fixTime (t, Value v d i, st) = if tDiff d > 0 then (t, v, st, i) else (t - precision, v, st, i)
+
+findAllValuesWithTimeState :: (ToList k) => (Time, Time) -> st -> ZwirnT k st i a -> [(Time, a, st)]
+findAllValuesWithTimeState (from, to) st z = map fixTime $ findAllBreakpoints from to precision st z
+  where
+    fixTime (t, Value v d _, st) = if tDiff d > 0 then (t, v, st) else (t - precision, v, st)
+
+findAllValuesWithTime :: (ToList k) => (Time, Time) -> st -> ZwirnT k st i a -> [(Time, a)]
+findAllValuesWithTime (from, to) st z = map fixTime $ findAllBreakpoints from to precision st z
+  where
+    fixTime (t, Value v d _, st) = if tDiff d > 0 then (t, v) else (t - precision, v)
+
+findAll :: (ToList k) => (Time, Time) -> st -> ZwirnT k st i a -> [Breakpoint st i a]
+findAll (from, to) st z = map fixTime $ findAllBreakpoints from to precision st z
+  where
+    fixTime (t, v@(Value _ d _), st) = if tDiff d > 0 then (t, v, st) else (t - precision, v, st)
+
+findNextBreakpoint :: (ToList k) => Time -> Time -> Time -> st -> ZwirnT k st i a -> [Breakpoint st i a]
+findNextBreakpoint time to precision st pat = findNextBreakpoint' time to precision start st pat
+  where
+    start = map (\(Value _ i _, _) -> frac i) $ toList $ unzwirn pat time st
+
+findNextBreakpoint' :: (ToList k) => Time -> Time -> Time -> [Time] -> st -> ZwirnT k st i a -> [Breakpoint st i a]
+findNextBreakpoint' !prevTime to precision prevs st pat
+  | now <= to = if or bps then concat $ zipWith zipper bps vs else findNextBreakpoint' now to precision times st pat
+  | or bps = concat $ zipWith zipper bps vs
+  | otherwise = []
+  where
+    now = prevTime + precision
+    vs = toList $ unzwirn pat now st
+    vals = map (value . fst) vs
+    times = map (frac . time . fst) vs
+    bps = breakConditions prevs times
+    zipper True (v, st') = [(now, v, st')]
+    zipper False _ = []
+
+findAllBreakpoints :: (ToList k) => Time -> Time -> Time -> st -> ZwirnT k st i a -> [Breakpoint st i a]
+findAllBreakpoints from to precision = findAllBreakpoints' (from - precision) (to - 2 * precision) precision
+
+findAllBreakpoints' :: (ToList k) => Time -> Time -> Time -> st -> ZwirnT k st i a -> [Breakpoint st i a]
+findAllBreakpoints' !from to precision st pat = case findNextBreakpoint from to precision st pat of
+  [] -> []
+  (bp@(t, _, st') : bps) -> bp : bps ++ findAllBreakpoints' t to precision st' pat
+
+breakConditions :: [Time] -> [Time] -> [Bool]
+breakConditions [] [] = []
+breakConditions [] xs@(_ : _) = map breakCondition xs
+breakConditions xs@(_ : _) [] = map breakCondition xs
+breakConditions xs ys = liftA2Right breakConditionCombined xs ys
+
+breakConditionCombined :: Time -> Time -> Bool
+breakConditionCombined prev now = breakCondition now && not (breakCondition prev)
+
+breakCondition :: Time -> Bool
+breakCondition (Time inner scale)
+  | scale > 0 = inner <= tTime precision * abs scale
+  | abs (inner - 1) <= tTime precision * abs scale = True
+  | otherwise = False
diff --git a/src/Zwirn/Core/Random.hs b/src/Zwirn/Core/Random.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/Random.hs
@@ -0,0 +1,85 @@
+module Zwirn.Core.Random where
+
+{-
+    Random.hs - simple random signals and related functions
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+import Control.Monad (join)
+import System.Random
+import Zwirn.Core.Core
+import Zwirn.Core.Modulate
+import Zwirn.Core.Query
+import Zwirn.Core.Types
+
+randR :: (Random a, Applicative k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+randR l r = zwirn q
+  where
+    q t = unzwirn (fmap fst $ liftA2 randomR zipp $ pure $ mkStdGen $ floor (t / precision)) t
+      where
+        zipp = liftA2 (,) l r
+
+rand :: (Random a, Applicative k) => ZwirnT k st i a
+rand = zwirn $ \t st -> pure (Value (fst $ random (mkStdGen $ floor (t / precision))) t [], st)
+
+noise :: (Applicative k) => ZwirnT k st i Double
+noise = rand
+
+irand :: (Applicative k) => ZwirnT k st i Int -> ZwirnT k st i Int
+irand = randR (pure 0)
+
+brandBy :: (Applicative k) => ZwirnT k st i Double -> ZwirnT k st i Bool
+brandBy prob = liftA2 (>) prob rand
+
+sometimesBy :: (MultiMonad k) => ZwirnT k st i Double -> (ZwirnT k st i a -> ZwirnT k st i a) -> ZwirnT k st i a -> ZwirnT k st i a
+sometimesBy prob f x = innerJoin $ fmap cho (brandBy prob)
+  where
+    cho True = f x
+    cho False = x
+
+-- these versions take the cycle number as seed
+
+randR' :: (Random a, Applicative k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+randR' r l = zwirn q
+  where
+    q t = unzwirn (fmap fst $ liftA2 randomR zipp $ pure $ mkStdGen $ floor t) t
+      where
+        zipp = liftA2 (,) l r
+
+rand' :: (Random a, Applicative k) => ZwirnT k st i a
+rand' = zwirn $ \t st -> pure (Value (fst $ random (mkStdGen $ floor t)) t [], st)
+
+irand' :: (Applicative k) => ZwirnT k st i Int -> ZwirnT k st i Int
+irand' = randR' (pure 0)
+
+brandBy' :: (Applicative k) => ZwirnT k st i Double -> ZwirnT k st i Bool
+brandBy' prob = liftA2 (>) prob rand'
+
+chooseWithSeed :: (Monad k) => Int -> [ZwirnT k st i a] -> ZwirnT k st i a
+chooseWithSeed i ps = (ps !!) =<< shift (pure $ fromIntegral i / precision) (irand' $ pure $ length ps - 1)
+
+chooseList :: (Monad k) => [ZwirnT k st i a] -> ZwirnT k st i a
+chooseList = chooseWithSeed 0
+
+enumFromToChoice :: (Ord a, Num a, Monad k) => Int -> ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+enumFromToChoice i xz yz = join $ en <$> xz <*> yz
+  where
+    en x y = chooseWithSeed i $ map pure $ enumerateFromTo x y
+
+enumFromThenToChoice :: (Ord a, Num a, Monad k) => Int -> ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+enumFromThenToChoice i xz yz zz = join $ en <$> xz <*> yz <*> zz
+  where
+    en x y z = chooseWithSeed i $ map pure $ enumerateFromThenTo x y z
diff --git a/src/Zwirn/Core/State.hs b/src/Zwirn/Core/State.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/State.hs
@@ -0,0 +1,53 @@
+module Zwirn.Core.State where
+
+{-
+    State.hs - functions manipulating the underlying state of signals
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+import Control.Monad.Identity
+import qualified Data.Map as Map
+import Zwirn.Core.Cord
+import Zwirn.Core.Core
+import Zwirn.Core.Types
+
+--- functions modifying the state
+
+modify' :: (st -> st) -> ZwirnT k st i a -> ZwirnT k st i a
+modify' f x = zwirn $ \t st -> unzwirn x t (f st)
+
+modify :: (MultiMonad k) => (ZwirnT k st i st -> ZwirnT k st i st) -> ZwirnT k st i a -> ZwirnT k st i a
+modify f x = set (f (get x)) x
+
+get :: (Applicative k) => ZwirnT k st i a -> ZwirnT k st i st
+get = withValueState (\(v, st) -> (fmap (const st) v, st))
+
+set :: (Monad k) => ZwirnT k st i st -> ZwirnT k st i a -> ZwirnT k st i a
+set st a = withState . const <$> st <$$> a
+
+-- functions to act on state that is a map
+
+-- | get value of specific key, providing a function in case key is not found
+getMap :: (MultiMonad k, Ord key) => (Maybe b -> ZwirnT k (Map.Map key b) i b) -> ZwirnT k (Map.Map key b) i key -> ZwirnT k (Map.Map key b) i b
+getMap fromLookup xc = innerJoin $ liftA2 (\k l -> fromLookup $ Map.lookup k l) xc (get (pure ()))
+
+-- | set value of given key
+setMap :: (Monad k, Ord key) => ZwirnT k (Map.Map key b) i key -> ZwirnT k (Map.Map key b) i b -> ZwirnT k (Map.Map key b) i a -> ZwirnT k (Map.Map key b) i a
+setMap key b = set (liftA2 Map.insert key b <*> get (pure ()))
+
+-- | modify
+modifyMap :: (MultiMonad k, Ord key) => (Maybe b -> ZwirnT k (Map.Map key b) i b) -> ZwirnT k (Map.Map key b) i key -> (ZwirnT k (Map.Map key b) i b -> ZwirnT k (Map.Map key b) i b) -> ZwirnT k (Map.Map key b) i a -> ZwirnT k (Map.Map key b) i a
+modifyMap fromLookup key f = setMap key (f (getMap fromLookup key))
diff --git a/src/Zwirn/Core/Structure.hs b/src/Zwirn/Core/Structure.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/Structure.hs
@@ -0,0 +1,84 @@
+module Zwirn.Core.Structure where
+
+{-
+    Structure.hs - functions manipulating the 'structure' of signals
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+import Control.Applicative
+import Control.Monad (join)
+import Control.Monad.Identity
+import Data.Bifunctor
+import Data.Fixed (mod')
+import Data.Functor (void)
+import Music.Theory.Bjorklund (bjorklund, iseq)
+import Zwirn.Core.Core
+import Zwirn.Core.Modulate
+import Zwirn.Core.Time
+import Zwirn.Core.Tree
+import Zwirn.Core.Types
+import Prelude hiding (enumFromTo)
+
+runFromTo :: (Ord a, Num a, Monad k, HasSilence k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+runFromTo xz yz = join $ en <$> xz <*> yz
+  where
+    en x y = fastcat $ map pure $ enumerateFromTo x y
+
+runFromThenTo :: (Ord a, Num a, Monad k, HasSilence k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+runFromThenTo xz yz zz = join $ en <$> xz <*> yz <*> zz
+  where
+    en x y z = fastcat $ map pure $ enumerateFromThenTo x y z
+
+slowrunFromTo :: (Ord a, Num a, Monad k, HasSilence k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+slowrunFromTo xz yz = join $ en <$> xz <*> yz
+  where
+    en x y = slowcat $ map pure $ enumerateFromTo x y
+
+slowrunFromThenTo :: (Ord a, Num a, Monad k, HasSilence k) => ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a -> ZwirnT k st i a
+slowrunFromThenTo xz yz zz = join $ en <$> xz <*> yz <*> zz
+  where
+    en x y z = slowcat $ map pure $ enumerateFromThenTo x y z
+
+run :: (Monad k, HasSilence k) => ZwirnT k st i Int -> ZwirnT k st i Int
+run n = runFromTo (pure 0) (fmap (\x -> x - 1) n)
+
+slowrun :: (Monad k, HasSilence k) => ZwirnT k st i Int -> ZwirnT k st i Int
+slowrun n = slowrunFromTo (pure 0) (fmap (\x -> x - 1) n)
+
+struct :: (MultiMonad k) => ZwirnT k st i a -> ZwirnT k st i b -> ZwirnT k st i b
+struct = withInner2 (liftA2Left f)
+  where
+    f (v1, st) (v2, _) = (Value (value v2) (time v1) (info v1), st)
+
+segment :: (MultiMonad k, HasSilence k) => ZwirnT k st i Int -> ZwirnT k st i a -> ZwirnT k st i a
+segment = struct . run
+
+euclidOff :: (HasSilence k, Monad k) => ZwirnT k st i Int -> ZwirnT k st i Int -> ZwirnT k st i Int -> ZwirnT k st i a -> ZwirnT k st i a
+euclidOff i1 i2 i3 x = euclidOff' <$> i1 <*> i2 <*> i3 <$$> x
+  where
+    euclidOff' a b off x = timecat $ map (\i -> (fromIntegral i :: Time, x)) ts
+      where
+        ts = rotate off $ iseq $ bjorklund (a, b)
+        rotate n xs = take lxs . drop ((-n) `mod` lxs) . cycle $ xs where lxs = length xs
+
+euclid :: (HasSilence k, Monad k) => ZwirnT k st i Int -> ZwirnT k st i Int -> ZwirnT k st i a -> ZwirnT k st i a
+euclid x y = euclidOff x y (pure 0)
+
+left :: (MultiMonad k) => (ZwirnT k st i a -> ZwirnT k st i b -> ZwirnT k st i c) -> ZwirnT k st i a -> ZwirnT k st i b -> ZwirnT k st i c
+left f x y = struct x $ f x y
+
+right :: (MultiMonad k) => (ZwirnT k st i a -> ZwirnT k st i b -> ZwirnT k st i c) -> ZwirnT k st i a -> ZwirnT k st i b -> ZwirnT k st i c
+right f x y = struct y $ f x y
diff --git a/src/Zwirn/Core/Time.hs b/src/Zwirn/Core/Time.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/Time.hs
@@ -0,0 +1,87 @@
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE GADTs #-}
+
+module Zwirn.Core.Time where
+
+{-
+    Time.hs - automated differentiation for time
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+data Time
+  = Time {tTime :: Rational, tDiff :: Rational}
+  deriving (Eq, Ord)
+
+instance Show Time where
+  show (Time x _) = show x
+
+showAll :: Time -> String
+showAll (Time x y) = "(" ++ show x ++ "," ++ show y ++ ")"
+
+instance Num Time where
+  Time x x' + Time y y' = Time (x + y) (x' + y')
+  Time x x' * Time y y' = Time (x * y) (y' * x + x' * y)
+  fromInteger x = Time (fromInteger x) 0
+  negate (Time x x') = Time (negate x) (negate x')
+  signum (Time x _) = Time (signum x) 0
+  abs (Time x x') = Time (abs x) (x' * signum x)
+
+instance Enum Time where
+  toEnum i = Time (fromIntegral i) 0
+  fromEnum (Time i _) = fromEnum i
+
+instance Fractional Time where
+  fromRational x = Time x 0
+  recip (Time x x') = Time (recip x) (-(x' / x * x))
+
+instance Real Time where
+  toRational (Time x x') = x
+
+instance RealFrac Time where
+  properFraction (Time x x') = (i, Time p x')
+    where
+      (i, p) = properFraction x
+
+instance Floating Rational where
+  pi = toRational pi
+  exp = toRational . exp . fromRational
+  log = toRational . log . fromRational
+  sin = toRational . sin . fromRational
+  cos = toRational . cos . fromRational
+  asin = toRational . asin . fromRational
+  acos = toRational . acos . fromRational
+  atan = toRational . atan . fromRational
+  sinh = toRational . sinh . fromRational
+  cosh = toRational . cosh . fromRational
+  asinh = toRational . asinh . fromRational
+  acosh = toRational . acosh . fromRational
+  atanh = toRational . atanh . fromRational
+
+instance Floating Time where
+  pi = Time pi 0
+  exp (Time x x') = Time (exp x) (x' * exp x)
+  log (Time x x') = Time (log x) (x' / x)
+  sqrt (Time x x') = Time (sqrt x) (x' / (2 * sqrt x))
+  sin (Time x x') = Time (sin x) (x' * cos x)
+  cos (Time x x') = Time (cos x) (x' * (-sin x))
+  asin (Time x x') = Time (asin x) (x' / sqrt (1 - x * x))
+  acos (Time x x') = Time (acos x) (x' / (-sqrt (1 - x * x)))
+  atan (Time x x') = Time (atan x) (1 / ((x' * x') + 1))
+  sinh (Time x x') = Time (sinh x) (cosh x')
+  cosh (Time x x') = Time (cosh x) (sinh x')
+  asinh (Time x x') = Time (asinh x) (1 / sqrt ((x' * x') + 1))
+  acosh (Time x x') = Time (acosh x) (1 / sqrt (x' - 1) * sqrt (x' + 1))
+  atanh (Time x x') = Time (atanh x) (1 / (1 - (x' * x')))
diff --git a/src/Zwirn/Core/Tree.hs b/src/Zwirn/Core/Tree.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/Tree.hs
@@ -0,0 +1,180 @@
+{-# LANGUAGE DeriveFunctor #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE GADTs #-}
+
+module Zwirn.Core.Tree where
+
+{-
+    Tree.hs - a structure for parallel signals
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+import Data.Bifunctor
+import Data.Fixed (mod')
+import Zwirn.Core.Types
+
+nth :: (RealFrac r) => r -> [a] -> a
+nth = wrapAt
+
+wrapAt :: (RealFrac r) => r -> [a] -> a
+wrapAt t ls = ls !! phase
+  where
+    l = fromIntegral $ length ls
+    phase = mod (floor t) (length ls)
+
+frac :: (Real r) => r -> r
+frac d = mod' d 1
+
+data Tree a
+  = Leaf a
+  | Branch [Tree a]
+  deriving (Show, Eq, Functor)
+
+instance ToList Tree where
+  toList (Leaf a) = [a]
+  toList (Branch as) = concatMap toList as
+
+(!!!) :: (Num b, RealFrac b) => [a] -> b -> a
+(!!!) as r = nth r as
+
+empty :: Tree a
+empty = Branch []
+
+isEmpty :: Tree a -> Bool
+isEmpty (Leaf _) = False
+isEmpty (Branch ts) = all isEmpty ts
+
+singleton :: a -> Tree a
+singleton = Leaf
+
+fromList :: [a] -> Tree a
+fromList as = Branch $ map singleton as
+
+look :: Int -> Tree a -> Tree a
+look _ (Leaf x) = Leaf x
+look i (Branch xs) = xs !!! fromIntegral i
+
+look' :: Int -> Tree a -> Tree a
+look' 0 (Leaf x) = Leaf x
+look' _ (Leaf x) = empty
+look' i (Branch xs) = if length xs > i && i >= 0 then xs !! i else empty
+
+lookup :: [Int] -> Tree a -> Tree a
+lookup is x = foldl (flip look) x is
+
+concatMapTree :: (a -> Tree b) -> Tree a -> Tree b
+concatMapTree f x = squeezeJoin $ fmap f x
+
+topLength :: Tree a -> Int
+topLength (Leaf _) = 1
+topLength (Branch xs) = length xs
+
+push :: Tree a -> Tree a -> Tree a
+push x l@(Leaf _) = Branch [x, l]
+push x (Branch xs) = Branch (x : xs)
+
+pop :: Tree a -> Tree a
+pop (Leaf _) = empty
+pop (Branch []) = empty
+pop (Branch (x : xs)) = Branch xs
+
+insertT :: Int -> Tree a -> Tree a -> Tree a
+insertT 0 x (Leaf y) = Branch [x, Leaf y]
+insertT _ x (Leaf y) = Branch [Leaf y, x]
+insertT i x (Branch ys) = Branch (ys1 ++ [x] ++ ys2)
+  where
+    (ys1, ys2) = splitAt i ys
+
+removeT :: Int -> Tree a -> Tree a
+removeT _ (Leaf x) = empty
+removeT i (Branch xs) = case splitAt i xs of
+  (xs1, []) -> Branch xs1
+  (xs1, _ : xs2) -> Branch $ xs1 ++ xs2
+
+-------------------------------------------------------
+------------------- APPLICATIVE STUFF -----------------
+-------------------------------------------------------
+
+instance MultiApplicative [] where
+  liftA2Left f [] _ = []
+  liftA2Left f _ [] = []
+  liftA2Left f as bs = map (\i -> f (as !! i) (bs !! floor ((fromIntegral i / fromIntegral n) * fromIntegral m))) [0 .. n - 1]
+    where
+      n = length as
+      m = length bs
+  liftA2Right f as bs = liftA2Left (flip f) bs as
+
+instance Applicative Tree where
+  pure = Leaf
+  liftA2 f (Leaf x) (Leaf y) = Leaf $ f x y
+  liftA2 f l@(Leaf _) (Branch ys) = Branch $ map (liftA2 f l) ys
+  liftA2 f (Branch xs) l@(Leaf _) = Branch $ map (\x -> liftA2 f x l) xs
+  liftA2 f (Branch xs) (Branch ys) = Branch $ lift2Both (liftA2 f) xs ys
+
+instance MultiApplicative Tree where
+  liftA2Left f (Leaf x) (Leaf y) = Leaf $ f x y
+  liftA2Left f l@(Leaf _) (Branch ys) = Branch $ map (liftA2Left f l) ys
+  liftA2Left f (Branch xs) l@(Leaf _) = Branch $ map (\x -> liftA2Left f x l) xs
+  liftA2Left f (Branch xs) (Branch ys) = Branch $ liftA2Left (liftA2Left f) xs ys
+  liftA2Right f (Leaf x) (Leaf y) = Leaf $ f x y
+  liftA2Right f l@(Leaf _) (Branch ys) = Branch $ map (liftA2Right f l) ys
+  liftA2Right f (Branch xs) l@(Leaf _) = Branch $ map (\x -> liftA2Right f x l) xs
+  liftA2Right f (Branch xs) (Branch ys) = Branch $ liftA2Right (liftA2Right f) xs ys
+
+lift2Both :: (a -> b -> c) -> [a] -> [b] -> [c]
+lift2Both f as bs =
+  if n < m
+    then liftA2Right f as bs
+    else liftA2Left f as bs
+  where
+    n = length as
+    m = length bs
+
+--------------------------------------------------
+------------------- MONAD STUFF ------------------
+--------------------------------------------------
+
+instance MultiMonad [] where
+  innerJoin = concat
+  outerJoin = concat
+  squeezeJoin = concat
+
+instance Monad Tree where
+  (>>=) x f = innerJoin $ f <$> x
+
+instance MultiMonad Tree where
+  innerJoin t = squeezeJoin $ fmap select indx
+    where
+      indx = indexTree t
+      select (is, x) = reduceNested is x
+  outerJoin = innerJoin
+  squeezeJoin (Leaf x) = x
+  squeezeJoin (Branch xs) = Branch $ map squeezeJoin xs
+
+indexTree :: Tree a -> Tree ([(Int, Int)], a)
+indexTree (Leaf x) = Leaf ([], x)
+indexTree (Branch bs) = Branch $ map (\i -> first ((i, length bs) :) <$> indexTree (bs !! i)) [0 .. length bs - 1]
+
+reduce :: (Int, Int) -> Tree a -> [Tree a]
+reduce (i, _) (Leaf x) = [Leaf x]
+reduce (i, n) (Branch xs) = map (\l -> nth (fromIntegral l) xs) ind
+  where
+    m = length xs
+    ind = [j | j <- [0 .. m - 1], fromIntegral i / fromIntegral n <= fromIntegral j / fromIntegral m, fromIntegral j / fromIntegral m < fromIntegral (i + 1) / fromIntegral n]
+
+reduceNested :: [(Int, Int)] -> Tree a -> Tree a
+reduceNested [] x = x
+reduceNested (i : is) x = Branch $ map (reduceNested is) (reduce i x)
diff --git a/src/Zwirn/Core/Types.hs b/src/Zwirn/Core/Types.hs
new file mode 100644
--- /dev/null
+++ b/src/Zwirn/Core/Types.hs
@@ -0,0 +1,90 @@
+{-# LANGUAGE DeriveFunctor #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+
+module Zwirn.Core.Types where
+
+{-
+    Types.hs - defines all core types and classes
+    Copyright (C) 2025, Martin Gius
+
+    This library 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+import Control.Monad (join)
+import Control.Monad.Identity
+import Data.Bifunctor
+import Data.Functor (void)
+import Zwirn.Core.Time
+
+data Value i a
+  = Value {value :: !a, time :: Time, info :: [i]}
+  deriving (Eq, Show, Ord, Functor)
+
+newtype ZwirnT k st i a = ZwirnT {unZwirnT :: Time -> st -> k (Value i a, st)}
+
+unzwirn :: ZwirnT k st i a -> Time -> st -> k (Value i a, st)
+unzwirn = unZwirnT
+
+zwirn :: (Time -> st -> k (Value i a, st)) -> ZwirnT k st i a
+zwirn = ZwirnT
+
+-- | represents instances of k that allow for a special zwirn with no values
+class HasSilence k where
+  silence :: ZwirnT k st i a
+
+class ToList k where
+  toList :: k a -> [a]
+
+infixl 4 *>
+
+infixl 4 <*
+
+class (Applicative f) => MultiApplicative f where
+  liftA2Left :: (a -> b -> c) -> f a -> f b -> f c
+  liftA2Right :: (a -> b -> c) -> f a -> f b -> f c
+  liftA2Both :: (a -> b -> c) -> f a -> f b -> f c
+  liftA2Both = liftA2
+  (*>) :: f (a -> b) -> f a -> f b
+  (*>) = liftA2Right id
+  (<*) :: f (a -> b) -> f a -> f b
+  (<*) = liftA2Right id
+
+class (MultiApplicative m, Monad m) => MultiMonad m where
+  innerJoin :: m (m a) -> m a
+  innerJoin = join
+  outerJoin :: m (m a) -> m a
+  squeezeJoin :: m (m a) -> m a
+
+instance ToList [] where
+  toList = id
+
+instance ToList Identity where
+  toList (Identity x) = pure x
+
+instance MultiApplicative Identity where
+  liftA2Left f x y = Identity $ f (runIdentity x) (runIdentity y)
+  liftA2Right f x y = Identity $ f (runIdentity x) (runIdentity y)
+
+instance MultiMonad Identity where
+  innerJoin (Identity x) = x
+  outerJoin (Identity x) = x
+  squeezeJoin (Identity x) = x
+
+instance Applicative (Value i) where
+  pure x = Value x 0 []
+  liftA2 f (Value x t1 i1) (Value y t2 i2) = Value (f x y) t1 (i1 ++ i2)
+
+instance MultiApplicative (Value i) where
+  liftA2Left = liftA2
+  liftA2Right f (Value x t1 i1) (Value y t2 i2) = Value (f x y) t2 (i1 ++ i2)
diff --git a/tests/test.hs b/tests/test.hs
new file mode 100644
--- /dev/null
+++ b/tests/test.hs
@@ -0,0 +1,192 @@
+-- import Test.Tasty.SmallCheck as SC
+-- import Test.Tasty.QuickCheck as QC
+
+import Control.Monad
+import Data.Bifunctor (first)
+import Data.Functor.Identity
+import qualified Data.List as L
+import qualified Data.Map as Map
+import qualified Data.Ratio as R
+import Test.Tasty
+import Test.Tasty.HUnit
+import Zwirn.Core.Conditional
+import Zwirn.Core.Cord as Z
+import Zwirn.Core.Core
+import Zwirn.Core.Map
+import Zwirn.Core.Modulate
+import Zwirn.Core.Number
+import Zwirn.Core.Query
+import Zwirn.Core.Structure
+import Zwirn.Core.Time
+import Zwirn.Core.Types
+
+main = defaultMain tests
+
+tests :: TestTree
+tests = testGroup "Tests" [unitTests]
+
+queryFirst :: Cord () () a -> [(Time, a)]
+queryFirst = findAllValuesWithTime (Time 0 1, Time 1 1) ()
+
+queryN :: Rational -> Cord () () a -> [(Time, a)]
+queryN n = findAllValuesWithTime (Time 0 1, Time n 1) ()
+
+(@?~) :: (Show a, Eq a) => [(Time, a)] -> [(Time, a)] -> Assertion
+(@?~) actual expected = unless (Prelude.and check && length actual == length expected) (assertFailure msg)
+  where
+    msg = "expected: " ++ show expected ++ "\n but got: " ++ show actual
+    check = zipWith (\(a, v1) (b, v2) -> abs (a - b) < 0.001 && v1 == v2) expected actual
+
+-- | should be used for signals
+(~@?~) :: (Show a, Eq a, Fractional a, Ord a) => [(Time, a)] -> [(Time, a)] -> Assertion
+(~@?~) actual expected = unless (Prelude.and check && length actual == length expected) (assertFailure msg)
+  where
+    msg = "expected: " ++ show expected ++ "\n but got: " ++ show actual
+    check = zipWith (\(a, v1) (b, v2) -> abs (a - b) < 0.001 && (abs (v1 - v2) < 0.001)) expected actual
+
+(%) :: Integer -> Integer -> Time
+(%) x y = Time (x R.% y) (0 R.% 1)
+
+simpleZwirn :: Cord () () Int
+simpleZwirn = fastcat [pure 1, pure 2, pure 3, pure 4]
+
+nestedZwirn :: Cord () () Int
+nestedZwirn = fastcat [pure 10, pure 20, fastcat [pure 30, pure 40]]
+
+veryNested :: Cord () () Int
+veryNested = fastcat [simpleZwirn, nestedZwirn]
+
+simpleCord :: Cord () () Int
+simpleCord = stack [pure 10, simpleZwirn]
+
+unitTests =
+  testGroup
+    "Unit tests"
+    [ testCase "pure for Zwirns" $
+        queryFirst (pure 1 :: Cord () () Int) @?~ [(0, 1)],
+      testCase "simple nesting" $
+        queryFirst simpleZwirn @?~ [(0, 1), (1 % 4, 2), (1 % 2, 3), (3 % 4, 4)],
+      testCase "more nesting" $
+        queryFirst nestedZwirn @?~ [(0, 10), (1 % 3, 20), (2 % 3, 30), (5 % 6, 40)],
+      testCase "very nested" $
+        queryFirst veryNested @?~ [(0, 1), (1 % 8, 2), (2 % 8, 3), (3 % 8, 4), (1 % 2, 10), (4 % 6, 20), (5 % 6, 30), (11 % 12, 40)],
+      testCase "reverse simple Zwirn" $
+        queryFirst (rev simpleZwirn) @?~ [(0, 4), (1 % 4, 3), (1 % 2, 2), (3 % 4, 1)],
+      testCase "reverse more nesting" $
+        queryFirst (rev nestedZwirn) @?~ [(0, 40), (1 % 6, 30), (1 % 3, 20), (2 % 3, 10)],
+      testCase "reverse inside" $
+        queryFirst (fastcat [pure 100, rev simpleZwirn, pure 200, pure 300]) @?~ [(0, 100), (4 % 16, 4), (5 % 16, 3), (6 % 16, 2), (7 % 16, 1), (1 % 2, 200), (3 % 4, 300)],
+      testCase "reverse reverse inside" $
+        queryFirst (rev $ fastcat [pure 100, rev simpleZwirn, pure 200, pure 300]) @?~ [(0, 300), (1 % 4, 200), (8 % 16, 1), (9 % 16, 2), (10 % 16, 3), (11 % 16, 4), (3 % 4, 100)],
+      testCase "squeezeJoin" $
+        queryFirst (squeezeJoin $ fmap (const $ fastcat [pure 10, pure 20 :: Cord () () Int]) simpleZwirn) @?~ [(0, 10), (1 % 8, 20), (2 % 8, 10), (3 % 8, 20), (4 % 8, 10), (5 % 8, 20), (6 % 8, 10), (7 % 8, 20)],
+      testCase "ply" $
+        queryFirst (ply (pure 2) simpleZwirn) @?~ [(0, 1), (1 / 8, 1), (1 / 4, 2), (3 / 8, 2), (1 / 2, 3), (5 / 8, 3), (3 / 4, 4), (7 / 8, 4)],
+      testCase "zoom" $
+        queryFirst (zoom (pure 0.25) (pure 0.75) simpleZwirn) @?~ [(0, 2), (1 / 4, 3), (1 / 2, 2), (3 / 4, 3)],
+      testCase "zoom rev" $
+        queryFirst (zoom (pure 1) (pure 0) simpleZwirn) @?~ queryFirst (rev simpleZwirn),
+      testCase "timeloop" $
+        queryFirst (timeloop (pure 0.25) simpleZwirn) @?~ [(0, 1), (1 / 4, 1), (1 / 2, 1), (3 / 4, 1)],
+      testCase "cat" $
+        queryN 4 (cat (0.25, pure 1) (0.25, pure 2)) @?~ [(0, 1), (1 / 4, 2), (2, 1), (9 / 4, 2)],
+      testCase "cyclecat" $
+        queryN 3 (cyclecat [(1, pure 10), (2, slow (pure 2) $ pure 20)]) @?~ [(0, 10), (1, 20)],
+      testCase "cyclecat 2" $
+        queryN 2 (cyclecat [(0.5, pure 10), (1, pure 20), (0.5, pure 30)]) @?~ [(0, 10), (1 / 2, 20), (3 / 2, 30)],
+      testCase "fastcyclecat" $
+        queryFirst (fastcyclecat [(0.25, pure 1), (0.25, pure 2)]) @?~ [(0, 1), (1 / 4, 2), (1 / 2, 1), (3 / 4, 2)],
+      testCase "everyFor" $
+        queryFirst (everyFor (pure 1) (pure 0.5) (pure $ fmap succ) simpleZwirn) @?~ [(0, 2), (1 / 4, 3), (1 / 2, 3), (3 / 4, 4)],
+      testCase "everyFor 2" $
+        queryN 2 (everyFor (pure 0.75) (pure 0.5) (pure $ fmap (const 100)) simpleZwirn) @?~ [(0, 100), (1 / 4, 100), (1 / 2, 3), (3 / 4, 100), (1, 100), (5 / 4, 2), (3 / 2, 100), (7 / 4, 100)],
+      testCase "ifthen" $
+        queryFirst (ifthen (fastcat [pure True, pure False]) (pure 10) (fastcat [pure 20, pure 30])) @?~ [(0, 10), (1 / 2, 30)],
+      testCase "ifthen 2" $
+        queryFirst (ifthen (fastcat [pure True, pure False]) simpleZwirn simpleZwirn) @?~ [(0, 1), (1 / 4, 2), (1 / 2, 3), (3 / 4, 4)],
+      testCase "while" $
+        queryFirst (while (fastcat [pure True, pure False]) (pure $ fmap succ) simpleZwirn) @?~ [(0, 2), (1 / 4, 3), (1 / 2, 3), (3 / 4, 4)],
+      testCase "simpleCord" $
+        queryFirst simpleCord @?~ [(0, 10), (0, 1), (1 / 4, 2), (1 / 2, 3), (3 / 4, 4)],
+      testCase "enum cord" $
+        queryFirst (enumFromToStack (pure 0) (pure 4)) @?~ [(0, 0), (0, 1), (0, 2), (0, 3), (0, 4)],
+      testCase "zipApply" $
+        queryFirst (zipApply (stack [pure $ fmap (+ 10), pure $ fmap (+ 100)]) (stack [fastcat [pure 1, pure 2], pure 3])) @?~ [(0 % 1, 11), (0 % 1, 103), (1 % 2, 12)],
+      testCase "sine" $
+        queryFirst (segment (pure 4) sine) ~@?~ [(0, 0.5), (1 / 4, 1), (1 / 2, 0.5), (3 / 4, 0)],
+      testCase "rev sine" $
+        queryFirst (segment (pure 4) $ rev sine) ~@?~ [(0, 0.5), (1 / 4, 0), (1 / 2, 0.5), (3 / 4, 1)],
+      testCase "singleton" $
+        queryFirst (singleton (pure "n") (fast (pure 2) $ pure 1)) @?~ [(0, Map.singleton "n" 1), (1 / 2, Map.singleton "n" 1)],
+      testCase "union" $
+        queryFirst (singleton (pure "n") (fast (pure 2) $ pure 1) `union` singleton (pure "s") (pure 1))
+          @?~ [ (0, Map.singleton "n" 1 `Map.union` Map.singleton "s" 1),
+                (1 / 2, Map.singleton "n" 1 `Map.union` Map.singleton "s" 1)
+              ],
+      testCase "fix" $
+        queryFirst (fix (fastcat [pure "n"]) (pure $ const $ pure 10) (singleton (pure "n") (fast (pure 2) $ pure 1) `union` singleton (pure "s") (pure 1)))
+          @?~ [ (0, Map.singleton "n" 10 `Map.union` Map.singleton "s" 1),
+                (1 / 2, Map.singleton "n" 10 `Map.union` Map.singleton "s" 1)
+              ],
+      testCase "fix 2" $
+        queryFirst (fix (fastcat [pure "n", pure "s"]) (pure $ const $ pure 10) (singleton (pure "n") (fast (pure 2) $ pure 1) `union` singleton (pure "s") (pure 1)))
+          @?~ [ (0, Map.singleton "n" 10 `Map.union` Map.singleton "s" 1),
+                (1 / 2, Map.singleton "n" 1 `Map.union` Map.singleton "s" 10)
+              ],
+      testCase "fix 2" $
+        queryFirst (fix (pure "k") (pure $ const $ pure 10) (singleton (pure "n") (pure 1)))
+          @?~ [ (0, Map.singleton "n" 1)
+              ]
+    ]
+
+-- state tests
+
+-- addOne :: (Functor k, Num st, Zwirned m k st) => m k st a -> m k st a
+-- addOne = modify' (+ 1)
+
+-- multTwo :: (Functor k, Num st, Zwirned m k st) => m k st a -> m k st a
+-- multTwo = modify' (* 2)
+
+-- stateTest :: ZwirnT Identity Int Int
+-- stateTest = addOne $ fastcat (map pure [0 .. 50]) -- fast 2 $ addOne $ fastcat [pure 1, pure 2, multTwo $ fastcat [pure 10, pure 20]]
+
+-- -- stateTest2 :: Zwirn Identity Int Int
+-- -- stateTest2 = lift fast (addOne $ fastcat [pure 4, pure 2]) (multTwo $ fastcat [pure 10, pure 20])
+
+-- stateTest3 :: ZwirnT Identity Int Int
+-- stateTest3 = fastcat [addOne $ pure 1, addOne $ pure 2, addOne $ pure 3, modify' (const 0) $ pure 4]
+
+-- stateTest4 :: ZwirnT Identity Int Int
+-- stateTest4 = modify (\x -> fastcat [x, fmap (+ 1) x]) $ fastcat [pure 1, pure 2, pure 3, pure 4]
+
+-- stateTest5 :: Cord (Map.Map String Int) Int
+-- stateTest5 = modifyMap (\(Just i) -> fastcat [pure i, pure i]) (pure "x") (\x -> liftA2 (+) x (pure 1)) $ fastcat [pure 1, pure 2, pure 3, pure 4]
+
+-- stateTest6 :: Cord (Map.Map String Int) Int
+-- stateTest6 = setMap (pure "x") (pure 10) $ fastcat [pure 1, pure 2, pure 3, pure 4]
+
+-- cord tests
+
+-- cord :: Cord Int Int
+-- cord = stack [fastcat [pure 10, pure 20], fastcat [pure 100, pure 200]]
+
+-- cord2 :: Cord Int Int
+-- cord2 = fast (pure 2) (pure 1)
+
+-- treeTry :: Cord Int Int
+-- treeTry = project (pure 1) $ liftA2 (+) (fastcat [pure 10, stack [pure 20, pure 100]]) (stack [fastcat [pure 1, pure 2], pure 20])
+
+-- funcTree :: Cord Int Int
+-- funcTree = apply (stack [pure rev, pure id]) (stack [fastcat [pure 10, pure 20], fastcat [pure 30, pure 40]])
+
+-- layerTree :: Cord Int Int
+-- layerTree = layer (stack [pure rev, pure id]) (stack [fastcat [pure 10, pure 20], fastcat [pure 30, pure 40]])
+
+-- showTree :: String
+-- showTree = show $ findAllValuesWithTime (Time 0 1, Time 1 1) 0 treeTry
+
+-- treeTry2 :: Cord Int Int
+-- treeTry2 = project (stack [pure 0, pure 0]) $ stack [fastcat [pure 1, pure 2], pure 20]
+
+-- showTree2 :: String
+-- showTree2 = show $ findAllValuesWithTime (Time 0 1, Time 1 1) 0 treeTry2
diff --git a/zwirn-core.cabal b/zwirn-core.cabal
new file mode 100644
--- /dev/null
+++ b/zwirn-core.cabal
@@ -0,0 +1,71 @@
+name:                zwirn-core
+version:             0.1.1.0
+synopsis:            library for manipulating functions of time.
+description:         zwirn-core provides the semantics for the zwirn live coding language.
+                     It is inspired by TidalCycles and implements some of the same API for manipulating functions of time.
+license:             GPL-3
+license-file:        LICENSE
+author:              Martin Gius
+maintainer:          Martin Gius
+copyright:           Martin Gius
+category:            Sound
+build-type:          Simple
+tested-with:         GHC == 9.8.2
+cabal-version:       >=1.10
+
+source-repository this
+  type:              git
+  location:          https://lab.al0.de/martin/zwirn-core
+  tag:               0.1.1.0
+
+library
+  hs-source-dirs: src
+  exposed-modules: Zwirn.Core.Time
+                   Zwirn.Core.Core
+                   Zwirn.Core.Tree
+                   Zwirn.Core.Query
+                   Zwirn.Core.Types
+                   Zwirn.Core.Cord
+                   Zwirn.Core.Random
+                   Zwirn.Core.State
+                   Zwirn.Core.Modulate
+                   Zwirn.Core.Structure
+                   Zwirn.Core.Conditional
+                   Zwirn.Core.Number
+                   Zwirn.Core.Map
+  build-depends:       base >= 4.19.1 && < 4.20,
+                       containers >= 0.6.8 && < 0.7,
+                       hmt >= 0.20 && < 0.21,
+                       mtl >= 2.3.1 && < 2.4,
+                       stm >= 2.5.3 && < 2.6,
+                       random >= 1.2.0 && < 1.4,
+                       hosc >= 0.21.1 && < 0.22
+  default-language:    Haskell2010
+
+test-suite test
+  default-language:
+    Haskell2010
+  type:
+    exitcode-stdio-1.0
+  hs-source-dirs:
+    tests
+  main-is:
+    test.hs
+  build-depends:
+      base >= 4 && < 5,
+      tasty >= 1.5,
+      tasty-smallcheck >= 0.8.2,
+      tasty-quickcheck >= 0.10.3,
+      tasty-hunit >= 0.10.1,
+      containers,
+      zwirn-core
+
+benchmark zwirn-benchmarks
+  build-depends:
+    base,
+    criterion,
+    zwirn-core
+  default-language: Haskell2010
+  hs-source-dirs:   benchmarks
+  main-is:          ZwirnBenchmarks.hs
+  type:             exitcode-stdio-1.0
