diff --git a/Datadirt.lhs b/Datadirt.lhs
new file mode 100644
--- /dev/null
+++ b/Datadirt.lhs
@@ -0,0 +1,64 @@
+> module Datadirt where
+
+> import Stream
+> import Pattern
+> import Control.Applicative
+
+Define the OSC message.  Each datum has:
+ 
+o An OSC type: S (string), F(float) or I (int)
+o A unique name
+o And a default value, prefixed by "Just" or if there is no default,
+  "Nothing".
+
+> datadirt :: OscShape
+> datadirt = OscShape {path = "/trigger",
+>                      params = [ S "sound" Nothing,
+>                                 F "speed" (Just 1),
+>                                 F "shape" (Just 0),
+>                                 F "pan" (Just 0),
+>                                 F "panTo" (Just 0),
+>                                 F "volume" (Just 1),
+>                                 S "envName" (Just "none"),
+>                                 F "anafeelS" (Just 0),
+>                                 F "anafeelF" (Just 0),
+>                                 F "accellerate" (Just 0),
+>                                 S "vowel" (Just ""),
+>                                 S "scale" (Just ""),
+>                                 F "loops" (Just 1),
+>                                 F "duration" (Just 0),
+>                                 F "delay" (Just 0),
+>                                 F "delay2" (Just 0),
+>                                 F "cutoff" (Just 0),
+>                                 F "resonance" (Just 0)
+>                               ],
+>                      timestamp = True
+>                     }
+
+Make some methods for setting particular parameters
+
+> sound        = makeS datadirt "sound"
+> speed        = makeF datadirt "speed"
+> shape        = makeF datadirt "shape"
+> pan          = makeF datadirt "pan"
+> panTo        = makeF datadirt "panTo"
+> volume       = makeF datadirt "volume"
+> envName      = makeS datadirt "envName"
+> anafeelS     = makeF datadirt "anafeelS"
+> anafeelF     = makeF datadirt "anafeelF"
+> accellerate  = makeF datadirt "accellerate"
+> vowel        = makeS datadirt "vowel"
+> scaleName    = makeS datadirt "scaleName"
+> loops        = makeF datadirt "loops"
+> duration     = makeF datadirt "duration"
+> delay        = makeF datadirt "delay"
+> delay2       = makeF datadirt "delay2"
+> cutoff       = makeF datadirt "cutoff"
+> resonance    = makeF datadirt "resonance"
+> offset       = makeT datadirt
+
+Give the port number and your OscShape, and get back an MVar to put
+your Osc patterns in.
+
+> datadirtStream client server name = stream client server name "127.0.0.1" 7770 datadirt
+
diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,675 @@
+              GNU GENERAL PUBLIC LICENSE
+                Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                     Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+              END OF TERMS AND CONDITIONS
+
+     How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
diff --git a/Neko.lhs b/Neko.lhs
new file mode 100644
--- /dev/null
+++ b/Neko.lhs
@@ -0,0 +1,57 @@
+> module Neko where
+
+> import Stream
+> import Pattern
+> import Control.Applicative
+> import Proxy303
+> import Control.Concurrent (forkIO)
+> import System.Process
+
+Define the OSC message.  Each datum has:
+ 
+o An OSC type: S (string), F(float) or I (int)
+o A unique name
+o And a default value, prefixed by "Just" or if there is no default,
+  "Nothing".
+
+> nekobee :: OscShape
+> nekobee = OscShape {path = "/trigger",
+>                      params = [ I "note" (Just 0),
+>                                 F "duration" (Just 0.2),
+>                                 F "saw" (Just 0),
+>                                 F "tuning" (Just 0.5),
+>                                 F "cutoff" (Just 0),
+>                                 F "resonance" (Just 0.6),
+>                                 F "envmod" (Just 0),
+>                                 F "decay" (Just 1),
+>                                 F "accent" (Just 1),
+>                                 F "velocity" (Just 0.9),
+>                                 F "volume" (Just 1)
+>                               ],
+>                      timestamp = False
+>                     }
+
+> nekoProxy remote = do port <- Proxy303.start remote
+>                       return port
+
+Make some methods for setting particular parameters
+
+> note      = makeI nekobee "note"
+> duration  = makeF nekobee "duration"
+> saw       = makeF nekobee "saw"
+> tuning    = makeF nekobee "tuning"
+> cutoff    = makeF nekobee "cutoff"
+> resonance = makeF nekobee "resonance"
+> envmod    = makeF nekobee "envmod"
+> decay     = makeF nekobee "decay"
+> accent    = makeF nekobee "accent"
+> velocity  = makeF nekobee "velocity"
+> volume    = makeF nekobee "volume"
+
+> startNeko location = do output <- readProcess location [] ""
+>                         return $ read output
+
+> nekoStream client server name location 
+>   = do nekoPort <- startNeko location
+>        proxyPort <- nekoProxy nekoPort
+>        stream client server name "127.0.0.1" proxyPort nekobee
diff --git a/NekoPort.hs b/NekoPort.hs
new file mode 100644
--- /dev/null
+++ b/NekoPort.hs
@@ -0,0 +1,4 @@
+module NekoPort where
+
+nekoport :: Int
+nekoport = 11282
diff --git a/OscType.hs b/OscType.hs
new file mode 100644
--- /dev/null
+++ b/OscType.hs
@@ -0,0 +1,20 @@
+{-# LANGUAGE FlexibleInstances, TypeSynonymInstances #-} 
+
+module OscType where
+
+import Sound.OpenSoundControl
+
+class OscType a where
+    toDatum :: a -> Datum
+
+instance OscType Double where
+    toDatum = Float
+
+instance OscType Float where
+    toDatum = Float . realToFrac
+
+instance OscType String where
+    toDatum = String
+
+instance OscType Int where
+    toDatum = Int
diff --git a/Pattern.lhs b/Pattern.lhs
new file mode 100644
--- /dev/null
+++ b/Pattern.lhs
@@ -0,0 +1,296 @@
+> {-# LANGUAGE OverloadedStrings #-}
+
+> module Pattern where
+
+> import Data.List
+> import Data.Maybe
+> import Control.Applicative
+> import Data.Fixed
+
+> type Period = Maybe Int
+> type Behaviour a = Int -> [Maybe a]
+> data Pattern a = Pattern {at :: Behaviour a, period :: Period}
+
+> lcd :: Period -> Period -> Period
+> lcd Nothing _ = Nothing
+> lcd _ Nothing = Nothing
+> lcd (Just n) (Just n') = Just $ lcm n n'
+
+> justPeriod :: Pattern a -> Int
+> justPeriod = fromJust . period
+
+> instance (Show a) => Show (Pattern a) where
+>    show (Pattern _ (Just 0)) = ""
+>
+>    show p@(Pattern f (Just l)) 
+>        = show2D $ map (map show . at p) range
+>     where range = [0 .. (l - 1)]
+>
+>    show p@(Pattern f Nothing) 
+>        = show2D (map (map show . at p) range) ++ "\n..."
+>     where range = [0 .. 15]
+
+> show2D = intercalate "\n" . map (intercalate " ")
+
+Thanks to Ryan Ingram for this elegant functor implementation.
+http://ryani.livejournal.com/19471.html
+
+> instance Functor Pattern where
+>   fmap f (Pattern xs p) = Pattern (fmap (fmap (fmap f)) xs) p
+
+> instance Applicative Pattern where 
+>   pure x = Pattern (pure (pure (pure x))) (Just 1)
+>   Pattern fs pf <*> Pattern xs px = Pattern (liftA2 (zipCycleA2 (<*>)) fs xs) (lcd pf px)
+
+Halway between the applicative definition of a list and a ziplist.  If
+lists aren't the same length, the smallest one is cycled to the same
+length of the largest before zipping.
+
+> zipCycleA2 f a b = zipWith id (f <$> takeCycle n a) (takeCycle n b)
+>     where n = max (length a) (length b)
+
+> takeCycle :: Int -> [a] -> [a]
+> takeCycle n = take n . cycle
+
+The null pattern is a zero period of undefinedness.
+
+> nullPattern :: Pattern a
+> nullPattern = Pattern {at = const undefined, period = Just 0}
+
+Silence is one empty period.
+
+> silence :: Pattern a
+> silence = Pattern {at = const [Nothing], period = Just 1}
+
+Turn a single thing into a pattern of things.
+
+> atom :: a -> Pattern a
+> atom = pure
+
+> lToP :: [Maybe a] -> Pattern a
+> lToP [] = silence
+> lToP xs = Pattern (\n -> [xs !! (n `mod` len)]) (Just len)
+>     where len = length xs
+
+Add one pattern on the end of another.
+
+> append :: Pattern a -> Pattern a -> Pattern a
+> append a@(Pattern f Nothing) _ = a
+> append a@(Pattern _ (Just l)) b@(Pattern _ Nothing) = Pattern newF Nothing
+>     where newF n | n < l = at a n
+>                  | otherwise = at b (n - l)
+> append a@(Pattern f (Just l)) b@(Pattern f' (Just l')) = Pattern newF (Just newL)
+>     where newL = l + l'
+>           newF n | cycleP < l = f ((loopN * l) + cycleP)
+>                  | otherwise = f' ((loopN * l') + (cycleP - l))
+>                  where cycleP = n `mod` newL
+>                        loopN = n `div` newL
+    
+> toInfinity (Pattern f _) = Pattern f Nothing
+
+> isInf :: Pattern a -> Bool
+> isInf (Pattern _ Nothing) = True
+> isInf _ = False
+
+Concatenate a list of patterns
+
+> cat :: [Pattern a] -> Pattern a
+> cat = foldr append nullPattern
+
+> catMap :: (Pattern a -> Pattern a) -> [Pattern a] -> Pattern a
+> catMap f = cat . map f
+
+Find lowest common period (lcm but zeros are ignored)
+
+> lcp :: [Pattern a] -> Period
+> lcp [] = Just 0
+> lcp ps = lcp' $ filter (/= Just 0) (map (\(Pattern _ l) -> l) ps)
+>           where lcp' [] = Just 0
+>                 lcp' ds = foldl lcd (Just 1) ds
+
+Combine patterns, with where period is the lcm of all the periods.
+
+> combine :: [Pattern a] -> Pattern a
+> combine ps = Pattern (\n -> concatMap (\p -> at p n) ps) (lcp ps)
+
+> combineMap :: (Pattern a -> Pattern a) -> [Pattern a] -> Pattern a
+> combineMap f = combine . map f
+
+-- As above but patterns are padded out to be the same length (the lcm,
+-- so two patterns with periods of 2 and 3 will be padded out to have
+-- period of 6).
+
+> combinePad :: [Pattern a] -> Pattern a
+> combinePad ps = combine $ map (pad newP) ps
+>     where newP = lcp ps
+
+> combinePadMap :: (Pattern a -> Pattern a) -> [Pattern a] -> Pattern a
+> combinePadMap f = combinePad . map f
+
+-- Zips two patterns together with the given function
+
+-- > combineWith :: (a -> b -> c) -> Pattern a -> Pattern b -> Pattern c
+-- > combineWith f a b = Pattern (\n -> zipWith f (at a n) (at b n)) (lcm (period a) (period b))
+
+-- Pads pattern out to given duration.  Old period must be divisible
+-- by new period.
+
+> pad :: Period -> Pattern a -> Pattern a
+> pad Nothing p = Pattern newF Nothing
+>     where newF 0 = at p 0
+>           newF _ = [Nothing]
+> pad _ (Pattern _ Nothing) = error "can't pad an infinite pattern"
+> pad newD@(Just newL) p@(Pattern f d@(Just l)) 
+>     | newD == d = p
+>     | newL `mod` l /= 0 = error "old period must be divisible by new"
+>     | otherwise = Pattern newF newD
+>     where pos = newL `div` l
+>           newF n | n `mod` pos == 0 = f $ n `div` pos
+>                  | otherwise = [Nothing]
+
+> padUp :: Int -> Pattern a -> Pattern a
+> padUp n p = pad (Just (n * justPeriod p)) p
+
+-- Inline operators for above.
+
+> (>+<) a b = combine [a, b]
+> (<+>) a b = combinePad [a, b]
+
+-- Make a pattern representing a sine wave with a given period.
+
+> sine :: Int -> Pattern Double
+> sine l = Pattern f (Just l)
+>     where f n = [Just $ sin $ fromIntegral n * (pi / fromIntegral l * 2)]
+
+> sine1 :: Int -> Pattern Double
+> sine1 l = ((/ 2.0) . (+ 1.0)) <$> sine l
+
+ square :: Int -> Pattern Int
+ square l = Pattern f (Just l)
+     where f n | (n `mod` l) > (l `div` 2) = 1
+               | otherwise = -1
+ square1 :: Int -> Pattern Int
+ square1 l = ((`div` 2) . (+ 1)) <$> square l
+
+-- Multiply a pattern's period by n.
+
+> (~*) :: Pattern a -> Int -> Pattern a
+> (~*) p n = Pattern (at p) (fmap (* n) (period p))
+
+-- Apply a function to a pattern every nth period.
+
+> every :: Int -> (Pattern a -> Pattern a) -> Pattern a -> Pattern a
+> every 0 _ p = p
+> every n f p = (p ~* (n - 1)) `append` f p
+
+-- Shift (rotate) a pattern n steps to the left.
+
+> rotL :: Int -> Pattern a -> Pattern a
+> rotL n p = Pattern (\t -> at p (t + n)) (period p)
+
+-- Shift (rotate) a pattern n steps to the right.
+
+> rotR :: Int -> Pattern a -> Pattern a
+> rotR =  rotL . negate
+
+> (<~) = rotL
+> (~>) = rotR
+
+-- Reverse a pattern.
+
+> rev :: Pattern a -> Pattern a
+> rev p | isNothing (period p) = error "Can't reverse infinity"
+> rev p |otherwise = Pattern (\n -> at p $ fromJust d - n - 1) d
+>       where d = period p
+
+> (<<~) = rev
+
+-- Make a pattern into a palindrome by playing forward then back.
+
+> palindrome :: Pattern a -> Pattern a
+> palindrome p@(Pattern _ Nothing) = p
+> palindrome p@(Pattern _ (Just 1)) = p
+> palindrome p@(Pattern _ (Just l)) = cat [p `loopAt` (l - 1),
+>                                          (<<~) p `loopAt` (l - 1)
+>                                         ]
+
+> patternToList :: Pattern a -> [[a]]
+> patternToList p = map (catMaybes . at p) (range p)
+
+> range p | period p == Nothing = [0 ..]
+>         | otherwise = [0 .. justPeriod p - 1]
+
+> maxPolyphony = foldr (max . length) 0 . patternToList
+
+> loopAt :: Pattern a -> Int -> Pattern a
+> loopAt p l = Pattern (\n -> at p $ n `mod` l) (Just l)
+
+> modify :: ((Int -> [Maybe a]) -> (Int -> [Maybe b])) -> Pattern a -> Pattern b
+> modify f p = Pattern (f (at p)) (period p)
+
+Replaces empty beats with the previous beat in the pattern plus 1
+
+Needs redoing with nothings
+
+ incNulls :: Pattern Int -> Pattern Int
+ incNulls p = Pattern (f 0) (period p)
+     where f i n | and [isLooped p i, isSam p i] = [Just 0]
+                 | null (at p n) = [(head (f (i+1) (n-1))) + 1]
+                 | otherwise = [head $ at p n]
+
+ breakbeat :: Pattern a -> Pattern Int -> Pattern a
+ breakbeat p breakPattern = Pattern f (lcd (period p) (period breakPattern))
+     where f n = at p (head $ at (incNulls breakPattern) n)
+
+> periodPos :: Pattern a -> Int -> Int
+> periodPos p n | isInf p = n
+>               | otherwise = n `mod` justPeriod p
+
+> isSam :: Pattern a -> Int -> Bool
+> isSam p n = periodPos p n == 0
+
+> isLooped :: Pattern a -> Int -> Bool
+> isLooped p n | isInf p = False
+>              | otherwise = n > justPeriod p
+
+> onsets :: Pattern a -> Pattern a
+> onsets p = modify f p
+>     where f l n =  if and [not $ null $ l n, null $ l (n-1)] 
+>                    then l n 
+>                    else []
+
+> tween :: Double -> Double -> Int -> Pattern Double
+> tween from to steps = Pattern f (Just steps)
+>     where f n = [Just (from + fromIntegral (n `mod` steps) * (diff / fromIntegral steps))]
+>           diff = to - from
+
+> soundSet :: String -> Int -> Pattern String
+> soundSet s p = Pattern (\n -> [Just  $ s ++ "/" ++ show (n `mod` p)]) (Just p)
+
+> enumerate :: Eq a => Pattern a -> Pattern Int
+> enumerate p = (\x -> fromJust $ elemIndex x l) <$> p 
+>     where l = nub $ concat $ patternToList p
+
+
+> headP :: Pattern a -> [Maybe a]
+> headP p = at p 0
+
+> tailP :: Pattern a -> Pattern a
+> tailP p | isInf p = error "tailP of infinite pattern"
+>         | l <= 0 = error "tailP of pattern with zero period"
+>         | l == 1 = nullPattern
+>         | otherwise = Pattern (at p . offset) (fmap (subtract 1) (period p))
+>         where offset n = 1 + n + (n `div` (l- 1))
+>               l = fromJust $ period p
+
+> extrapolate :: Int -> Pattern Int -> Pattern Int
+> extrapolate by p | isInf p = p
+>                  | otherwise = Pattern newF newP
+>     where newF n = map (fmap (+ ((by * (n `div` justPeriod p)) `mod` 12))) (at p n)
+>           newP = (* ((lcm 12 by) `div` by)) `fmap` period p 
+
+> extrapolateF :: Double -> Pattern Double -> Pattern Double
+> extrapolateF by p | isInf p = p
+>                   | otherwise = Pattern newF (period p)
+>      where newF n = map (fmap (+ ((by * fromIntegral (n `div` justPeriod p)) `mod'` 12))) (at p n) 
+
diff --git a/Proxy303.lhs b/Proxy303.lhs
new file mode 100644
--- /dev/null
+++ b/Proxy303.lhs
@@ -0,0 +1,89 @@
+> module Proxy303 where
+
+> import Control.Concurrent
+> import Sound.OpenSoundControl
+> import Sound.OpenSoundControl.Transport.UDP
+> import Data.List
+> import Data.Maybe
+> import Data.Char
+
+> import qualified Data.ByteString.Lazy as B
+
+> start portDSSI = do serv <- udpServer "127.0.0.1" 0
+>                     localPort <- udpPort serv
+>                     -- hack to get the integer port number out
+>                     let localPortI = fromIntegral $ read $ show localPort
+>                     client <- openUDP "127.0.0.1" portDSSI
+>                     forkIO $ loop serv client
+>                     return localPortI
+
+> neko = "/dssi/nekobee/nekobee/chan00/"
+
+> names :: [String]
+> names = ["note", "duration", "saw", "tuning",
+>          "cutoff", "resonance", "envmod", "decay", "accent",
+>          "velocity", "volume"]
+
+> loop :: UDP -> UDP -> IO ()
+> loop serv client = 
+>     do (Message path params) <- recv serv
+>        runMessage client (zip names params)
+>        loop serv client
+
+> controls = ["saw", "tuning", "cutoff", "resonance", "envmod",
+>             "decay", "accent", "volume"]
+
+> runMessage serv p = do sendNote serv (lI "note") (floor $ (l "velocity") * 127) (l "duration")
+>                        mapM_ (\x -> send serv $ message303 x (l x)) controls
+>     where l name = (\(Float x) -> x) (fromJust $ lookup name p)
+>           lI name = (\(Int x) -> x) (fromJust $ lookup name p)
+
+> sendNote _ 0 _ _ = return ()
+> sendNote serv n v d = do send serv $ noteon neko v n
+>                          putStrLn $ "n: " ++ show n ++ " v: " ++ show v ++ " d: " ++ show d
+>                          forkIO $ do threadDelay (floor $ 1000000.0 * d)
+>                                      send serv $ noteoff neko n
+>                                      return ()
+>                          return ()
+
+> midi :: String -> (Int, Int, Int, Int) -> OSC
+> midi path (a, b, c, d) = 
+>       Message (path ++ "midi") [Midi (fromIntegral a, fromIntegral b,
+>                                       fromIntegral c, fromIntegral d
+>                                      )
+>                                ]
+
+> noteon :: String -> Int -> Int -> OSC
+> noteon path v i = midi path (0, 144, i, v)
+
+> noteoff :: String -> Int -> OSC
+> noteoff path i = midi path (0, 128, i, 0)
+
+> control :: String -> Int -> Double -> OSC
+> control path n value = Message (path ++ "control") [Int n, Float value]
+
+> saw False = control neko 1 0
+> saw True = control neko 1 1
+> nSaw = saw . (>= 0.5)
+
+> square = saw . not
+> tuning = control neko 2
+> cutoff = control neko 3
+> resonance = control neko 4
+> envMod = control neko 5
+> decay value = control neko 6 ((1 - value) * 0.0005)
+> accent = control neko 7
+> volume = control neko 8
+
+> message303 :: String -> Double -> OSC
+> message303 "saw" = saw . (>= 0.5)
+> message303 "tuning" = tuning . (+ 0.5) . (* 1.5)
+> message303 "cutoff" = cutoff . (* 40.0)
+> message303 "resonance" = resonance
+> message303 "envmod" = envMod
+> message303 "decay" = decay
+> message303 "accent" = accent
+> message303 "volume" = control neko 8
+> message303 "note" = (noteon neko 64) . floor
+> message303 "noteoff" = noteoff neko . floor
+> message303 _ = error "Not a 303 parameter"
diff --git a/Rhythm.lhs b/Rhythm.lhs
new file mode 100644
--- /dev/null
+++ b/Rhythm.lhs
@@ -0,0 +1,144 @@
+> {-# OPTIONS_GHC -XTypeSynonymInstances -XOverlappingInstances -XIncoherentInstances -XOverloadedStrings -XFlexibleInstances #-}
+
+> module Rhythm where
+
+> import GHC.Exts( IsString(..) )
+> import Text.ParserCombinators.Parsec
+> import qualified Text.ParserCombinators.Parsec.Token as P
+> import Text.ParserCombinators.Parsec.Language ( haskellDef )
+> import Data.List
+> import Data.Maybe
+> --import Text.Regex
+> import Pattern
+> import Data.Colour
+> import Data.Colour.Names
+> import Data.Colour.SRGB
+
+> class Parseable a where
+>     p :: String -> Pattern a
+
+> instance Parseable Double where
+>     p = parseRhythm pDouble
+
+> instance Parseable String where
+>     p = parseRhythm pVocable
+
+> instance Parseable Bool where
+>     p = parseRhythm pBool
+
+> instance Parseable Int where
+>     p = parseRhythm pInt
+
+> type ColourD = Colour Double
+
+> instance Parseable ColourD where
+>     p = parseRhythm pColour
+
+> instance (Parseable a) => IsString (Pattern a) where
+>    fromString = p
+
+> lexer   = P.makeTokenParser haskellDef
+> braces  = P.braces lexer
+> brackets = P.brackets lexer
+> parens = P.parens lexer
+> symbol  = P.symbol lexer
+> natural = P.natural lexer
+> float = P.float lexer
+> naturalOrFloat = P.naturalOrFloat lexer
+
+
+> data Sign      = Positive | Negative
+
+> applySign          :: Num a => Sign -> a -> a
+> applySign Positive =  id
+> applySign Negative =  negate
+               
+> sign  :: Parser Sign
+> sign  =  do { char '-'
+>             ; return Negative
+>             }
+>      <|> do { char '+'
+>             ; return Positive
+>             }
+>      <|> return Positive
+
+> intOrFloat :: Parser (Either Integer Double)
+> intOrFloat =  do { s   <- sign
+>                   ; num <- naturalOrFloat
+>                   ; return (case num of
+>                               Right x -> Right (applySign s x)
+>                               Left  x -> Left  (applySign s x)
+>                            )
+>                   }
+
+
+ r :: String -> Pattern a -> IO (Pattern a)
+ r s orig = do catch (return $ p s)
+                    (\err -> do putStrLn (show err)
+                                return orig
+                    )
+
+ playRhythm :: (Monad m, Show a) => Parser (Pattern a) -> String -> m [Char]
+ playRhythm f s = do let parsed = parseRhythm f s
+                     return $ either (\e -> "Error" ++ show e)  show parsed
+
+> parseRhythm :: Parser (Pattern a) -> String -> (Pattern a)
+> parseRhythm f input = either (const silence) id $ parse (pRhythm f') "" input
+>     where f' = f 
+>                <|> do symbol "~" <?> "rest"
+>                       return silence
+
+
+> pRhythm :: Parser (Pattern a) -> GenParser Char () (Pattern a)
+> pRhythm f = do spaces
+>                pSequence f
+
+> pSequence :: Parser (Pattern a) -> GenParser Char () (Pattern a)
+> pSequence f = do ps <- many $ pPart f
+>                  return $ cat ps
+
+> pPart :: Parser (Pattern a) -> Parser (Pattern a)
+> pPart f = do part <- parens (pSequence f) <|> f <|> pPoly f <|> pPolyPad f
+>              spaces
+>              return part
+
+> pPoly :: Parser (Pattern a) -> Parser (Pattern a)
+> pPoly f = do ps <- brackets (pRhythm f `sepBy` symbol ",")
+>              return $ combine ps
+
+> pPolyPad :: Parser (Pattern a) -> Parser (Pattern a)
+> pPolyPad f = do ps <- braces (pRhythm f `sepBy` symbol ",")
+>                 return $ combinePad ps
+
+> pString :: Parser (String)
+> pString = many1 (letter <|> oneOf "0123456789" <|> char '/') <?> "string"
+
+> pVocable :: Parser (Pattern String)
+> pVocable = do v <- pString
+>               return $ atom v
+
+> pDouble :: Parser (Pattern Double)
+> pDouble = do nf <- intOrFloat <?> "float"
+>              let f = either fromIntegral id nf
+>              return $ atom f
+
+> pBool :: Parser (Pattern Bool)
+> pBool = do oneOf "t1"
+>            return $ atom True
+>         <|>
+>         do oneOf "f0"
+>            return $ atom False
+
+> pColour :: Parser (Pattern ColourD)
+> pColour = do name <- many1 letter <?> "colour name"
+>              colour <- readColourName name <?> "known colour"
+>              return $ atom colour
+
+> pInt :: Parser (Pattern Int)
+> pInt = do i <- natural <?> "integer"
+>           return $ atom (fromIntegral i)
+
+> doubleToGray :: Double -> ColourD
+> doubleToGray n = let shade = n in
+>                      sRGB shade shade shade
+
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/Stream.lhs b/Stream.lhs
new file mode 100644
--- /dev/null
+++ b/Stream.lhs
@@ -0,0 +1,161 @@
+> {-# LANGUAGE OverloadedStrings, FlexibleInstances, RankNTypes #-}
+
+> module Stream where
+
+> import Sound.OpenSoundControl
+> import Network.Netclock.Client
+> import Pattern
+> import Rhythm
+> import Data.Maybe
+> import qualified Data.Map as Map
+> import Control.Applicative
+> import Control.Concurrent
+> import Control.Concurrent.MVar
+> import OscType
+> import Control.Monad
+
+> data OscShape = OscShape {path :: String, 
+>                           params :: [Param], 
+>                           timestamp :: Bool
+>                           }
+> type OscMap = Map.Map Param (Maybe Datum)
+> type OscPattern = Pattern OscMap
+
+ client = "158.223.59.84"
+ server = "158.223.51.82"
+
+ client = "127.0.0.1"
+ server = "127.0.0.1"
+
+> magicOffset :: Int
+> magicOffset = 2
+
+> tpb :: Int
+> tpb = 4
+
+> start :: String -> String -> String -> String -> Int -> OscShape -> IO (MVar OscPattern)
+> start client server name address port shape
+>     = do patternM <- newMVar silence
+>          putStrLn $ "connecting " ++ (show address) ++ ":" ++ (show port)
+>          s <- openUDP address port
+>          putStrLn $ "connected "
+>          let ot = (onTick s shape patternM) :: BpsChange -> Int -> IO ()
+>          forkIO $ clocked name client server tpb ot
+>          return patternM
+
+> onTick :: UDP -> OscShape -> MVar (OscPattern) -> BpsChange -> Int -> IO ()
+> onTick s shape patternM change ticks
+>     = do p <- readMVar patternM
+>          let messages = mapMaybe (toMessage shape) (at p (ticks + magicOffset))
+>          mapM_ (send s) messages
+>          return ()
+
+> stream :: String -> String -> String -> String -> Int -> OscShape -> IO (OscPattern -> IO ())
+> stream client server name address port shape 
+>   = do patternM <- start client server name address port shape
+>        return $ \p -> do swapMVar patternM p
+>                          return ()
+
+
+> data Param = S {name :: String, sDefault :: Maybe String}
+>            | F {name :: String, fDefault :: Maybe Double}
+>            | I {name :: String, iDefault :: Maybe Int}
+>            | T 
+
+> instance Ord Param where
+>     compare T T = EQ
+>     compare _ T = GT
+>     compare T _ = LT
+>     compare a b = compare (name a) (name b)
+
+> instance Eq Param where
+>     T == T = True
+>     T == _ = False
+>     _ == T = False
+>     a == b = name a == name b
+
+> instance Show Param where
+>     show T = "__timestamp"
+>     show p = name p
+
+> defaultDatum :: Param -> Maybe Datum
+> defaultDatum (S _ (Just x)) = Just $ String x
+> defaultDatum (I _ (Just x)) = Just $ Int x
+> defaultDatum (F _ (Just x)) = Just $ Float x
+> defaultDatum T = Nothing
+> defaultDatum _ = Nothing
+
+> hasDefault :: Param -> Bool
+> hasDefault (S _ Nothing) = False
+> hasDefault (I _ Nothing) = False
+> hasDefault (F _ Nothing) = False
+> hasDefault T = True
+> hasDefault _ = True
+
+> defaultMap :: OscShape -> OscMap
+> defaultMap s 
+>     = Map.fromList $ map (\x -> (x, defaultDatum x)) (defaulted s)
+
+> required :: OscShape -> [Param]
+> required = filter (not . hasDefault) . params
+
+> defaulted :: OscShape -> [Param]
+> defaulted = filter hasDefault . params
+
+> toMessage :: OscShape -> Maybe OscMap -> Maybe OSC
+> toMessage s m = do m' <- applyShape' s m
+>                    let ps = (params s)
+>                        oscdata = catMaybes $ mapMaybe (\x -> Map.lookup x m') ps
+>                        osc = Message (path s) oscdata
+>                        -- TODO fix time stamping
+>                        --osc' = stamp s t (join $ Map.lookup T m') osc
+>                    return osc
+
+> stamp :: OscShape -> Double -> (Maybe Datum) -> OSC -> OSC
+> -- timestamp set to false
+> stamp (OscShape _ _ False) _ _ osc = osc
+> -- no offset given
+> stamp _ t Nothing osc = Bundle (NTPi $ utcr_ntpi t) [osc]
+> -- offset given
+> stamp _ t (Just (Float offset)) osc = Bundle (NTPi ts) [osc]
+>     where ts = utcr_ntpi (t + offset)
+
+ toMsgPattern :: OscShape -> OscPattern -> Pattern (Maybe OSC)
+ toMsgPattern s p = fmap (toMessage s) p
+
+> applyShape :: OscShape -> OscPattern -> OscPattern
+> applyShape s p = Pattern l (period p)
+>     where l = map (applyShape' s) . at p
+
+> applyShape' :: OscShape -> Maybe OscMap -> Maybe OscMap
+> applyShape' _ Nothing = Nothing
+> applyShape' s (Just m) | hasRequired s m = Just $ Map.union m (defaultMap s)
+>                        | otherwise = Nothing
+
+> hasRequired :: OscShape -> OscMap -> Bool
+> hasRequired s m = isSubset (required s) (Map.keys (Map.filter (\x -> x /= Nothing) m))
+
+> isSubset :: (Eq a) => [a] -> [a] -> Bool
+> isSubset xs ys = all (\x -> elem x ys) xs
+
+> make :: (a -> Datum) -> OscShape -> String -> Pattern a -> OscPattern
+> make toOsc s nm p = Pattern l (period p)
+>     where l n = map (\x -> Just $ Map.singleton nParam (defaultV x)) (at p n)
+>           nParam = param s nm
+>           defaultV (Just a) = Just $ toOsc a
+>           defaultV Nothing = defaultDatum nParam
+
+> makeS = make String
+> makeF = make Float
+> makeI = make Int
+> makeT s = make Float s "__timestamp" 
+
+> param :: OscShape -> String -> Param
+> param _ "__timestamp" = T
+> param shape n = head $ filter (\x -> name x == n) (params shape)
+
+> merge :: OscPattern -> OscPattern -> OscPattern
+> merge x y = Map.union <$> x <*> y
+
+> infixr 1 ~~
+> (~~) = merge
diff --git a/tidal.cabal b/tidal.cabal
new file mode 100644
--- /dev/null
+++ b/tidal.cabal
@@ -0,0 +1,61 @@
+-- tidal.cabal auto-generated by cabal init. For additional options,
+-- see
+-- http://www.haskell.org/cabal/release/cabal-latest/doc/users-guide/authors.html#pkg-descr.
+-- The name of the package.
+Name:                tidal
+
+-- The package version. See the Haskell package versioning policy
+-- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for
+-- standards guiding when and how versions should be incremented.
+Version:             0.1
+
+-- A short (one-line) description of the package.
+Synopsis:            Pattern language for improvised music
+
+-- A longer description of the package.
+-- Description:         
+
+-- URL for the project homepage or repository.
+Homepage:            http://yaxu.org/tidal/
+
+-- The license under which the package is released.
+License:             GPL-3
+
+-- The file containing the license text.
+License-file:        LICENSE
+
+-- The package author(s).
+Author:              Alex McLean
+
+-- An email address to which users can send suggestions, bug reports,
+-- and patches.
+Maintainer:          tidal@mail.slab.org
+
+-- A copyright notice.
+-- Copyright:           
+
+Category:            Sound
+
+Build-type:          Simple
+
+-- Extra files to be distributed with the package, such as examples or
+-- a README.
+-- Extra-source-files:  
+
+-- Constraint on the version of Cabal needed to build this package.
+Cabal-version:       >=1.4
+
+
+Library
+  -- Modules exported by the library.
+  Exposed-modules:     Rhythm, Datadirt, Pattern, OscType, Stream, Neko, Proxy303, NekoPort
+  
+  -- Packages needed in order to build this package.
+  Build-depends: base < 5, process, netclock, colour, parsec, hosc >= 0.9, containers, diagrams-core, diagrams-lib, bytestring, array
+  
+  -- Modules not exported by this package.
+  -- Other-modules:       
+  
+  -- Extra tools (e.g. alex, hsc2hs, ...) needed to build the source.
+  -- Build-tools:         
+  
