implemented core with the RequestQueue API, implemented tests for most service APIs, updated shell-scripts for running tests / coverage.

38 files changed, 1797 insertions, 751 deletions

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/COPYING
@@ -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/ISSUES b/ISSUES
index 5d0e379..8052420 100644
--- a/ISSUES
+++ b/ISSUES
@@ -58,3 +58,72 @@ fi
 java -jar $GNUNET_JAVA_PREFIX/lib/gnunet.jar
 
 
+
+===========================================================
+
+* @UNIXONLY@ PORT = 2089 in src/util/resolver.conf.on
+ * what's the purpose? we also need this line to be enabled on JAVAPORT
+
+* something I didn't think through from the beginning:
+  how should unknown message types be handled by message handlers?
+ * sometimes we want to see the message (e.g. in server), sometimes it is an error
+ * alternative 1: signal an error to the message handler, somehow pass the original message
+ * alternative 2: pass a special UnknownMessage to the message handler, filter it for higher-level
+   APIs and signal an error.
+
+* finally core/statistics/dht/resolver/... have unit tests!
+  (and coverage works again, but i can't access the cobertura via ssh yet)
+ * currently most test rely on a running gnunet, and use the default configuration
+ * alternative approach:
+  * configuration is copied from resource (may be in a jar!) to a temp file, then passed on the command
+    line to gunet-service-*
+  * useful to test behavior on disconnects
+  * problem: java sucks at managing processes, processes stay alive if we abort a test
+ * dht get: can we assume that "our" peer immediately stores the value?
+
+* naming: when do we use destroy, when do we use disconnect, or is this arbitrary?
+
+* implications of using exceptions in callbacks
+ * esp. when the exception is non-fatal, i.e. the exception is caught, handled, and the program continues
+ * java exceptions have no restarts, may leave gnunet-java in inconsistent state
+
+* how to test callbacks? we do not only need to test for the right values, but also check that callback has actually
+  been called.
+ * first approach: thow a TestSuccess exception, discarded (see above)
+ * current approach: build a list of assertions, check assertions after scheduler is done.
+  * each assertion stores whether it already succeeded and a message
+
+
+* finalziers: used to destroy object. lead to heisenbug/double disconnect. now policy: check if object
+  has been disposed of properly, otherwise log a warning.
+ * cannot guarantee cleanup anyway
+   (java behavior: run finalizers iff unreachabla during gc, may never happen, finalizers on jvm shutdown deprecated)
+
+
+* regarding peerinfo
+  * i don't fully understand how HELLOs work.
+
+* what are the next important services to implement? (probably mesh, peerinfo, transport)
+
+
+* i'm currently considering to use the google guava library
+ * Apache License 2.0
+ * con: large (1.8MB jar)
+  * but: unused class files could be stripped from the jar, e.g. using ProGuard
+ * would replace the apache commons io library
+ * contains collections used throughout gnunet
+  * bloomfilter
+  * multimap, alleviates the boilerplate code when dealing with hashmaps of lists
+ * methods to deal with "signed" primitives
+ * dealing with files (e.g. copying)
+ * redirecting i/o streams from/to files (when issuing external commands)
+ * hashing utilities
+ * tables (mapping from key pair to value), would replace nested Maps in e.g. Configurations
+ * ...
+
+
+
+
+* long-term todos:
+ * refactor the Construct implementation, implement the "nicer" syntax
+ * refactor the getopt implementation
\ No newline at end of file
diff --git a/lib/guava-12.0.jar b/lib/guava-12.0.jar
new file mode 100644
index 0000000..c990f00
--- /dev/null
+++ b/lib/guava-12.0.jar
diff --git a/src/org/gnunet/construct/MsgMap.txt b/src/org/gnunet/construct/MsgMap.txt
index 3e3178f..71d95d7 100644
--- a/src/org/gnunet/construct/MsgMap.txt
+++ b/src/org/gnunet/construct/MsgMap.txt
@@ -1,5 +1,3 @@
-org.gnunet.construct.UnionTest$TestUnion|0=org.gnunet.construct.UnionTest$TestUnionCase0
-org.gnunet.construct.UnionTest$TestUnion|1=org.gnunet.construct.UnionTest$TestUnionCase1
 org.gnunet.util.Resolver$Address|0=org.gnunet.util.Resolver$TextualAddress
 org.gnunet.util.Resolver$Address|1=org.gnunet.util.Resolver$NumericAddress
 org.gnunet.util.GnunetMessage$Body|68=org.gnunet.core.DisconnectNotifyMessage
@@ -31,4 +29,4 @@ org.gnunet.util.GnunetMessage$Body|169=org.gnunet.statistics.GetMessage
 org.gnunet.util.GnunetMessage$Body|168=org.gnunet.statistics.SetMessage
 org.gnunet.util.GnunetMessage$Body|173=org.gnunet.statistics.WatchResponseMessage
 org.gnunet.util.GnunetMessage$Body|172=org.gnunet.statistics.WatchMessage
-# generated 2012/05/12 12:08:13
+# generated 2012/05/29 19:00:30
diff --git a/src/org/gnunet/core/Core.java b/src/org/gnunet/core/Core.java
index e51f040..ed163af 100644
--- a/src/org/gnunet/core/Core.java
+++ b/src/org/gnunet/core/Core.java
@@ -20,16 +20,14 @@
 
 package org.gnunet.core;
 
-import org.gnunet.construct.*;
+import org.gnunet.construct.Construct;
+import org.gnunet.construct.MessageLoader;
 import org.gnunet.util.*;
 import org.grothoff.Runabout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.Map;
 
 
@@ -42,23 +40,15 @@ public class Core {
     private static final Logger logger = LoggerFactory
             .getLogger(Core.class);
 
-
-    private final static int
-            CORE_OPTION_FULL_INBOUND = 8,
-            CORE_OPTION_HDR_INBOUND = 16,
-            CORE_OPTION_FULL_OUTBOUND = 32,
-            CORE_OPTION_HDR_OUTBOUND = 64;
-
-
     private final Client client;
 
-    /**
+    private final RequestQueue requestQueue;
+
+    /*
      * set to null once connected for the first time
      */
     private InitCallback initCallback;
 
-    private final RequestQueue requestQueue;
-
     /*
      * Callbacks for traffic notifications. null if not used.
      */
@@ -68,64 +58,111 @@ public class Core {
     private MessageNotify notifyInboundMessages;
 
 
+    /*
+     * Callbacks for connect/disconnect events
+     */
     private ConnectHandler connectHandler;
     private DisconnectHandler disconnectHandler;
 
-    private final CoreReceiver coreReceiver = new CoreReceiver();
 
     // per default we are interested in all messages => specific interest set is empty
     private int[] interested = new int[0];
+    /**
+     * Handler for the messages we are interested in.
+     */
     private Runabout messageHandler;
 
-    HashMap<PeerIdentity, ConnectedPeerInfo> connectedPeers = new HashMap<PeerIdentity, ConnectedPeerInfo>(10);
-
-    LinkedList<TransmitHandle> pending = new LinkedList<TransmitHandle>();
 
-    LinkedList<SendMessage> approvedSendMessages = new LinkedList<SendMessage>();
-
-    private Cancelable currentClientTransmitHandle;
+    /**
+     * All currently connected peers with information about them attached
+     */
+    HashMap<PeerIdentity, ConnectedPeerInfo> connectedPeers = new HashMap<PeerIdentity, ConnectedPeerInfo>(10);
 
 
     /**
-     * Represents a request for transmission.
+     * Information about the requests on connected peers.
      */
-    public class TransmitHandle {
-        private PeerIdentity peerIdentity;
-        private MessageTransmitter transmitter;
-        private int smrId;
-        private Cancelable timeoutHandle;
-        private int size;
-        public AbsoluteTime deadline;
-    }
-
     private class ConnectedPeerInfo {
-        public Map<Integer, TransmitHandle> requestsToPeer = new HashMap<Integer, TransmitHandle>(1);
+        public Map<Integer, NotifyTransmitReadyRequest> requestsToPeer = new HashMap<Integer,
+                NotifyTransmitReadyRequest>(1);
         public int nextSmrId;
     }
 
-    public Core(Configuration cfg) {
-        client = new Client("core", cfg);
-        requestQueue = new RequestQueue(client, new CoreReceiver());
-    }
 
-    public void init(InitCallback initCallback) {
-        this.initCallback = initCallback;
-        reconnect();
+    /**
+     * Request to transmit a message, sent after the corresponding NotifyTransmitRequest has been
+     * approved by core.
+     */
+    private class TransmitRequest extends RequestQueue.Request {
+        public NotifyTransmitReadyRequest origin;
+        public GnunetMessage message;
+
+        @Override
+        public AbsoluteTime getDeadline() {
+            return origin.deadline;
+        }
+
+        @Override
+        public void transmit(Connection.MessageSink sink) {
+            SendMessage sm = new SendMessage();
+            sm.cork = 0;
+            sm.deadline = origin.deadline.asMessage();
+            sm.peer = origin.target;
+            sm.priority = origin.priority;
+            sm.payloadMessage = message;
+
+            sink.send(sm);
+        }
     }
 
-    void reconnect() {
-        InitMessage initMessage = new InitMessage();
+    /**
+     * Sent after we get a SendMessageReady
+     */
+    private class NotifyTransmitReadyRequest extends RequestQueue.Request {
+        public AbsoluteTime deadline;
+        public int size;
+        public int priority;
+        public PeerIdentity target;
+        public MessageTransmitter transmitter;
+        public int smrId;
+
+        @Override
+        public AbsoluteTime getDeadline() {
+            return deadline;
+        }
 
-        initMessage.interested = interested;
-        initMessage.options = 0;
+        @Override
+        public void transmit(Connection.MessageSink sink) {
+            SendMessageRequest smr = new SendMessageRequest();
+            smr.queueSize = 0;
+            smr.priority = priority;
+            smr.deadline = deadline.asMessage();
+            smr.smrId = smrId;
+            smr.peer = target;
+
+            sink.send(smr);
+        }
+    }
 
-        for (int i : interested) {
-            logger.info("we are interested in " + i);
+    private class InitRequest extends RequestQueue.Request {
+        @Override
+        public AbsoluteTime getDeadline() {
+            return AbsoluteTime.FOREVER;
         }
 
-        //requestQueue.sendNext();
+        @Override
+        public void transmit(Connection.MessageSink sink) {
+            InitMessage initMessage = new InitMessage();
+
+            initMessage.interested = interested;
+            initMessage.options = 0;
 
-        client.transmitAndGetResponse(initMessage, RelativeTime.FOREVER, true, new CoreReceiver());
+            for (int i : interested) {
+                logger.info("we are interested in " + i);
+            }
+
+            sink.send(initMessage);
+        }
     }
 
     public class CoreReceiver extends RunaboutMessageReceiver {
@@ -137,21 +174,29 @@ public class Core {
                 initCallback.onInit(m.myIdentity);
                 initCallback = null;
             }
-
-            client.receive(RelativeTime.FOREVER, this);
         }
 
-
         public void visit(ConnectNotifyMessage m) {
             if (connectHandler != null) {
                 connectHandler.onConnect(m.peer);
             }
+        }
 
-            client.receive(RelativeTime.FOREVER, this);
+        public void visit(DisconnectNotifyMessage m) {
+            if (disconnectHandler != null) {
+                disconnectHandler.onDisconnect(m.peer);
+            }
         }
 
         public void visit(NotifyInboundTrafficMessage m) {
             boolean found = false;
+            if (notifyInboundHeaders != null) {
+                notifyInboundHeaders.notify(m.payloadHeader);
+            }
+            if (notifyInboundMessages != null) {
+                // todo: call corresponding notify on notifyInboundMessages
+            }
+
             for (int i : interested) {
                 if (i == m.payloadHeader.messageType) {
                     found = true;
@@ -159,61 +204,51 @@ public class Core {
                 }
             }
             if (found) {
-                messageHandler.visitAppropriate(m.payloadBody);
-            } else {
-                // do stuff
+                Class bodyClass = MessageLoader.getUnionClass(GnunetMessage.Body.class, m.payloadHeader.messageType);
+                @SuppressWarnings("unchecked")
+                GnunetMessage.Body b = (GnunetMessage.Body) Construct.parseAs(m.payloadBody, bodyClass);
+                messageHandler.visitAppropriate(b);
             }
-
-            client.receive(RelativeTime.FOREVER, this);
         }
 
         public void visit(NotifyOutboundTrafficMessage m) {
-
-            client.receive(RelativeTime.FOREVER, this);
+            if (notifyOutboundHeaders != null) {
+                notifyOutboundHeaders.notify(m.payloadHeader);
+            }
+            if (notifyOutboundMessages != null) {
+                // todo
+            }
         }
 
         public void visit(SendMessageReady m) {
-            ConnectedPeerInfo targetPeerInfo = connectedPeers.get(m.peer);
 
-            if (targetPeerInfo == null) {
-                logger.error("SendMessage ready received for unconnected peer " + m.peer);
+            System.out.println("got smr");
 
-                client.receive(RelativeTime.FOREVER, this);
-                return;
-            }
+            ConnectedPeerInfo cpi = connectedPeers.get(m.peer);
+            NotifyTransmitReadyRequest req = cpi.requestsToPeer.get(m.smrId);
 
-            TransmitHandle transmitHandle = targetPeerInfo.requestsToPeer.get(m.smrId);
+            final TransmitRequest transmitRequest = new TransmitRequest();
+            transmitRequest.origin = req;
 
-            final SendMessage sendMessage = new SendMessage();
 
-
-            sendMessage.deadline = transmitHandle.deadline.asMessage();
-            sendMessage.cork = 0;
-            sendMessage.peer = transmitHandle.peerIdentity;
-            sendMessage.priority = 0;
-
-            transmitHandle.transmitter.transmit(new Connection.MessageSink() {
+            req.transmitter.transmit(new Connection.MessageSink() {
+                boolean sent;
                 @Override
                 public void send(GnunetMessage.Body m) {
-                    if (sendMessage.payloadMessage != null) {
-                        throw new AssertionError("can only send one payload message");
+                    if (sent) {
+                        throw new AssertionError("sending multiple messages not supported");
                     }
-                    logger.info("sink called");
-                    sendMessage.payloadMessage = GnunetMessage.fromBody(m);
+                    transmitRequest.message = GnunetMessage.fromBody(m);
+                    sent = true;
                 }
             });
 
-            approvedSendMessages.add(sendMessage);
-
-            transmitPending();
-
-            client.receive(RelativeTime.FOREVER, this);
+            requestQueue.add(transmitRequest);
         }
 
         @Override
         public void visitDefault(Object o) {
             logger.warn("received unexpected message from core: {}", o.getClass());
-            client.receive(RelativeTime.FOREVER, this);
         }
 
         @Override
@@ -222,6 +257,16 @@ public class Core {
         }
     }
 
+    public Core(Configuration cfg) {
+        client = new Client("core", cfg);
+        requestQueue = new RequestQueue(client, new CoreReceiver());
+    }
+
+    public void init(InitCallback initCallback) {
+        this.initCallback = initCallback;
+        requestQueue.sendNext(new InitRequest());
+    }
+
     /**
      * Ask the core to call "notify" once it is ready to transmit the
      * given number of bytes to the specified "target".    Must only be
@@ -229,171 +274,89 @@ public class Core {
      * established (and the client has been informed about this).
      *
      * @param priority    how important is the message?
-     * @param maxdelay    maximum time until transmitter gets called
+     * @param maxdelay    how long can the message wait?
      * @param target      the identity of the receiver
      * @param size        the size of the message we want to transmit
      * @param transmitter called once the core service is ready to send message
      * @return a handle to cancel the notification
      */
-    public Cancelable notifyTransmitReady(long priority, RelativeTime maxdelay,
+    public Cancelable notifyTransmitReady(int priority, RelativeTime maxdelay,
                                           PeerIdentity target, int size, final MessageTransmitter transmitter) {
-        if (!connectedPeers.containsKey(target)) {
-            throw new AssertionError("trying to send message to unconnected peer");
-        }
+        NotifyTransmitReadyRequest notifyRequest = new NotifyTransmitReadyRequest();
+        notifyRequest.priority = priority;
+        notifyRequest.deadline = maxdelay.toAbsolute();
+        notifyRequest.size = size;
+        notifyRequest.target = target;
+        notifyRequest.transmitter = transmitter;
 
         ConnectedPeerInfo cpi = connectedPeers.get(target);
-
-        final TransmitHandle transmitHandle = new TransmitHandle();
-
-        transmitHandle.peerIdentity = target;
-        // add space for the header
-        transmitHandle.size = size + 4;
-        transmitHandle.smrId = cpi.nextSmrId;
-        transmitHandle.transmitter = transmitter;
-        cpi.nextSmrId += 1;
-        transmitHandle.deadline = maxdelay.toAbsolute();
-
-        cpi.requestsToPeer.put(transmitHandle.smrId, transmitHandle);
-
-        if (!maxdelay.isForever()) {
-            transmitHandle.timeoutHandle = Scheduler.addDelayed(maxdelay, new Scheduler.Task() {
-                @Override
-                public void run(Scheduler.RunContext ctx) {
-                    transmitter.handleError();
-                }
-            });
+        if (cpi == null) {
+            throw new AssertionError("notifyTransmitReady called for unconnected peer");
         }
 
-        // todo: add so that 'pending' is ordered by maxdelay
-        pending.add(transmitHandle);
+        notifyRequest.smrId = cpi.nextSmrId;
+        cpi.nextSmrId++;
 
-        transmitPending();
+        cpi.requestsToPeer.put(notifyRequest.smrId, notifyRequest);
 
-        return new Cancelable() {
-            @Override
-            public void cancel() {
-                pending.remove(transmitHandle);
-                if (transmitHandle.timeoutHandle != null) {
-                    transmitHandle.timeoutHandle.cancel();
-                }
-            }
-        };
+        System.out.println("core notifyTransmitReady");
 
 
+        return requestQueue.add(notifyRequest);
     }
 
-    /**
-     * Send the next message to core.
-     */
-    private void transmitPending() {
-        // todo: check if not connected, connect then first!
-        if (currentClientTransmitHandle != null) {
-            logger.info("returning");
-            return;
-        }
-
-        final TransmitHandle transmitHandle = pending.poll();
-        if (transmitHandle != null) {
-            currentClientTransmitHandle = client.notifyTransmitReady(RelativeTime.FOREVER, false,
-                    0, new MessageTransmitter() {
-                @Override
-                public void transmit(Connection.MessageSink sink) {
-                    currentClientTransmitHandle = null;
-
-                    SendMessageRequest request = new SendMessageRequest();
-                    request.peer = transmitHandle.peerIdentity;
-                    request.priority = 0;
-                    request.queueSize = 5;
-                    request.smrId = transmitHandle.smrId;
-                    request.size = transmitHandle.size;
-
-                    request.deadline = transmitHandle.deadline.asMessage();
-
-                    sink.send(request);
-
-                    transmitPending();
-                }
-
-                @Override
-                public void handleError() {
-                    logger.error("error in SendMessageTransmitter");
-                    transmitPending();
-                }
-            });
-
-            return;
-        }
 
-        final SendMessage sm = approvedSendMessages.poll();
-        if (sm != null) {
-            currentClientTransmitHandle = client.notifyTransmitReady(RelativeTime.FOREVER, false,
-                    0, new MessageTransmitter() {
-                @Override
-                public void transmit(Connection.MessageSink sink) {
-                    currentClientTransmitHandle = null;
-                    sink.send(sm);
-                    logger.info("transmitted SendMessage!");
-                    transmitPending();
-                }
+    public void observeOutboundHeaders(HeaderNotify h) {
+        this.notifyOutboundHeaders = h;
+    }
 
-                @Override
-                public void handleError() {
-                    throw new AssertionError("unexpected");
-                }
-            });
-            return;
-        }
-        logger.info("transmitPending did nothing");
+    public void observeInboundHeaders(HeaderNotify h) {
+        this.notifyInboundHeaders = h;
     }
 
+    public void observeInboundMessages(MessageNotify h) {
+        this.notifyInboundMessages = h;
+    }
 
-    public void observeOutboundHeaders(HeaderNotify h) {
+    public void observeOutboundMessages(MessageNotify h) {
+        this.notifyOutboundMessages = h;
     }
 
     public void observeConnect(ConnectHandler connectHandler) {
         this.connectHandler = connectHandler;
     }
 
+    public void observeDisconnect(DisconnectHandler disconnectHandler) {
+        this.disconnectHandler = disconnectHandler;
+    }
 
-    public void handleMessages(Runabout runabout) {
+    /**
+     * Handle all incoming messages with the specified runabout.
+     * Has to be called before init.
+     */
+    public void setMessageHandler(Runabout runabout) {
         if (messageHandler != null) {
             throw new AssertionError("Core can have only on message handler");
         }
+        if (client.isConnected()) {
+            // todo: shouldn't we just reconnect?
+            throw new AssertionError("can set message handler only if not yet connected");
+        }
         messageHandler = runabout;
-        interested = getRunaboutMessageTypes(runabout);
+        interested = RunaboutUtil.getRunaboutMessageTypes(runabout);
+        System.out.println("message types:");
+        for (int i : interested) {
+            System.out.println(i);
+        }System.out.println("message types end");
     }
 
     /**
-     * Disconnect from the core service.    This function can only
+     * Disconnect from the core service. This function can only
      * be called *after* all pending notifyTransmitReady
      * requests have been explicitly cancelled.
      */
     public void disconnect() {
-
-    }
-
-
-    private static ArrayList<Class> getRunaboutVisitees(Runabout r) {
-        Class rc = r.getClass();
-        ArrayList<Class> ret = new ArrayList<Class>(5);
-        for (Method m : rc.getMethods()) {
-            if (!(m.getName().equals("visit") && m.getParameterTypes().length == 1)) {
-                continue;
-            }
-            ret.add(m.getParameterTypes()[0]);
-        }
-        return ret;
-    }
-
-
-    @SuppressWarnings("unchecked")
-    // todo: where to put this?
-    private static int[] getRunaboutMessageTypes(Runabout r) {
-        ArrayList<Class> visitees = getRunaboutVisitees(r);
-        int[] msgtypes = new int[visitees.size()];
-        for (int i = 0; i < visitees.size(); ++i) {
-            msgtypes[i] = MessageLoader.getUnionTag(GnunetMessage.Body.class, visitees.get(i));
-        }
-        return msgtypes;
+        requestQueue.destroy();
+        client.disconnect();
     }
 }
diff --git a/src/org/gnunet/core/InitMessage.java b/src/org/gnunet/core/InitMessage.java
index f76d043..5546088 100644
--- a/src/org/gnunet/core/InitMessage.java
+++ b/src/org/gnunet/core/InitMessage.java
@@ -28,6 +28,15 @@ import org.gnunet.util.GnunetMessage;
 
 @UnionCase(64)
 public class InitMessage implements GnunetMessage.Body {
+    /*
+    * Options used to tell core what kind of traffic notify messages we are interested in.
+    */
+    private final static int
+            OPTION_FULL_INBOUND = 8,
+            OPTION_HDR_INBOUND = 16,
+            OPTION_FULL_OUTBOUND = 32,
+            OPTION_HDR_OUTBOUND = 64;
+
     @UInt32
     public long options;
 
diff --git a/src/org/gnunet/core/NotifyInboundTrafficMessage.java b/src/org/gnunet/core/NotifyInboundTrafficMessage.java
index 970a4ff..24df262 100644
--- a/src/org/gnunet/core/NotifyInboundTrafficMessage.java
+++ b/src/org/gnunet/core/NotifyInboundTrafficMessage.java
@@ -44,9 +44,15 @@ public class NotifyInboundTrafficMessage implements GnunetMessage.Body {
     @VariableSizeArray(lengthField = "ats_count")
     public ATSInformation[] atsRest;
 
+
     @NestedMessage(newFrame = true)
     public GnunetMessage.Header payloadHeader;
 
-    @Union(tag = "payloadHeader.messageType", optional = true)
-    public GnunetMessage.Body payloadBody;
+    /**
+     * The (optional) message body corresponding to payloadHeader.
+     * Not typed as GnunetMessage.Body because the message type may not be known by this
+     * peer.
+     */
+    @ByteFill
+    public byte[] payloadBody;
 }
diff --git a/src/org/gnunet/core/NotifyOutboundTrafficMessage.java b/src/org/gnunet/core/NotifyOutboundTrafficMessage.java
index 3e66685..f2080e6 100644
--- a/src/org/gnunet/core/NotifyOutboundTrafficMessage.java
+++ b/src/org/gnunet/core/NotifyOutboundTrafficMessage.java
@@ -47,6 +47,12 @@ public class NotifyOutboundTrafficMessage implements GnunetMessage.Body {
     @NestedMessage(newFrame = true)
     public GnunetMessage.Header payloadHeader;
 
-    @Union(tag = "payloadHeader.messageType", optional = true)
-    public GnunetMessage.Body payloadBody;
+    /**
+     * The (optional) message body corresponding to payloadHeader.
+     * Not typed as GnunetMessage.Body because the message type may not be known by this
+     * peer.
+     */
+    @ByteFill
+    public byte[] payloadBody;
+
 }
diff --git a/src/org/gnunet/statistics/Statistics.java b/src/org/gnunet/statistics/Statistics.java
index a657053..5f3af59 100644
--- a/src/org/gnunet/statistics/Statistics.java
+++ b/src/org/gnunet/statistics/Statistics.java
@@ -48,7 +48,7 @@ public class Statistics {
     /**
      * Time after we give up on setting values in statistics
      */
-    private static final RelativeTime SET_TIMEOUT = RelativeTime.SECOND.multiply(5);
+    private static final RelativeTime SET_TIMEOUT = RelativeTime.SECOND.multiply(10);
 
     private final static int SETFLAG_RELATIVE = 1;
     private final static int SETFLAG_PERSIST = 2;
@@ -69,7 +69,7 @@ public class Statistics {
     /**
      * List of all watch requests, canceled watch requests are null (but stay due to protocol limitations)
      */
-    ArrayList<StatisticsWatchRequest> watchRequests = new ArrayList<StatisticsWatchRequest>();
+    private ArrayList<StatisticsWatchRequest> watchRequests = new ArrayList<StatisticsWatchRequest>();
 
     /**
      * A request to the statistics service.
@@ -199,7 +199,9 @@ public class Statistics {
 
     public class StatisticsMessageReceiver extends RunaboutMessageReceiver {
         public void visit(GetResponseMessage m) {
-            currentGetReceiver.onReceive(m.subsystemName, m.statisticName, m.value);
+            StatisticsReceiver tmp = currentGetReceiver;
+            currentGetReceiver = null;
+            tmp.onReceive(m.subsystemName, m.statisticName, m.value);
         }
 
         public void visit(GetResponseEndMessage m) {
diff --git a/src/org/gnunet/util/Client.java b/src/org/gnunet/util/Client.java
index 70f7eaa..4964e4e 100644
--- a/src/org/gnunet/util/Client.java
+++ b/src/org/gnunet/util/Client.java
@@ -175,9 +175,7 @@ public class Client {
         connection.disconnect();
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize();
-        disconnect();
+    public boolean isConnected() {
+        return connection.isConnected();
     }
 }
diff --git a/src/org/gnunet/util/Configuration.java b/src/org/gnunet/util/Configuration.java
index 737802a..bd2c545 100644
--- a/src/org/gnunet/util/Configuration.java
+++ b/src/org/gnunet/util/Configuration.java
@@ -20,8 +20,9 @@
 
 package org.gnunet.util;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.LineIterator;
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.Table;
+import com.google.common.io.Files;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,6 +30,7 @@ import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -56,8 +58,9 @@ public class Configuration {
     private static Pattern tag = Pattern.compile("(\\S+?)\\s*=(.*?)");
     private static Pattern whitspace = Pattern.compile("\\s*");
 
-    private final Map<String, Map<String, String>> sections = new LinkedHashMap<String, Map<String, String>>(100);
-    
+    // rows are sections, colums are options
+    private final Table<String, String, String> sections = HashBasedTable.create();
+
     private final Map<String, Set<String>> sectionSources = new HashMap<String, Set<String>>(20);
 
     /**
@@ -81,11 +84,8 @@ public class Configuration {
             orig = orig.replace("$" + e.getKey(), e.getValue());
         }
 
-        if (sections.containsKey("PATHS")) {
-            for (final Map.Entry<String, String> e : sections.get("PATHS")
-                    .entrySet()) {
-                orig = orig.replace("$" + e.getKey(), e.getValue());
-            }
+        for (final Map.Entry<String, String> e : sections.row("PATHS").entrySet()) {
+            orig = orig.replace("$" + e.getKey(), e.getValue());
         }
         return orig;
     }
@@ -97,10 +97,7 @@ public class Configuration {
      * @return an unmodifiable view of the section.
      */
     public Map<String, String> getSection(String s) {
-        Map<String, String> m = sections.get(s);
-        if (m == null) {
-            throw new ParsingError("configuration section not found");
-        }
+        Map<String, String> m = sections.row(s);
         return Collections.unmodifiableMap(m);
     }
 
@@ -110,7 +107,7 @@ public class Configuration {
      * @return set of non-empty section names
      */
     public Set<String> getSections() {
-        return sections.keySet();
+        return sections.rowKeySet();
     }
 
     /**
@@ -120,10 +117,9 @@ public class Configuration {
      * @param option  option of interest
      * @param choices list of legal values
      * @return matching value from choices
-     * @throws ParsingError
      */
     public String getValueChoice(String section, String option,
-                                Iterable<String> choices) {
+                                 Iterable<String> choices) {
         String value = getValueString(section, option);
         if (value == null) {
             throw new ParsingError(String.format(
@@ -144,7 +140,7 @@ public class Configuration {
      * Get a configuration value that should be a number
      *
      * @param section section of interest
-     * @param option option of interest
+     * @param option  option of interest
      * @return null if value not in configuration, the option's value otherwise
      */
     public long getValueNumer(String section, String option) {
@@ -161,7 +157,7 @@ public class Configuration {
                     + section + " option " + option + ": " + e.getMessage(), e);
         }
     }
-    
+
     private void logSectionSources(String section) {
         Set<String> sources = sectionSources.get(section);
         if (sources == null) {
@@ -175,14 +171,14 @@ public class Configuration {
      * Set an option to a string value in a section.
      *
      * @param section section of interest
-     * @param option option of interest
-     * @throws ParsingError
+     * @param option  option of interest
      * @return value
      */
     public String getValueString(String section, String option) {
         ensureSectionExists(section);
-        return sections.get(section).get(option);
+        return sections.get(section, option);
     }
+
     /**
      * Gets a configuration value that should be in a set of {"YES","NO"}.
      *
@@ -213,7 +209,6 @@ public class Configuration {
         throw new ParsingError(
                 "Configuration error: value not recognized as YES or NO");
     }
-    
 
     /**
      * Tests if we have a value for a particular option.
@@ -223,8 +218,7 @@ public class Configuration {
      * @return true if so, false of not
      */
     public boolean haveValue(String section, String option) {
-        return sections.containsKey(section)
-                && sections.get(section).containsKey(option);
+        return sections.contains(section, option);
     }
 
     /**
@@ -232,59 +226,57 @@ public class Configuration {
      * configuration environment.
      *
      * @param filename name of the configuration file
-     * @throws ParsingError
      */
     public void parse(String filename) {
         filename = replaceHome(filename);
-        
+
         String current_section = "";
 
-        LineIterator it;
+        Iterator<String> it;
+
         try {
-            it = FileUtils.lineIterator(new File(filename));
+            List<String> lines = Files.readLines(new File(filename), Charset.defaultCharset());
+            it = lines.iterator();
         } catch (IOException e) {
-            throw new ParsingError("Cannot read configuration file '" + filename+ "'");
+            throw new ParsingError("Cannot read configuration file '" + filename + "'");
         }
 
         int lineNumer = 1;
 
-        try {
-            while (it.hasNext()) {
-                String line = it.nextLine();
-                // strip comment
-                line = line.split("#")[0];
-                Matcher m;
-
-                if ((m=tag.matcher(line)).matches()) {
-                    String option = m.group(1).trim();
-                    String value = m.group(2).trim();
-
-                    if (value.length() != 0 && value.charAt(0) == '"') {
-                        int pos = value.indexOf('"', 1);
-                        if (pos == -1) {
-                            logger.warn("incorrecly quoted config value");
-                            continue;
-                        }
-                        value = value.substring(1, pos);
+        while (it.hasNext()) {
+            String line = it.next();
+            // strip comment
+            line = line.split("#")[0];
+            Matcher m;
+
+            if ((m = tag.matcher(line)).matches()) {
+                String option = m.group(1).trim();
+                String value = m.group(2).trim();
+
+                if (value.length() != 0 && value.charAt(0) == '"') {
+                    int pos = value.indexOf('"', 1);
+                    if (pos == -1) {
+                        logger.warn("incorrecly quoted config value");
+                        continue;
                     }
-                    setValueString(current_section, option, value);
-                } else if ((m=section.matcher(line)).matches()) {
-                    current_section = m.group(1).trim();
-                    if (sectionSources.containsKey(current_section)) {
-                        sectionSources.get(current_section).add(filename);
-                    } else {
-                        sectionSources.put(current_section, new HashSet<String>(Collections.singleton(filename)));
-                    }
-                } else if (whitspace.matcher(line).matches()) {
-                    // whitespace is ok
+                    value = value.substring(1, pos);
+                }
+                setValueString(current_section, option, value);
+            } else if ((m = section.matcher(line)).matches()) {
+                current_section = m.group(1).trim();
+                if (sectionSources.containsKey(current_section)) {
+                    sectionSources.get(current_section).add(filename);
                 } else {
-                    logger.warn(String.format("skipped unreadable line %s in configuration file '%s': '%s'", lineNumer, filename, line));
+                    sectionSources.put(current_section, new HashSet<String>(Collections.singleton(filename)));
                 }
-
-                lineNumer++;
+            } else if (whitspace.matcher(line).matches()) {
+                // whitespace is ok
+            } else {
+                logger.warn(String.format("skipped unreadable line %s in configuration file '%s': '%s'", lineNumer,
+                        filename, line));
             }
-        } finally {
-            it.close();
+
+            lineNumer++;
         }
     }
 
@@ -297,16 +289,15 @@ public class Configuration {
      * Remove the given section and all options in it.
      */
     public void removeSection(String section) {
-        sections.remove(section);
+        sections.row(section).clear();
     }
 
-
     /**
      * Set an option to a string value in a section.
      *
      * @param section section of interest
-     * @param option option of interest
-     * @param value value to set
+     * @param option  option of interest
+     * @param value   value to set
      */
     public void setValueNumber(String section, String option,
                                long value) {
@@ -317,33 +308,26 @@ public class Configuration {
      * Set an option to a string value in a section.
      *
      * @param section section of interest
-     * @param option option of interest
-     * @param value value to set
+     * @param option  option of interest
+     * @param value   value to set
      */
     public void setValueString(String section, String option,
                                String value) {
-        Map<String, String> table = sections.get(section);
-        if (table == null) {
-            table = new LinkedHashMap<String, String>();
-            sections.put(section, table);
-        }
-        table.put(option, value);
+        sections.put(section, option, value);
     }
 
     /**
      * Write configuration file.
      *
      * @param filename where to write the configuration
-     * @throws IOException
      */
     public void write(String filename) throws IOException {
         BufferedWriter w = new BufferedWriter(new FileWriter(new File(
                 filename)));
-        for (Map.Entry<String, Map<String, String>> s : sections
-                .entrySet()) {
-            w.write(s.getKey());
+        for (String section : sections.rowKeySet()) {
+            w.write("["+section+"]");
             w.newLine();
-            for (Map.Entry<String, String> e : s.getValue().entrySet()) {
+            for (Map.Entry<String,String> e : sections.row(section).entrySet()) {
                 w.write(e.getKey() + " = " + e.getValue());
                 w.newLine();
             }
@@ -370,10 +354,10 @@ public class Configuration {
             }
         }
     }
-    
+
     private void ensureSectionExists(String section) {
-        if (!sections.containsKey(section)) {
-            throw new ConfigurationException("Required section '"+section+"' not in configuration");
+        if (!sections.containsRow(section)) {
+            throw new ConfigurationException("Required section '" + section + "' not in configuration");
         }
     }
 
diff --git a/src/org/gnunet/util/Connection.java b/src/org/gnunet/util/Connection.java
index f78101b..602c81e 100644
--- a/src/org/gnunet/util/Connection.java
+++ b/src/org/gnunet/util/Connection.java
@@ -49,7 +49,6 @@ public class Connection {
 
     private Iterable<AddressProbe> addressProbes = null;
 
-
     /**
      * The task that is currently used by the resolve mechanism.
      */
@@ -169,16 +168,6 @@ public class Connection {
                         receiver.handleError();
                         return;
                     }
-                    // todo: this was most probably wrong, revise it!
-                    /*
-                    if (n == 0) {
-                        logger.info("service gracefully disconnected us");
-                        connectionChannel.close();
-                        connectionChannel = null;
-                        receiver.handleError();
-                        return;
-                    }
-                    */
                     logger.debug(String.format("connectionChannel read %s bytes", n));
                 } catch (IOException e) {
                     logger.error("read failed with exception:", e);
@@ -267,6 +256,7 @@ public class Connection {
 
         @Override
         public void run(Scheduler.RunContext ctx) {
+            this.transmitTask = null;
             try {
                 int n = connectionChannel.write(transmitBuffer);
                 logger.debug("connectionChannel has written " + n + " bytes");
@@ -279,8 +269,11 @@ public class Connection {
                     currentTransmitHelper = null;
                 } else {
                     currentTransmitHelper = nextTransmitHelper;
-                    nextTransmitHelper.start();
+                    // we need to to this so the transmit callback can do notifyTransmitReady
+                    TransmitHelper tmpTransmitHelper = nextTransmitHelper;
                     nextTransmitHelper = null;
+                    tmpTransmitHelper.start();
+
                 }
             } else {
                 schedule();
@@ -297,7 +290,6 @@ public class Connection {
             transmitter.transmit(TransmitHelper.this);
             transmitBuffer.flip();
             schedule();
-
         }
 
         private void schedule() {
@@ -528,6 +520,7 @@ public class Connection {
     public void disconnect() {
         if (disconnected) {
             logger.warn("disconnect called twice");
+            Thread.dumpStack();
         }
         disconnected = true;
 
@@ -536,6 +529,11 @@ public class Connection {
             nextTransmitHelper.cancel();
             nextTransmitHelper = null;
         }
+        if (currentTransmitHelper != null) {
+            currentTransmitHelper.cancel();
+            currentTransmitHelper = null;
+        }
+
         if (currentReceiveHelper != null) {
             currentReceiveHelper.cancel();
             currentReceiveHelper = null;
@@ -560,9 +558,4 @@ public class Connection {
 
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize();
-        disconnect();
-    }
 }
diff --git a/src/org/gnunet/util/Program.java b/src/org/gnunet/util/Program.java
index 9892fd3..b638ac9 100644
--- a/src/org/gnunet/util/Program.java
+++ b/src/org/gnunet/util/Program.java
@@ -91,11 +91,21 @@ public abstract class Program {
         optParser = new Parser(this);
         unprocessedArgs = optParser.parse(args);
 
-        org.apache.log4j.Logger rootLogger = LogManager.getRootLogger();
+        configureLogging(logLevel, logFile);
+
+        cfg.loadDefaults();
+
+        if (cfgFileName != null) {
+            cfg.parse(cfgFileName);
+        }
+
+        Resolver.getInstance().setConfiguration(cfg);
+    }
 
+    public static void configureLogging(String logLevel, String logFile) {
+        org.apache.log4j.Logger rootLogger = LogManager.getRootLogger();
 
-        // category: 2 levels
-        //
+        // %c{2}: category 2 levels
         Layout layout = new PatternLayout("%d{dd MMM yyyy HH:mm:ss-SSS} %c{2} %p: %m%n");
 
         if (logFile == null) {
@@ -112,7 +122,6 @@ public abstract class Program {
                 rootLogger.addAppender(appender);
             }
         }
-
         if (logLevel == null) {
             rootLogger.setLevel(Level.INFO);
         } else if (logLevel.equalsIgnoreCase("debug")) {
@@ -129,18 +138,6 @@ public abstract class Program {
             rootLogger.setLevel(Level.INFO);
             logger.info("unknown log level '{}'; defaulting to INFO", logLevel);
         }
-
-
-
-        cfg.loadDefaults();
-
-        if (cfgFileName != null) {
-            logger.debug("loading extra config file");
-            cfg.parse(cfgFileName);
-        }
-
-
-        Resolver.getInstance().setConfiguration(cfg);
     }
 
     /**
@@ -164,7 +161,7 @@ public abstract class Program {
     /**
      * Start the Program as the initial task of the Scheduler.
      */
-    public void start() {
+    public final void start() {
         if (showVersion) {
             System.out.println(makeVersionDescription());
         } else if (printHelp) {
diff --git a/src/org/gnunet/util/RequestQueue.java b/src/org/gnunet/util/RequestQueue.java
index fc22e88..2ee0e8d 100644
--- a/src/org/gnunet/util/RequestQueue.java
+++ b/src/org/gnunet/util/RequestQueue.java
@@ -26,6 +26,7 @@ import java.util.LinkedList;
  * Generic queues for Requests to be sent to the service.
  */
 public class RequestQueue {
+    // todo: implement more efficiently (attributes instead of multiple queues)
 
     /**
      * Requests to be transmitted to the service.
@@ -139,7 +140,7 @@ public class RequestQueue {
     }
 
     private void handleReceive() {
-        if (currentReceive != null || destroyed) {
+        if (currentReceive != null || destroyed || !client.isConnected()) {
             return;
         }
         currentReceive = client.receive(RelativeTime.FOREVER, new MessageReceiver() {
@@ -188,12 +189,20 @@ public class RequestQueue {
 
     /**
      * Add a message to the queue that will be sent before all other messages in the queue.
-     * @return
      */
     // should this really be cancelable?
     public Cancelable sendNext(final Request request) {
-        // todo
-        return null;
+        requestsAwaitingTransmit.addFirst(request);
+        handleNextTransmit();
+        return new Cancelable() {
+            @Override
+            public void cancel() {
+                RequestQueue.this.requestsAwaitingTransmit.remove(request);
+                RequestQueue.this.persistentRequests.remove(request);
+                RequestQueue.this.allRequests.remove(request);
+                request.onCancel(!requestsAwaitingTransmit.contains(request));
+            }
+        };
     }
 
     /**
diff --git a/src/org/gnunet/util/RunaboutUtil.java b/src/org/gnunet/util/RunaboutUtil.java
new file mode 100644
index 0000000..54c16e6
--- /dev/null
+++ b/src/org/gnunet/util/RunaboutUtil.java
@@ -0,0 +1,56 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet 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, or (at your
+ option) any later version.
+
+ GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.util;
+
+import org.gnunet.construct.MessageLoader;
+import org.grothoff.Runabout;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+
+
+/**
+ * Utility methods for the runabout.
+ */
+public class RunaboutUtil {
+    public static ArrayList<Class> getRunaboutVisitees(Runabout r) {
+        Class rc = r.getClass();
+        ArrayList<Class> ret = new ArrayList<Class>(5);
+        for (Method m : rc.getMethods()) {
+            if (!(m.getName().equals("visit") && m.getParameterTypes().length == 1)) {
+                continue;
+            }
+            ret.add(m.getParameterTypes()[0]);
+        }
+        return ret;
+    }
+
+    @SuppressWarnings("unchecked")
+    // todo: where to put this?
+    public static int[] getRunaboutMessageTypes(Runabout r) {
+        ArrayList<Class> visitees = getRunaboutVisitees(r);
+        int[] msgtypes = new int[visitees.size()];
+        for (int i = 0; i < visitees.size(); ++i) {
+            msgtypes[i] = MessageLoader.getUnionTag(GnunetMessage.Body.class, visitees.get(i));
+        }
+        return msgtypes;
+    }
+}
diff --git a/src/org/gnunet/util/Scheduler.java b/src/org/gnunet/util/Scheduler.java
index f2c81e8..632aa15 100644
--- a/src/org/gnunet/util/Scheduler.java
+++ b/src/org/gnunet/util/Scheduler.java
@@ -109,7 +109,7 @@ public class Scheduler {
     }
 
     /**
-     * A TaskIdentifier represents a Task that will execute or has already been executed.
+     * A TaskConfiguration represents a Task that will execute or has already been executed.
      */
     public static class TaskConfiguration implements Cancelable {
         private final Task task;
@@ -121,7 +121,8 @@ public class Scheduler {
         private ArrayList<SelectableChannel> eventChannels = null;
         private ArrayList<Integer> eventTypes = null;
 
-        private boolean finished = false;
+        private boolean hasRun = false;
+        private boolean isCanceled = false;
 
         /**
          * Create a TaskIdentifier.
@@ -187,22 +188,25 @@ public class Scheduler {
         }
 
         private void run() {
-            if (finished) {
+            if (hasRun) {
                 throw new AssertionError("same task ran twice");
             }
+            if (isCanceled) {
+                return;
+            }
             TaskConfiguration old = activeTask;
             activeTask = this;
             task.run(ctx);
-            finished = true;
+            hasRun = true;
             activeTask = old;
         }
 
         public void cancel() {
-            if (!pending.contains(this)) {
-                throw new AssertionError("canceling task that is not scheduled");
+            if (isCanceled) {
+                throw new AssertionError("task canceled twice");
             }
+            isCanceled = true;
             pending.remove(this);
-            logger.debug(""+ pending.size() + "tasks remaining");
         }
 
         public Cancelable schedule() {
@@ -234,16 +238,16 @@ public class Scheduler {
             }
         }
 
-        public void selectRead(SocketChannel channel) {
+        public void selectRead(SelectableChannel channel) {
             addChannelEvent(channel, EVENT_READ);
         }
-        public void selectWrite(SocketChannel channel) {
+        public void selectWrite(SelectableChannel channel) {
             addChannelEvent(channel, EVENT_WRITE);
         }
-        public void selectConnect(SocketChannel channel) {
+        public void selectConnect(SelectableChannel channel) {
             addChannelEvent(channel, EVENT_CONNECT);
         }
-        public void selectAccept(SocketChannel channel) {
+        public void selectAccept(SelectableChannel channel) {
             addChannelEvent(channel, EVENT_ACCEPT);
         }
     }
@@ -438,7 +442,9 @@ public class Scheduler {
      * @param initialTask the initial task to run immediately
      */
     public static void run(Task initialTask) {
-        addContinuation(initialTask, EnumSet.of(Reason.STARTUP));
+        if (initialTask != null) {
+            addContinuation(initialTask, EnumSet.of(Reason.STARTUP));
+        }
 
         // the gnunet main loop
         while (checkLiveness()) {
diff --git a/src/org/gnunet/util/Server.java b/src/org/gnunet/util/Server.java
index d6a4290..8aa7c60 100644
--- a/src/org/gnunet/util/Server.java
+++ b/src/org/gnunet/util/Server.java
@@ -30,17 +30,17 @@ import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 
 public class Server {
-
-
     private final RelativeTime idleTimeout;
     private final boolean requireFound;
     private List<ServerSocketChannel> listenSockets;
     private List<ClientHandle> clients;
 
     private HashMap<Class, MessageRunabout> handlers;
+    private List<DisconnectHandler> disconnectHandlers = new LinkedList<DisconnectHandler>();
 
 
     public class ClientHandle {
@@ -62,9 +62,9 @@ public class Server {
          * Notify us when the server has enough space to transmit
          * a message of the given size to the given client.
          *
-         * @param size         requested amount of buffer space
-         * @param timeout      after how long should we give up (and call
-         *                     notify with buf NULL and size 0)?
+         * @param size        requested amount of buffer space
+         * @param timeout     after how long should we give up (and call
+         *                    notify with buf NULL and size 0)?
          * @param transmitter callback
          * @return a handle to cancel the notification
          */
@@ -76,7 +76,7 @@ public class Server {
          * Resume receiving from this client, we are done processing the
          * current request.  This function must be called from within each
          * message handler (or its respective continuations).
-         *
+         * <p/>
          * The server does not automatically continue to receive messages to
          * support flow control.
          *
@@ -144,9 +144,8 @@ public class Server {
      * @param srv ...
      */
     private void doAccept(final ServerSocketChannel srv) {
-        /*
-        Scheduler.TaskBuilder b = new Scheduler.TaskBuilder();
-        b.withTask(new Scheduler.Task() {
+        Scheduler.TaskConfiguration b = new Scheduler.TaskConfiguration(RelativeTime.FOREVER,
+        new Scheduler.Task() {
             @Override
             public void run(Scheduler.RunContext ctx) {
                 try {
@@ -159,9 +158,8 @@ public class Server {
                 doAccept(srv);
             }
         });
-        b.withSelectAccept(srv);
-        Scheduler.add(b);
-        */
+        b.selectAccept(srv);
+        b.schedule();
     }
 
 
@@ -214,13 +212,16 @@ public class Server {
         void onDisconnect(ClientHandle clientHandle);
     }
 
-    public Cancelable notifyDisconnect(DisconnectHandler disconnectHandler) {
-        return null;
+    public Cancelable notifyDisconnect(final DisconnectHandler disconnectHandler) {
+        this.disconnectHandlers.add(disconnectHandler);
+        return new Cancelable() {
+            @Override
+            public void cancel() {
+                Server.this.disconnectHandlers.remove(disconnectHandler);
+            }
+        };
     }
 
-    /**
-     * Free resources held by this server.
-     */
     public void destroy() {
 
     }
diff --git a/src/org/gnunet/util/Service.java b/src/org/gnunet/util/Service.java
index ffbe779..a401655 100644
--- a/src/org/gnunet/util/Service.java
+++ b/src/org/gnunet/util/Service.java
@@ -37,7 +37,6 @@ public abstract class Service extends Program {
     
     public final Server getServer() {
         return s;
-        
     }
 
     public final void stop() {
@@ -49,11 +48,4 @@ public abstract class Service extends Program {
      */
     public abstract void run();
 
-    /**
-     * Start the Program as the initial Task of the Scheduler.
-     */
-    public void start() {
-        System.out.println("bla");
-        super.start();
-    }
 }
diff --git a/src/org/grothoff/Runabout.java b/src/org/grothoff/Runabout.java
index b187260..3e8261f 100644
--- a/src/org/grothoff/Runabout.java
+++ b/src/org/grothoff/Runabout.java
@@ -249,6 +249,9 @@ public class Runabout {
                             throw new RunaboutException("Could not create/load dynamic code!");
                         }
                     } else {
+                        if (!m.isAccessible()) {
+                            m.setAccessible(true);
+                        }
                         // invoke the visitor with an anonymous inner class,
                         // allows for the runabout to be public as the method made accessible
                         // by the Method instance.
@@ -257,6 +260,7 @@ public class Runabout {
                             @Override
                             public void visit(Runabout r, Object o) {
                                 try {
+
                                     m.invoke(r, o);
                                 } catch (IllegalAccessException e) {
                                     throw new RunaboutException(e.toString());
diff --git a/test/org/gnunet/construct/ConstructTest.java b/test/org/gnunet/construct/ConstructTest.java
deleted file mode 100644
index 6cecd83..0000000
--- a/test/org/gnunet/construct/ConstructTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet 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, or (at your
- option) any later version.
-
- GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.construct;
-
-public class ConstructTest {
-    /*
-    
-    @Test
-    public void test_ByteFillMessage() {
-        
-        ByteFillMessage bfm = new ByteFillMessage();
-        bfm.header = new MessageHeader();
-        bfm.someValue = 42;
-        bfm.rest = new byte[] {1,2,3,4,5,6,7,100, 8};
-        
-        Construct.patch(bfm);
-        
-        bfm.header.messageSize = Construct.getSize(bfm);
-
-        bfm.header.messageType = 42;
-        
-        System.out.println(bfm.header.messageSize);
-        
-        byte[] data = Construct.toBinary(bfm);
-        
-        Assert.assertEquals(Construct.getSize(bfm), data.length);
-        
-        System.out.println("data size: " + data.length);
-
-        ByteFillMessage bfm2 = Construct.parseAs(ByteBuffer.wrap(data), ByteFillMessage.class);
-        
-        Assert.assertArrayEquals(bfm.rest, bfm2.rest);
-    }
-
-
-    @Test
-    public void test_VarTestMessage() {
-        VarTestMessage vtm = new VarTestMessage();
-        vtm.length = 5;
-        vtm.msgs = new SimpleTestMessage2[5];
-        for (int i = 0; i < 5; ++i) {
-            vtm.msgs[i] = new SimpleTestMessage2();
-            vtm.msgs[i].value = i;
-        }
-
-        byte[] a = Construct.toBinary(vtm);
-
-        VarTestMessage vtm2 = Construct.parseAs(ByteBuffer.wrap(a), VarTestMessage.class);
-
-        Assert.assertEquals(vtm2.length, 5);
-        for (int i = 0; i < 5; ++i) {
-            Assert.assertEquals(vtm2.msgs[i].value, i);
-        }
-
-    }
-
-    @Test
-    public void test_SimpleTestMessage() {
-        SimpleTestMessage stm = new SimpleTestMessage();
-        stm.v1 = 20;
-        stm.v2 = 21;
-        stm.mn = new SimpleTestMessage2();
-        stm.mn.value = 42;
-        stm.mns = new SimpleTestMessage2[5];
-        for (int i = 0; i < stm.mns.length; i++) {
-            stm.mns[i] = new SimpleTestMessage2();
-            stm.mns[i].value = i;
-        }
-
-        byte[] a = Construct.toBinary(stm);
-        SimpleTestMessage stm2 = Construct.parseAs(ByteBuffer.wrap(a),
-                SimpleTestMessage.class);
-
-        Assert.assertEquals(stm.v1, stm2.v1);
-        Assert.assertEquals(stm.v2, stm2.v2);
-        Assert.assertEquals(stm.mn.value, stm2.mn.value);
-        Assert.assertEquals(stm.mns.length, stm2.mns.length);
-
-        for (int i = 0; i < stm.mns.length; i++) {
-            Assert.assertEquals(stm.mns[i].value, stm2.mns[i].value);
-        }
-
-    }
-
-    public static String toHex(byte[] bytes) {
-        BigInteger bi = new BigInteger(1, bytes);
-        return String.format("%0" + (bytes.length << 1) + "X", bi);
-    }
-
-    @Test
-    public void test_StringMessage() {
-        StringMessage strm = new StringMessage();
-        strm.num = 58;
-        strm.str = "ab";
-        strm.num2 = 80;
-
-        byte[] a = Construct.toBinary(strm);
-        StringMessage strm2 = Construct.parseAs(ByteBuffer.wrap(a), StringMessage.class);
-
-        for (byte b : a) {
-            System.out.print((char) b);
-        }
-
-        Assert.assertEquals(strm.num, strm2.num);
-        Assert.assertEquals(strm.num2, strm2.num2);
-        Assert.assertEquals(strm.str, strm2.str);
-
-    }
-
-    @Test
-    public void test_QueryMessage() {
-        QueryMessage qm = new QueryMessage();
-        qm.header = new MessageHeader();
-        qm.header.messageType = 0x42;
-        qm.query = 0x43;
-        qm.varsize = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
-                14, 15 };
-
-        Construct.patch(qm);
-
-        byte[] a = Construct.toBinary(qm);
-        
-        Assert.assertEquals(a.length, qm.header.messageSize);
-
-        QueryMessage qm2 = Construct.parseAs(ByteBuffer.wrap(a), QueryMessage.class);
-
-        Assert.assertEquals(qm.header.messageSize, qm2.header.messageSize);
-        Assert.assertEquals(qm.header.messageType, qm2.header.messageType);
-        Assert.assertEquals(qm.query, qm2.query);
-
-        Assert.assertArrayEquals(qm.varsize, qm2.varsize);
-
-    }
-
-    @Test
-    public void test_SizeTestMessage() {
-        SizeTestMessage stm = new SizeTestMessage();
-        stm.someValue = 42;
-        stm.rest = new byte[] { 1, 2, 3, 4, 5 };
-
-        Construct.patch(stm);
-
-        byte[] a = Construct.toBinary(stm);
-
-        SizeTestMessage stm2 = Construct.parseAs(ByteBuffer.wrap(a), SizeTestMessage.class);
-
-        Assert.assertEquals(stm.someValue, stm2.someValue);
-        Assert.assertEquals(stm.totalSize, stm2.totalSize);
-
-        Assert.assertArrayEquals(stm.rest, stm2.rest);
-    }
-
-    @Test
-    public void test_MessageHeader() {
-        MessageHeader h1 = new MessageHeader();
-
-        h1.messageSize = 42;
-        h1.messageType = 52;
-
-        byte[] a = Construct.toBinary(h1);
-
-        MessageHeader h2 = Construct.parseAs(ByteBuffer.wrap(a), MessageHeader.class);
-
-        byte[] b = Construct.toBinary(h2);
-
-        Assert.assertArrayEquals(a, b);
-
-        Assert.assertEquals(h1.messageSize, h2.messageSize);
-        Assert.assertEquals(h1.messageType, h2.messageType);
-    }
-
-    */
-}
diff --git a/test/org/gnunet/construct/UnionTest.java b/test/org/gnunet/construct/UnionTest.java
deleted file mode 100644
index 02012f7..0000000
--- a/test/org/gnunet/construct/UnionTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet 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, or (at your
- option) any later version.
-
- GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.construct;
-
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.nio.ByteBuffer;
-
-public class UnionTest {
-    public static interface TestUnion extends MessageUnion {}
-    
-    @UnionCase(0)
-    public static class TestUnionCase0 implements TestUnion {
-        @Int8
-        public int val;
-    } 
-    
-    @UnionCase(1)
-    public static class TestUnionCase1 implements  TestUnion{
-        @ZeroTerminatedString
-        public String str;
-    }
-
-    public static class UnionTestMessage implements Message {
-        @Int16
-        public int tag;
-        @Union(tag = "tag")
-        public TestUnion instance;
-    }
-
-
-
-    @Test
-    public void test_Union() {
-        UnionTestMessage utm = new UnionTestMessage();
-        utm.tag = 0;
-        utm.instance = new TestUnionCase0();
-        ((TestUnionCase0)utm.instance).val = 20;
-
-        byte[] a = Construct.toBinary(utm);
-        
-        System.out.println(a.length);
-        System.out.println(Construct.getSize(utm));
-        
-        UnionTestMessage utm2 = Construct.parseAs(ByteBuffer.wrap(a), UnionTestMessage.class);
-        
-        Assert.assertEquals(((TestUnionCase0) utm.instance).val, ((TestUnionCase0) utm2.instance).val);
-
-    }
-}
diff --git a/test/org/gnunet/construct/parsers/IntegerParserTest.java b/test/org/gnunet/construct/parsers/IntegerParserTest.java
deleted file mode 100644
index e94b74e..0000000
--- a/test/org/gnunet/construct/parsers/IntegerParserTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet 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, or (at your
- option) any later version.
-
- GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.construct.parsers;
-
-import org.gnunet.construct.*;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class IntegerParserTest {
-    public static class IntTestMessage implements Message {
-        @UInt8
-        public byte test1;
-        @UInt8
-        public int test2;
-        @UInt16
-        public int test3;
-        @Int8
-        byte test4;
-        @Int8
-        byte test5;
-        @Int16
-        byte test6;
-        @Int16
-        byte test7;
-    }
-    
-    @Test
-    public void test_UInt8() {
-        byte b = Byte.MIN_VALUE;
-        do {
-            IntTestMessage itm1 = new IntTestMessage();
-            itm1.test1 = b;
-            itm1.test2 = 0;
-            byte[] bbuf = Construct.toBinary(itm1);
-            IntTestMessage itm2 = Construct.parseAs(bbuf, IntTestMessage.class);
-            Assert.assertEquals(itm1.test1, itm2.test1);
-            Assert.assertEquals(itm1.test2, itm2.test2);
-
-            b++;
-        } while (b != Byte.MAX_VALUE);
-    }
-
-    @Test
-    public void test_UInt16() {
-        int i = 0;
-        do {
-            IntTestMessage itm1 = new IntTestMessage();
-            itm1.test3 = i;
-            byte[] bbuf = Construct.toBinary(itm1);
-            IntTestMessage itm2 = Construct.parseAs(bbuf, IntTestMessage.class);
-            Assert.assertEquals(itm1.test3, itm2.test3);
-            i++;
-        } while (i != (1 << 15));
-
-
-    }
-
-    @Test
-    public void test_UInt16_short() {
-        short s = Short.MIN_VALUE;
-        do {
-            IntTestMessage itm1 = new IntTestMessage();
-            itm1.test3 = s;
-            byte[] bbuf = Construct.toBinary(itm1);
-            IntTestMessage itm2 = Construct.parseAs(bbuf, IntTestMessage.class);
-            Assert.assertEquals(itm1.test3, itm2.test3);
-            s++;
-        } while (s != Short.MAX_VALUE);
-    }
-}
diff --git a/test/org/gnunet/core/CoreTest.java b/test/org/gnunet/core/CoreTest.java
new file mode 100644
index 0000000..8b5ed63
--- /dev/null
+++ b/test/org/gnunet/core/CoreTest.java
@@ -0,0 +1,100 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet 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, or (at your
+ option) any later version.
+
+ GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.core;
+
+
+import org.gnunet.util.*;
+import org.grothoff.Runabout;
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class CoreTest {
+    @Test
+    public void test_core_init() {
+
+        final Wrapper<Boolean> res = new Wrapper<Boolean>(false);
+
+        new Program(new String[]{}) {
+            @Override
+            public void run() {
+                final Core core = new Core(getConfiguration());
+                core.observeConnect(new ConnectHandler() {
+                    @Override
+                    public void onConnect(PeerIdentity peerIdentity) {
+                        System.out.println("got connect!");
+                    }
+                });
+                core.init(new InitCallback() {
+                    @Override
+                    public void onInit(PeerIdentity myIdentity) {
+                        res.value = true;
+                        assertTrue(myIdentity != null);
+                        core.disconnect();
+                    }
+                });
+            }
+        }.start();
+
+        assertTrue(res.value);
+    }
+
+
+    @Test(timeout = 5000)
+    public void test_core_echo() {
+        final Wrapper<Boolean> gotResponse = new Wrapper<Boolean>(false);
+        new Program(new String[]{}) {
+            @Override
+            public void run() {
+                final Core core = new Core(getConfiguration());
+                core.setMessageHandler(new Runabout() {
+                    public void visit(TESTMessage t) {
+                        System.out.println("got TEST message");
+                        gotResponse.set(true);
+                        core.disconnect();
+                    }
+                });
+
+                core.init(new InitCallback() {
+                    @Override
+                    public void onInit(PeerIdentity myIdentity) {
+                        System.out.println("hi, init callback");
+                        core.notifyTransmitReady(0, RelativeTime.FOREVER, myIdentity, 4, new MessageTransmitter() {
+                            @Override
+                            public void transmit(Connection.MessageSink sink) {
+                                System.out.println("in transmit!");
+                                sink.send(new TESTMessage());
+                            }
+
+                            @Override
+                            public void handleError() {
+                                Assert.fail();
+                            }
+                        });
+                    }
+                });
+            }
+        }.start();
+
+        assertTrue(gotResponse.get());
+    }
+}
diff --git a/test/org/gnunet/dht/DHTTest.java b/test/org/gnunet/dht/DHTTest.java
new file mode 100644
index 0000000..ec56834
--- /dev/null
+++ b/test/org/gnunet/dht/DHTTest.java
@@ -0,0 +1,49 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet 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, or (at your
+ option) any later version.
+
+ GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.dht;
+
+import junit.framework.Assert;
+import org.gnunet.util.*;
+import org.junit.Test;
+
+import java.util.EnumSet;
+
+public class DHTTest {
+    @Test
+    public void test_dht_put() {
+        final Wrapper<Boolean> putFinished = new Wrapper<Boolean>(true);
+        new Program(new String[0]) {
+            @Override
+            public void run() {
+                final DistributedHashTable dht = new DistributedHashTable(getConfiguration());
+                dht.put(new HashCode("gnj-test"), new byte[]{1,2,3}, 1, EnumSet.noneOf(RouteOption.class),
+                        BlockType.TEST.val, RelativeTime.HOUR.toAbsolute(), RelativeTime.FOREVER, new Continuation() {
+                    @Override
+                    public void cont(boolean success) {
+                        putFinished.set(true);
+                        dht.destroy();
+                    }
+                });
+            }
+        }.start();
+        Assert.assertTrue(putFinished.get());
+    }
+}
diff --git a/test/org/gnunet/statistics/StatisticsTest.java b/test/org/gnunet/statistics/StatisticsTest.java
new file mode 100644
index 0000000..33af3e2
--- /dev/null
+++ b/test/org/gnunet/statistics/StatisticsTest.java
@@ -0,0 +1,161 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet 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, or (at your
+ option) any later version.
+
+ GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.statistics;
+
+import com.google.common.io.ByteStreams;
+import com.google.common.io.Files;
+import com.google.common.io.InputSupplier;
+import org.gnunet.util.*;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class StatisticsTest {
+    // todo: load configuration and start service in fixup / @Before
+
+    public interface Next {
+        void next();
+    }
+
+    public void assertStatisticsGet(AssertionList assertions, Statistics stat, final String subsystem,
+                                    final String name,
+                                    final long expectedValue, final Next next) {
+
+        final Assertion getAssertion = assertions.create("get %s:%s -> %s", subsystem, name, expectedValue);
+        final Assertion contAssertion = assertions.create("cont");
+        stat.get(RelativeTime.FOREVER, subsystem, name, new StatisticsReceiver() {
+                    @Override
+                    public void onReceive(String rsubsystem, String rname, long rvalue) {
+                        if (rsubsystem.equals(subsystem) && rname.equals(name) && rvalue == expectedValue) {
+                            getAssertion.assertTrue(true);
+                        } else {
+                            getAssertion.assertTrue(false);
+                        }
+                    }
+                }, new Continuation() {
+                    @Override
+                    public void cont(boolean success) {
+                        System.out.println("cont called");
+                        contAssertion.assertTrue(success);
+                        if (next != null) {
+                            next.next();
+                        }
+                    }
+                }
+        );
+    }
+
+    @Test
+    public void test_statistics_get_set() {
+        final AssertionList assertions = new AssertionList();
+
+        new Program(new String[]{}) {
+            @Override
+            public void run() {
+                final Statistics stat1 = new Statistics(cfg);
+
+                stat1.set("gnj-test", "test1", 5, false);
+                stat1.set("gnj-test", "test2", 7, true);
+
+                stat1.set("gnj-test", "test3", 0, true);
+                stat1.update("gnj-test", "test3", 5, true);
+                stat1.update("gnj-test", "test3", -1, true);
+
+                stat1.destroy();
+
+                System.out.println("starting get tests");
+
+                final Statistics stat2 = new Statistics(cfg);
+
+                assertStatisticsGet(assertions, stat2, "gnj-test", "test1", 5, new Next() {
+                    @Override
+                    public void next() {
+                        assertStatisticsGet(assertions, stat2, "gnj-test", "test2", 7, new Next() {
+                            @Override
+                            public void next() {
+                                assertStatisticsGet(assertions, stat2, "gnj-test", "test3", 4, new Next() {
+                                    @Override
+                                    public void next() {
+                                        stat2.destroy();
+                                        System.out.println("destroy called");
+                                    }
+                                });
+                            }
+                        });
+
+                    }
+                });
+            }
+        }.start();
+
+        assertions.assertAll();
+
+
+    }
+
+
+    @Test
+    public void test_watch() {
+        Program.configureLogging(null, null);
+        Configuration cfg = new Configuration();
+        File f;
+        try {
+            f = File.createTempFile("gnunet", "conf");
+        } catch (IOException e) {
+            throw new RuntimeException("could not create temp file", e);
+        }
+        final InputStream stream = StatisticsTest.class.getResourceAsStream("/org/gnunet/statistics/statistics-test.conf");
+        if (stream == null) {
+            throw new RuntimeException("could not find resource");
+        }
+
+        try {
+            Files.copy(new InputSupplier<InputStream>() {
+                @Override
+                public InputStream getInput() throws IOException {
+                    return stream;
+                }
+            }, f);
+        } catch (IOException e) {
+            throw new RuntimeException("could not copy config file", e);
+        }
+
+        Process p;
+
+        try {
+            p = Runtime.getRuntime().exec(new String[]{"gnunet-service-statistics", "-LDEBUG", "-c", f.getAbsolutePath()});
+        } catch (IOException e) {
+            throw new RuntimeException("could not start process", e);
+        }
+
+        try {
+            ByteStreams.copy(p.getErrorStream(), System.out);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        p.destroy();
+
+
+    }
+}
diff --git a/test/org/gnunet/statistics/statistics-test.conf b/test/org/gnunet/statistics/statistics-test.conf
new file mode 100644
index 0000000..a01b650
--- /dev/null
+++ b/test/org/gnunet/statistics/statistics-test.conf
@@ -0,0 +1,18 @@
+[statistics]
+PORT = 3088
+HOSTNAME = localhost
+BINARY = gnunet-service-statistics
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+# DISABLE_SOCKET_FORWARDING = NO
+# USERNAME =
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
+
diff --git a/test/org/gnunet/util/Assertion.java b/test/org/gnunet/util/Assertion.java
new file mode 100644
index 0000000..ec2b38a
--- /dev/null
+++ b/test/org/gnunet/util/Assertion.java
@@ -0,0 +1,42 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet 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, or (at your
+ option) any later version.
+
+ GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.util;
+
+
+public class Assertion {
+    public boolean success;
+    public int asserted;
+    public String message;
+    public String failMessage;
+
+    public Assertion(String message) {
+        this.message = message;
+    }
+
+    public void assertTrue(boolean b) {
+        success = b;
+        asserted += 1;
+    }
+    public void assertTrue(boolean b, String failMessage) {
+        assertTrue(b);
+        this.failMessage = failMessage;
+    }
+}
diff --git a/test/org/gnunet/util/AssertionList.java b/test/org/gnunet/util/AssertionList.java
new file mode 100644
index 0000000..d80ed0e
--- /dev/null
+++ b/test/org/gnunet/util/AssertionList.java
@@ -0,0 +1,30 @@
+package org.gnunet.util;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class AssertionList {
+
+    List<Assertion> asyncAssertions = new LinkedList<Assertion>();
+
+
+    public Assertion create(String message, Object... args) {
+        Assertion assertion = new Assertion(String.format(message, args));
+        asyncAssertions.add(assertion);
+        return assertion;
+    }
+
+    public void assertAll() {
+        for (Assertion assertion : asyncAssertions) {
+            if (assertion.asserted != 1) {
+                throw new AssertionError(
+                        String.format("Assertion '%s' asserted %s times", assertion.message, assertion.asserted));
+            }
+            if (!assertion.success) {
+                throw new AssertionError(
+                        String.format("Assertion '%s' failed", assertion.message));
+            }
+        }
+    }
+
+}
diff --git a/test/org/gnunet/util/ResolverTest.java b/test/org/gnunet/util/ResolverTest.java
new file mode 100644
index 0000000..586bc7d
--- /dev/null
+++ b/test/org/gnunet/util/ResolverTest.java
@@ -0,0 +1,84 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet 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, or (at your
+ option) any later version.
+
+ GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.util;
+
+import org.junit.Test;
+
+import java.net.InetAddress;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ *
+ * @author Florian Dold
+ */
+public class ResolverTest {
+    @Test
+    public void test_resolver() {
+        final Wrapper<Boolean> finished1 = new Wrapper<Boolean>(true);
+        final Wrapper<Boolean> finished2 = new Wrapper<Boolean>(true);
+
+        new Program(new String[0]) {
+            @Override
+            public void run() {
+                Resolver r = Resolver.getInstance();
+                r.resolveHostname("gnunet.org", RelativeTime.FOREVER, new Resolver.AddressCallback() {
+                    @Override
+                    public void onAddress(InetAddress addr) {
+                        System.out.println(addr.getHostAddress());
+                    }
+
+                    @Override
+                    public void onFinished() {
+                        finished1.set(true);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        fail();
+                    }
+                });
+                r.resolveHostname("gnu.org", RelativeTime.FOREVER, new Resolver.AddressCallback() {
+                    @Override
+                    public void onAddress(InetAddress addr) {
+                        System.out.println(addr.getHostAddress());
+                    }
+
+                    @Override
+                    public void onFinished() {
+                        finished2.set(true);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        fail();
+                    }
+                });
+            }
+        }.start();
+
+        assertTrue(finished1.get());
+        assertTrue(finished2.get());
+
+    }
+
+}
diff --git a/test/org/gnunet/util/ServerTest.java b/test/org/gnunet/util/ServerTest.java
new file mode 100644
index 0000000..28cc7e8
--- /dev/null
+++ b/test/org/gnunet/util/ServerTest.java
@@ -0,0 +1,27 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet 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, or (at your
+ option) any later version.
+
+ GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.util;
+
+/**
+ * @author Florian Dold
+ */
+public class ServerTest {
+}
diff --git a/test/org/gnunet/util/TestingSetup.java b/test/org/gnunet/util/TestingSetup.java
new file mode 100644
index 0000000..ac4f762
--- /dev/null
+++ b/test/org/gnunet/util/TestingSetup.java
@@ -0,0 +1,28 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet 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, or (at your
+ option) any later version.
+
+ GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.util;
+
+/**
+ * @author Florian Dold
+ */
+public class TestingSetup {
+
+}
diff --git a/test/org/gnunet/util/Wrapper.java b/test/org/gnunet/util/Wrapper.java
new file mode 100644
index 0000000..be84b54
--- /dev/null
+++ b/test/org/gnunet/util/Wrapper.java
@@ -0,0 +1,43 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet 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, or (at your
+ option) any later version.
+
+ GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.util;
+
+
+/**
+ * Wrapper, used when it is necessary to store a value in a final-variable.
+ *
+ * @param <E> type of the stored value
+ */
+public class Wrapper<E> {
+    public E value;
+    public Wrapper(E initialValue) {
+        value = initialValue;
+    }
+    public Wrapper() {
+        // default constructor
+    }
+    public void set(E newValue) {
+        value = newValue;
+    }
+    public E get() {
+        return value;
+    }
+}
diff --git a/test/org/gnunet/util/GetoptTest.java b/test/org/gnunet/util/getopt/GetoptTest.java
index 845126a..9f8b223 100644
--- a/test/org/gnunet/util/GetoptTest.java
+++ b/test/org/gnunet/util/getopt/GetoptTest.java
@@ -18,12 +18,9 @@
  Boston, MA 02111-1307, USA.
  */
 
-package org.gnunet.util;
+package org.gnunet.util.getopt;
 
 
-import org.gnunet.util.getopt.Option;
-import org.gnunet.util.getopt.OptionAction;
-import org.gnunet.util.getopt.Parser;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/test/org/grothoff/RunaboutBenchmark.java b/test/org/grothoff/RunaboutBenchmark.java
index fd12b36..18f456d 100644
--- a/test/org/grothoff/RunaboutBenchmark.java
+++ b/test/org/grothoff/RunaboutBenchmark.java
@@ -34,7 +34,7 @@ public class RunaboutBenchmark {
 
 
     public static void main(String[] args) {
-        final int runs = 50000000;
+        final int runs = 5000000;
 
         Runabout r = new MyRunabout();
 
@@ -51,7 +51,6 @@ public class RunaboutBenchmark {
         long duration1 = end - start;
 
 
-
         Runabout r2 = new Runabout() {
             public void visit(String s) {
 
@@ -76,7 +75,7 @@ public class RunaboutBenchmark {
 
         System.out.println("Runs: " + runs);
         System.out.println("public: " + duration1);
-        System.out.println("AIC: " + duration2);
+        System.out.println("Anon Inner Class: " + duration2);
         System.out.println("Overhead: " + duration2 / (double) duration1);
 
     }
diff --git a/test/org/org/gnunet/nse/NSETest.java b/test/org/org/gnunet/nse/NSETest.java
new file mode 100644
index 0000000..0d83f75
--- /dev/null
+++ b/test/org/org/gnunet/nse/NSETest.java
@@ -0,0 +1,53 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet 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, or (at your
+ option) any later version.
+
+ GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.org.gnunet.nse;
+
+import org.gnunet.nse.NetworkSizeEstimation;
+import org.gnunet.util.AbsoluteTime;
+import org.gnunet.util.Program;
+import org.gnunet.util.Wrapper;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ * @author Florian Dold
+ */
+public class NSETest {
+    @Test
+    public void test_nse() {
+        final Wrapper<Boolean> gotResult = new Wrapper<Boolean>(false);
+        new Program(new String[0]) {
+            @Override
+            public void run() {
+                final NetworkSizeEstimation nse = new NetworkSizeEstimation(getConfiguration());
+                nse.subscribe(new NetworkSizeEstimation.Subscriber() {
+                    @Override
+                    public void update(AbsoluteTime timestamp, double estimate, double deviation) {
+                        assertNotNull(timestamp);
+                        gotResult.set(true);
+                        nse.disconnect();
+                    }
+                });
+            }
+        }.start();
+        assertTrue(gotResult.get());
+    }
+}
diff --git a/tools/build b/tools/build
index 303ed0d..1895139 100755
--- a/tools/build
+++ b/tools/build
@@ -10,7 +10,7 @@ SOURCES=`find "$BASEDIR/src/" "$BASEDIR/test/" -name "*.java"`
 
 mkdir -p $BASEDIR/build
 
-javac $JFLAGS -cp "$BASEDIR/build/:$BASEDIR/lib/*" -d $BASEDIR/build/ $SOURCES || exit 1
+javac -g $JFLAGS -cp "$BASEDIR/build/:$BASEDIR/lib/*" -d $BASEDIR/build/ $SOURCES || exit 1
 
 cd "$BASEDIR/src/"
 
diff --git a/tools/coverage b/tools/coverage
index 3c3c73b..2f88d6c 100755
--- a/tools/coverage
+++ b/tools/coverage
@@ -2,16 +2,16 @@
 
 BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
 
-INSTRUMENT_CMD="sh $BASEDIR/cobertura/cobertura-instrument.sh --datafile $BASEDIR/coverage.data --destination $BASEDIR/bin-instrumented --ignore .*assert.* "
+INSTRUMENT_CMD="sh $BASEDIR/cobertura/cobertura-instrument.sh --datafile $BASEDIR/coverage.data --destination $BASEDIR/build-instrumented --ignore .*assert.* "
 
 
 case "$1" in
 instrument)
-    cp -r "$BASEDIR/bin/" "$BASEDIR/bin-instrumented/"
-    find $BASEDIR/bin/ -name *.class | xargs $INSTRUMENT_CMD
+    cp -r "$BASEDIR/build/" "$BASEDIR/build-instrumented/"
+    find $BASEDIR/build/ -name *.class | xargs $INSTRUMENT_CMD
     ;;
 clean)
-    rm -r $BASEDIR/bin-instrumented &>/dev/null
+    rm -r $BASEDIR/build-instrumented &>/dev/null
     rm $BASEDIR/coverage.data &>/dev/null
     rm -r $BASEDIR/coverage-report &>/dev/null
     ;;
@@ -28,7 +28,7 @@ run)
 
     COBERTURA="$BASEDIR/cobertura/cobertura.jar"
 
-    java -ea -cp "$COBERTURA:$BASEDIR/bin-instrumented:$BASEDIR/lib/*" \
+    java -ea -cp "$COBERTURA:$BASEDIR/build-instrumented:$BASEDIR/lib/*" \
         -Dnet.sourceforge.cobertura.datafile="$BASEDIR/coverage.data" \
         org.junit.runner.JUnitCore $TESTS
     ;;
diff --git a/tools/run-tests b/tools/run-tests
index 722635d..9ff5178 100755
--- a/tools/run-tests
+++ b/tools/run-tests
@@ -4,16 +4,13 @@ BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
 
 cd "$BASEDIR/test"
 
+# find all *Test.java files, remove extension, replace all '/' with .
 TESTS=$( find . -name "*Test.java" | sed -e 's/\.java//' -e 's/..//' -e 's/\//\./g' )
 
 echo Testing classes: $TESTS
 
-# the version without coverage:
-java -cp "$BASEDIR/bin:$BASEDIR/lib/*" org.junit.runner.JUnitCore $TESTS
+java -cp "$BASEDIR/build:$BASEDIR/lib/*" org.junit.runner.JUnitCore $TESTS
 
-COBERTURA="$BASEDIR/cobertura/cobertura.jar"
-
-
-#java -cp "$COBERTURA:$BASEDIR/bin-instrumented:$BASEDIR/lib/*" org.junit.runner.JUnitCore $TESTS
+cd $OLDPWD