- testbed: create/destroy, start/stop, getInformation, connectOverlay implementation and tests

- voting: ballot serialization/deserialization, unencrypted tally authority implementation,
  ballot tool works for register/vote/query
- issues

62 files changed, 2064 insertions, 318 deletions

diff --git a/src/main/java/org/gnunet/consensus/ConcludeCallback.java b/src/main/java/org/gnunet/consensus/ConcludeCallback.java
index 7660c49..ebef5d2 100644
--- a/src/main/java/org/gnunet/consensus/ConcludeCallback.java
+++ b/src/main/java/org/gnunet/consensus/ConcludeCallback.java
@@ -1,3 +1,23 @@
+/*
+ This file is part of GNUnet.
+ (C) 2013 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.consensus;
 
 public interface ConcludeCallback {
diff --git a/src/main/java/org/gnunet/consensus/ConcludeDoneMessage.java b/src/main/java/org/gnunet/consensus/ConcludeDoneMessage.java
index 51757aa..bf63ed7 100644
--- a/src/main/java/org/gnunet/consensus/ConcludeDoneMessage.java
+++ b/src/main/java/org/gnunet/consensus/ConcludeDoneMessage.java
@@ -1,3 +1,23 @@
+/*
+ This file is part of GNUnet.
+ (C) 2013 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.consensus;
 
 
diff --git a/src/main/java/org/gnunet/consensus/ConcludeMessage.java b/src/main/java/org/gnunet/consensus/ConcludeMessage.java
index 7b43928..a588c5e 100644
--- a/src/main/java/org/gnunet/consensus/ConcludeMessage.java
+++ b/src/main/java/org/gnunet/consensus/ConcludeMessage.java
@@ -1,3 +1,23 @@
+/*
+ This file is part of GNUnet.
+ (C) 2013 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.consensus;
 
 import org.gnunet.construct.FillWith;
diff --git a/src/main/java/org/gnunet/consensus/Consensus.java b/src/main/java/org/gnunet/consensus/Consensus.java
index 322599c..4049c47 100644
--- a/src/main/java/org/gnunet/consensus/Consensus.java
+++ b/src/main/java/org/gnunet/consensus/Consensus.java
@@ -1,3 +1,23 @@
+/*
+ This file is part of GNUnet.
+ (C) 2013 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.consensus;
 
 import org.gnunet.mq.Envelope;
diff --git a/src/main/java/org/gnunet/consensus/ConsensusElement.java b/src/main/java/org/gnunet/consensus/ConsensusElement.java
index 846e72a..bc8942e 100644
--- a/src/main/java/org/gnunet/consensus/ConsensusElement.java
+++ b/src/main/java/org/gnunet/consensus/ConsensusElement.java
@@ -1,3 +1,23 @@
+/*
+ This file is part of GNUnet.
+ (C) 2013 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.consensus;
 
 
diff --git a/src/main/java/org/gnunet/consensus/InsertDoneCallback.java b/src/main/java/org/gnunet/consensus/InsertDoneCallback.java
index f0e86ca..2d0df61 100644
--- a/src/main/java/org/gnunet/consensus/InsertDoneCallback.java
+++ b/src/main/java/org/gnunet/consensus/InsertDoneCallback.java
@@ -1,3 +1,23 @@
+/*
+ This file is part of GNUnet.
+ (C) 2013 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.consensus;
 
 public interface InsertDoneCallback {
diff --git a/src/main/java/org/gnunet/consensus/InsertElementMessage.java b/src/main/java/org/gnunet/consensus/InsertElementMessage.java
index fd0ff67..a080ce6 100644
--- a/src/main/java/org/gnunet/consensus/InsertElementMessage.java
+++ b/src/main/java/org/gnunet/consensus/InsertElementMessage.java
@@ -1,3 +1,23 @@
+/*
+ This file is part of GNUnet.
+ (C) 2013 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.consensus;
 
 import org.gnunet.construct.FillWith;
diff --git a/src/main/java/org/gnunet/consensus/NewElementCallback.java b/src/main/java/org/gnunet/consensus/NewElementCallback.java
index 4b07a71..3edde36 100644
--- a/src/main/java/org/gnunet/consensus/NewElementCallback.java
+++ b/src/main/java/org/gnunet/consensus/NewElementCallback.java
@@ -1,3 +1,23 @@
+/*
+ This file is part of GNUnet.
+ (C) 2013 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.consensus;
 
 public interface NewElementCallback {
diff --git a/src/main/java/org/gnunet/consensus/NewElementMessage.java b/src/main/java/org/gnunet/consensus/NewElementMessage.java
index deb3634..817e510 100644
--- a/src/main/java/org/gnunet/consensus/NewElementMessage.java
+++ b/src/main/java/org/gnunet/consensus/NewElementMessage.java
@@ -1,3 +1,23 @@
+/*
+ This file is part of GNUnet.
+ (C) 2013 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.consensus;
 
 import org.gnunet.construct.*;
diff --git a/src/main/java/org/gnunet/mesh/Mesh.java b/src/main/java/org/gnunet/mesh/Mesh.java
index b66cc6f..f97a117 100644
--- a/src/main/java/org/gnunet/mesh/Mesh.java
+++ b/src/main/java/org/gnunet/mesh/Mesh.java
@@ -111,16 +111,17 @@ public class Mesh {
     public class Tunnel<T> extends MessageQueue {
         private T context;
         private final int opt;
-        public final PeerIdentity peer;
-        public final int port;
+        final PeerIdentity peer;
+        final int port;
         protected long tunnelId;
-        private boolean receive_done_expected = false;
-        int ack_count = 0;
+        private boolean receiveDoneExpected = false;
+        int ackCount = 0;
+        boolean destroyedByService;
 
         /**
          * Canceler for the currently submitted envelope.
          */
-        public Cancelable envelopeCanceler;
+        private Cancelable envelopeCanceler;
 
         /**
          * Create a new tunnel (we're initiator and will be allowed to add/remove peers
@@ -175,26 +176,28 @@ public class Mesh {
         }
 
         public void receiveDone() {
-            if (!receive_done_expected)
+            if (!receiveDoneExpected)
                 throw new AssertionError("unexpected call to receiveDone");
             LocalAckMessage am = new LocalAckMessage();
             am.tid = tunnelId;
             client.send(am);
-            receive_done_expected = false;
+            receiveDoneExpected = false;
         }
 
         public void destroy() {
-            TunnelDestroyMessage m = new TunnelDestroyMessage();
-            m.tunnel_id = tunnelId;
-            m.reserved = new byte[32];
-            client.send(m);
-            tunnelMap.remove(m.tunnel_id);
+            if (!destroyedByService) {
+                TunnelDestroyMessage m = new TunnelDestroyMessage();
+                m.tunnel_id = tunnelId;
+                m.reserved = new byte[32];
+                client.send(m);
+            }
+            tunnelMap.remove(tunnelId);
         }
 
         @Override
         protected void submit(Envelope ev) {
             logger.debug("submitting data message on tunnel {}", tunnelId);
-            if (ack_count <= 0)
+            if (ackCount <= 0)
                 throw new AssertionError();
             DataMessage m = new DataMessage();
             m.payload = Construct.toBinary(GnunetMessage.fromBody(ev.message));
@@ -208,7 +211,7 @@ public class Mesh {
             });
             client.send(mesh_ev);
             envelopeCanceler = mesh_ev;
-            ack_count -= 1;
+            ackCount -= 1;
         }
 
         @Override
@@ -227,10 +230,10 @@ public class Mesh {
             context = newContext;
         }
 
-        public void handleAck() {
-            ack_count++;
+        void handleAck() {
+            ackCount++;
             logger.debug("got ack for tunnel id " + tunnelId);
-            if (ack_count == 1) {
+            if (ackCount == 1) {
                 reportReadyForSubmit();
             }
         }
@@ -250,10 +253,12 @@ public class Mesh {
             Tunnel t = tunnelMap.get(m.tid);
             if (t != null)
             {
-                if (t.receive_done_expected)
+                if (t.receiveDoneExpected)
                     logger.warn("got unexpected message from service");
-                t.receive_done_expected = true;
+                t.receiveDoneExpected = true;
+                messageReceiver.setSender(t);
                 messageReceiver.visitAppropriate(Construct.parseAs(m.payload, GnunetMessage.class).body);
+                messageReceiver.setSender(null);
             }
         }
 
@@ -269,17 +274,21 @@ public class Mesh {
 
         public void visit(TunnelDestroyMessage m) {
             Tunnel t = tunnelMap.get(m.tunnel_id);
-            if (t == null) {
+            if (null == t) {
                 logger.warn("server got confused with tunnel IDs on destroy, ignoring message");
                 return;
             }
+            t.destroyedByService = true;
             t.destroy();
-            tunnelEndHandler.onTunnelEnd(t);
+            if (null != tunnelEndHandler) {
+                tunnelEndHandler.onTunnelEnd(t);
+            }
         }
 
         @Override
         public void handleError() {
-            if (tunnelEndHandler != null) {
+            logger.warn("lost connection to mesh service, reconnecting");
+            if (null != tunnelEndHandler) {
                 for (Tunnel t : tunnelMap.values()) {
                     tunnelEndHandler.onTunnelEnd(t);
                 }
@@ -293,13 +302,15 @@ public class Mesh {
     }
 
     /**
-     * Connect to the mesh service.
+     * Connect to the mesh service, listening to the given ports.
      *
      * @param cfg                  configuration to use
      * @param inboundTunnelHandler function called when an *inbound* tunnel is created
      * @param tunnelEndHandler     function called when an *inbound* tunnel is destroyed by the
      *                             remote peer, it is *not* called if Tunnel.destroy
      *                             is called on the tunnel
+     * @param messageReceiver runabout for messages we are interested in
+     * @param ports ports to listen on
      */
     public Mesh(Configuration cfg, InboundTunnelHandler inboundTunnelHandler,
                 TunnelEndHandler tunnelEndHandler, MeshRunabout messageReceiver, int... ports) {
@@ -317,6 +328,18 @@ public class Mesh {
         client.send(ccm);
     }
 
+    /**
+     * Connect to the mesh service.
+     *
+     * @param cfg                  configuration to use
+     * @param tunnelEndHandler     function called when an *inbound* tunnel is destroyed by the
+     *                             remote peer, it is *not* called if Tunnel.destroy
+     *                             is called on the tunnel
+     */
+    public Mesh(Configuration cfg, TunnelEndHandler tunnelEndHandler, MeshRunabout messageReceiver) {
+        this(cfg, null, tunnelEndHandler, messageReceiver);
+    }
+
     public <T> Tunnel<T> createTunnel(PeerIdentity peer, int port, boolean nobuffer, boolean reliable, T initialContext) {
         return new Tunnel<T>(peer, port, nobuffer, reliable, initialContext);
     }
diff --git a/src/main/java/org/gnunet/mesh/MeshRunabout.java b/src/main/java/org/gnunet/mesh/MeshRunabout.java
index ea4248c..bd7819e 100644
--- a/src/main/java/org/gnunet/mesh/MeshRunabout.java
+++ b/src/main/java/org/gnunet/mesh/MeshRunabout.java
@@ -9,11 +9,11 @@ import org.grothoff.Runabout;
  * @author Florian Dold
  */
 public class MeshRunabout extends Runabout {
-    private PeerIdentity sender;
-    /* package private */ void setSender(PeerIdentity sender) {
+    private Mesh.Tunnel sender;
+    /* package private */ void setSender(Mesh.Tunnel sender) {
         this.sender = sender;
     }
-    public PeerIdentity getSender() {
+    public Mesh.Tunnel getSender() {
         return sender;
     }
 }
diff --git a/src/main/java/org/gnunet/mesh/TunnelEndHandler.java b/src/main/java/org/gnunet/mesh/TunnelEndHandler.java
index e56fdd4..2a492ce 100644
--- a/src/main/java/org/gnunet/mesh/TunnelEndHandler.java
+++ b/src/main/java/org/gnunet/mesh/TunnelEndHandler.java
@@ -6,5 +6,12 @@ package org.gnunet.mesh;
  * @author Florian Dold
  */
 public interface TunnelEndHandler {
+    /**
+     * Called once a tunnel has been destroyed.
+     * The given tunnel can not be used anymore, and is only provided
+     * to identify the tunnel that has been destroyed.
+     *
+     * @param tunnel tunnel that has been destroyed
+     */
     void onTunnelEnd(Mesh.Tunnel tunnel);
 }
diff --git a/src/main/java/org/gnunet/requests/MatchingRequestContainer.java b/src/main/java/org/gnunet/requests/MatchingRequestContainer.java
index 656d162..a11807f 100644
--- a/src/main/java/org/gnunet/requests/MatchingRequestContainer.java
+++ b/src/main/java/org/gnunet/requests/MatchingRequestContainer.java
@@ -7,6 +7,9 @@ import org.gnunet.util.Cancelable;
 import java.util.Map;
 
 
+/**
+ * Container for requests that are responded to with a matching request identification
+ */
 public class MatchingRequestContainer<K, T extends RequestContainer.Request> extends RequestContainer {
     private Map<K,T> requests = Maps.newHashMap();
     private final MessageQueue mq;
@@ -48,4 +51,15 @@ public class MatchingRequestContainer<K, T extends RequestContainer.Request> ext
     public T getRequest(K key) {
         return requests.get(key);
     }
+
+    /**
+     * Retrieve the request matching the given key, and remove it.
+     * Return null if there is no matching request.
+     *
+     * @param key key to look for
+     * @return request, or null
+     */
+    public T pollRequest(K key) {
+        return requests.remove(key);
+    }
 }
diff --git a/src/main/java/org/gnunet/testbed/CompressedConfig.java b/src/main/java/org/gnunet/testbed/CompressedConfig.java
index 24fdc0f..85c2510 100644
--- a/src/main/java/org/gnunet/testbed/CompressedConfig.java
+++ b/src/main/java/org/gnunet/testbed/CompressedConfig.java
@@ -1,3 +1,22 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009,2013 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 2, 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.testbed;
 
 import com.google.common.base.Charsets;
diff --git a/src/main/java/org/gnunet/testbed/Controller.java b/src/main/java/org/gnunet/testbed/Controller.java
index 059245e..3a4c540 100644
--- a/src/main/java/org/gnunet/testbed/Controller.java
+++ b/src/main/java/org/gnunet/testbed/Controller.java
@@ -1,13 +1,29 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009,2013 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 2, 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.testbed;
 
 import org.gnunet.mq.Envelope;
 import org.gnunet.requests.MatchingRequestContainer;
 import org.gnunet.requests.RequestContainer;
-import org.gnunet.requests.SequentialRequestContainer;
 import org.gnunet.testbed.callbacks.*;
-import org.gnunet.testbed.messages.ControllerInitMessage;
-import org.gnunet.testbed.messages.PeerCreateMessage;
-import org.gnunet.testbed.messages.PeerCreateSuccessMessage;
+import org.gnunet.testbed.messages.*;
 import org.gnunet.util.Cancelable;
 import org.gnunet.util.Client;
 import org.gnunet.util.Configuration;
@@ -25,15 +41,31 @@ import org.slf4j.LoggerFactory;
  * links are established via TCP/IP on the controller's service port.
  */
 public class Controller {
-private static final Logger logger = LoggerFactory
+    private static final Logger logger = LoggerFactory
         .getLogger(Controller.class);
 
-    public static int ET_PEER_START = 0;
-    public static int ET_PEER_STOP = 1;
-    public static int ET_CONNECT = 2;
-    public static int ET_DISCONNECT = 3;
-    public static int ET_OPERATION_FINISHED = 4;
-
+    public static class EventTypes {
+       /**
+        * A peer has been started.
+        */
+        public static final int PEER_START = 0;
+        /**
+         * A peer has been stopped.
+         */
+        public static final int PEER_STOP = 1;
+        /**
+         * A connection between two peers has been established.
+         */
+        public static final int PEERS_CONNECT = 2;
+        /**
+         * A connection between two peers has been torn down.
+         */
+        public static final int PEERS_DISCONNECT = 3;
+        /**
+         * An operation has finished.
+         */
+        public static final int OPERATION_FINISHED = 4;
+    }
 
     /**
      * Client connecting to the testbed service.
@@ -45,26 +77,42 @@ private static final Logger logger = LoggerFactory
      */
     private Host host;
 
-    private int operationCounter;
+    private int operationCounter = 1;
     private int peerCounter;
 
     /**
-     * Request queue (called operation queue in the GNUnet C implementation)
+     * Request queue (akin to operation queue(s) in the GNUnet C implementation).
      */
-    private MatchingRequestContainer<Long,RequestContainer.Request> requests;
+    private MatchingRequestContainer<Long,OperationRequest> requests;
+
+    abstract class OperationRequest extends RequestContainer.Request {
+        protected final long operationId;
+        public OperationRequest() {
+            operationId = (((long) host.id) << 32) | (long) operationCounter++;
+        }
+    }
 
+    abstract class GenericOperationRequest extends OperationRequest {
+        final protected OperationCompletionCallback cb;
+        public GenericOperationRequest(OperationCompletionCallback cb) {
+            this.cb = cb;
+        }
+        void onSuccess() {
+            cb.onCompletion();
+        }
+    }
 
-    class PeerCreateRequest extends RequestContainer.Request {
-        private final Host host;
-        private final Configuration cfg;
-        private final PeerCreateCallback cb;
-        public long op_id;
+    class PeerCreateRequest extends OperationRequest {
+        final Host host;
+        final Configuration cfg;
+        final PeerCreateCallback cb;
+        final int peer_id;
 
         public PeerCreateRequest(Host host, Configuration cfg, PeerCreateCallback cb) {
             this.host = host;
             this.cfg = cfg;
             this.cb = cb;
-            this.op_id = getNextOpId();
+            this.peer_id = peerCounter++;
         }
 
         @Override
@@ -72,48 +120,223 @@ private static final Logger logger = LoggerFactory
             CompressedConfig ccfg = new CompressedConfig(cfg);
             PeerCreateMessage m = new PeerCreateMessage();
             m.host_id = host.id;
-            m.operation_id = op_id;
-            m.peer_id = peerCounter++;
+            m.operation_id = operationId;
+            m.peer_id = peer_id;
             m.compressed_config = ccfg.compressed_data;
             m.config_size = ccfg.getUncompressedSize();
+            System.out.println("create request with opid " + m.operation_id);
+            return new Envelope(m);
+        }
+    }
+
+    class PeerDestroyRequest extends GenericOperationRequest {
+        final int peerId;
+        public PeerDestroyRequest(Peer p, OperationCompletionCallback cb) {
+            super(cb);
+            peerId = p.peerId;
+        }
+
+        @Override
+        public Envelope assembleRequest() {
+            PeerDestroyMessage m = new PeerDestroyMessage();
+            m.operation_id = operationId;
+            m.peer_id = peerId;
+
+            System.out.println("destroy request with opid " + m.operation_id);
             return new Envelope(m);
         }
     }
 
-    class PeerStartRequest extends RequestContainer.Request {
+    class PeerInformationRequest extends OperationRequest {
+        final int peerId;
+        final PeerInformationCallback cb;
+        public PeerInformationRequest(Peer peer, PeerInformationCallback cb) {
+            peerId = peer.peerId;
+            this.cb = cb;
+        }
 
         @Override
         public Envelope assembleRequest() {
-            return null;  //To change body of implemented methods use File | Settings | File Templates.
+            PeerGetInformationMessage m = new PeerGetInformationMessage();
+            m.operationId = operationId;
+            m.peerId = peerId;
+            return new Envelope(m);
         }
     }
 
-    class PeerStopRequest extends RequestContainer.Request {
+    class PeerUpdateConfigurationRequest extends GenericOperationRequest {
+        final int peerId;
+        final Configuration cfg;
+        public PeerUpdateConfigurationRequest(Peer peer, OperationCompletionCallback cb, Configuration cfg) {
+            super(cb);
+            peerId = peer.peerId;
+            this.cfg = cfg;
+        }
+
+        @Override
+        public Envelope assembleRequest() {
+            PeerReconfigureMessage m = new PeerReconfigureMessage();
+            m.operationId = operationId;
+            m.peerId = peerId;
+            CompressedConfig ccfg = new CompressedConfig(cfg);
+            m.uncompressedConfigSize = ccfg.getUncompressedSize();
+            m.compressedConfig = ccfg.compressed_data;
+
+            System.out.println("compressed config size " +m.compressedConfig.length);
+            return new Envelope(m);
+        }
+    }
 
+    class PeerManageServiceRequest extends OperationRequest {
+        final Peer peer;
+        final boolean start;
+        final String serviceName;
+        public PeerManageServiceRequest(Peer peer, String serviceName, boolean start) {
+            this.peer = peer;
+            this.start = start;
+            this.serviceName = serviceName;
+        }
         @Override
         public Envelope assembleRequest() {
-            return null;  //To change body of implemented methods use File | Settings | File Templates.
+            ManagePeerServiceMessage m = new ManagePeerServiceMessage();
+            m.operationId = operationId;
+            m.peerId = peer.peerId;
+            m.serviceName = serviceName;
+            m.start = start;
+            return new Envelope(m);
         }
     }
 
-    class ConnectOverlayRequest extends RequestContainer.Request {
+    class PeerStartRequest extends OperationRequest {
+        final Peer peer;
+        final PeerChurnCallback peerChurnCallback;
+
+        public PeerStartRequest(Peer peer, PeerChurnCallback peerChurnCallback) {
+            this.peer = peer;
+            this.peerChurnCallback = peerChurnCallback;
+        }
+
         @Override
         public Envelope assembleRequest() {
-            return null;  //To change body of implemented methods use File | Settings | File Templates.
+            PeerStartMessage m = new PeerStartMessage();
+            m.operation_id = operationId;
+            m.peer_id = peer.peerId;
+            return new Envelope(m);
+        }
+    }
+
+    class PeerStopRequest extends OperationRequest {
+        final Peer peer;
+        final PeerChurnCallback peerChurnCallback;
+
+        public PeerStopRequest(Peer peer, PeerChurnCallback peerChurnCallback) {
+            this.peer = peer;
+            this.peerChurnCallback = peerChurnCallback;
+        }
+
+        @Override
+        public Envelope assembleRequest() {
+            PeerStopMessage m = new PeerStopMessage();
+            m.operation_id = operationId;
+            m.peer_id = peer.peerId;
+            return new Envelope(m);
+        }
+    }
+
+    class PeerConnectOverlayRequest extends OperationRequest {
+        final Peer peer1;
+        final Peer peer2;
+        final OperationCompletionCallback cb;
+        public PeerConnectOverlayRequest(Peer peer1, Peer peer2, OperationCompletionCallback cb) {
+            this.peer1 = peer1;
+            this.peer2 = peer2;
+            this.cb = cb;
+        }
+        @Override
+        public Envelope assembleRequest() {
+            OverlayConnectMessage m = new OverlayConnectMessage();
+            m.operationId = operationId;
+            m.peer1 = peer1.peerId;
+            m.peer2 = peer2.peerId;
+            m.hostOfPeer2 = peer2.getHost().id;
+            return new Envelope(m);
         }
     }
 
 
     public class ControllerMessageReceiver extends RunaboutMessageReceiver {
+        public void visit(PeerEventMessage m) {
+            RequestContainer.Request r = requests.getRequest(m.operationId);
+            if (null == r) {
+                logger.error("no matching peer event request for op id %s", m.operationId);
+                return;
+            }
+            if (r instanceof PeerStartRequest && m.eventType == EventTypes.PEER_START) {
+                PeerStartRequest psr = (PeerStartRequest) r;
+                psr.peerChurnCallback.onChurnSuccess();
+            } else if (r instanceof PeerStopRequest && m.eventType == EventTypes.PEER_STOP) {
+                PeerStopRequest psr = (PeerStopRequest) r;
+                psr.peerChurnCallback.onChurnSuccess();
+            } else {
+                logger.error("unexpected peer event message, event type %s and request %s",
+                             m.eventType, r);
+            }
+        }
         public void visit(PeerCreateSuccessMessage m) {
-            RequestContainer.Request r = requests.getRequest(m.operation_id);
+            RequestContainer.Request r = requests.getRequest(m.operationId);
             if (!(r instanceof PeerCreateRequest)) {
                 logger.warn("response to peer create request does not match");
                 return;
             }
             PeerCreateRequest pcr = (PeerCreateRequest) r;
-            // FIXME: create peer
-            pcr.cb.onPeerCreated(null);
+            Peer p = new Peer(pcr.peer_id);
+            pcr.cb.onPeerCreated(p);
+        }
+        public void visit(PeerInformationMessage m) {
+            RequestContainer.Request r = requests.getRequest(m.operationId);
+            if (null == r) {
+                logger.error("unexpected peer information message (opid={})", m.operationId);
+                return;
+            }
+            if (!(r instanceof PeerInformationRequest)) {
+                logger.warn("response to peer create request does not match");
+                return;
+            }
+            PeerInformationRequest pir = (PeerInformationRequest) r;
+            CompressedConfig ccfg = new CompressedConfig(m.compressedConfig);
+            pir.cb.onSuccess(m.peerIdentity, ccfg.decompress());
+        }
+        public void visit(GenericOperationSuccessMessage m) {
+            OperationRequest r = requests.getRequest(m.operationId);
+            if (null == r) {
+                logger.error("unexpected generic success message (opid={})", m.operationId);
+                return;
+            }
+            if (!(r instanceof GenericOperationRequest)) {
+                logger.error(String.format(
+                               "got GenericOperationSuccessMessage as response to request '%s', opid %s; event type %s",
+                               r.getClass(), m.operationId, m.eventType));
+                return;
+            }
+            GenericOperationRequest gr = (GenericOperationRequest) r;
+            gr.onSuccess();
+        }
+        public void visit(ConnectionEventMessage m) {
+            OperationRequest r = requests.getRequest(m.operationId);
+            if (null == r) {
+                logger.error("unexpected connection event message (opid={})", m.operationId);
+                return;
+            }
+            if (!(r instanceof PeerConnectOverlayRequest)) {
+                logger.error("unexpected connection event message for operation {}", r.getClass());
+                return;
+            }
+            PeerConnectOverlayRequest cr = (PeerConnectOverlayRequest) r;
+            cr.cb.onCompletion();
+
+        }
+        public void visit(OperationFailEventMessage m) {
+            logger.error("operation failed: " + m.errorMessage);
         }
         @Override
         public void handleError() {
@@ -121,11 +344,6 @@ private static final Logger logger = LoggerFactory
         }
     }
 
-    private long getNextOpId() {
-        return (((long) host.id) << 32) | (long) operationCounter++;
-    }
-
-
     /**
      * Connect to a controller process.  The configuration to use for the connection
      * is retreived from the given host where a controller is started using
@@ -144,7 +362,7 @@ private static final Logger logger = LoggerFactory
         this.host = host;
         client = new Client("testbed", host.cfg);
         client.installReceiver(new ControllerMessageReceiver());
-        requests = new MatchingRequestContainer<Long, RequestContainer.Request>(client);
+        requests = new MatchingRequestContainer<Long, OperationRequest>(client);
 
         ControllerInitMessage m = new ControllerInitMessage();
         m.event_mask = event_mask;
@@ -175,14 +393,13 @@ private static final Logger logger = LoggerFactory
      * 'Peer.getInformation'.
      *
      * @param host host to run the peer on; cannot be NULL
-     * @param cfg Template configuration to use for the peer. Should exist until
-     *          operation is cancelled or GNUNET_TESTBED_operation_done() is called
+     * @param cfg Template configuration to use for the peer.
      * @param cb the callback to call when the peer has been created
      * @return the operation handle
      */
     public Cancelable createPeer(Host host, Configuration cfg, PeerCreateCallback cb) {
         PeerCreateRequest r = new PeerCreateRequest(host, cfg, cb);
-        return requests.addRequest(r.op_id, r);
+        return requests.addRequest(r.operationId, r);
     }
 
     /**
@@ -220,7 +437,7 @@ private static final Logger logger = LoggerFactory
      *          controller via TCP/IP
      * @return the operation handle
      */
-    public Operation link(Host delegated_host, Host slave_host, boolean is_subordinate) {
+    public Cancelable link(Host delegated_host, Host slave_host, boolean is_subordinate) {
         // low priority
         throw new UnsupportedOperationException("not yet implemented");
     }
@@ -249,16 +466,44 @@ private static final Logger logger = LoggerFactory
      * at a particular host.
      */
     public class Peer {
-        public Operation start(PeerChurnCallback peerChurnCallback) {
-            return null;
+        final private int peerId;
+
+        /**
+         * Private constructor for the peer, creates the peer with the given id,
+         * and, implicitly the containing controller.
+         *
+         * @param peerId id for the peer
+         */
+        private Peer(int peerId) {
+            this.peerId = peerId;
         }
 
-        public Operation stop(PeerChurnCallback peerChurnCallback) {
-            return null;
+        /**
+         * Start this peer
+         *
+         * @param peerChurnCallback completion callback
+         * @return handle to cancel the operation
+         */
+        public Cancelable start(PeerChurnCallback peerChurnCallback) {
+            PeerStartRequest r = new PeerStartRequest(this, peerChurnCallback);
+            return requests.addRequest(r.operationId, r);
         }
 
-        public Operation getInformation() {
-            return null;
+        /**
+         * Stop this peer
+         *
+         * @param peerChurnCallback completion callback
+         * @return handle to cancel the operation
+         */
+        public Cancelable stop(PeerChurnCallback peerChurnCallback) {
+            PeerStopRequest r = new PeerStopRequest(this, peerChurnCallback);
+            return requests.addRequest(r.operationId, r);
+        }
+
+
+        public Cancelable requestInformation(PeerInformationCallback cb) {
+            PeerInformationRequest r = new PeerInformationRequest(this, cb);
+            return requests.addRequest(r.operationId, r);
         }
 
         /*
@@ -266,8 +511,9 @@ private static final Logger logger = LoggerFactory
          * peer is stopped.  Ports and paths cannot be changed this
          * way.
          */
-        public Operation updateConfiguration(Configuration cfg) {
-            return null;
+        public Cancelable updateConfiguration(Configuration cfg, OperationCompletionCallback cb) {
+            PeerUpdateConfigurationRequest r = new PeerUpdateConfigurationRequest(this, cb, cfg);
+            return requests.addRequest(r.operationId, r);
         }
 
         /*
@@ -275,26 +521,58 @@ private static final Logger logger = LoggerFactory
          * peer is stopped.  Ports and paths cannot be changed this
          * way.
          */
-        public Operation destroy() {
-            return null;
+        public Cancelable destroy(OperationCompletionCallback cb) {
+            PeerDestroyRequest r = new PeerDestroyRequest(this, cb);
+            return requests.addRequest(r.operationId, r);
         }
 
-        public Operation manageService(String serviceName, boolean start) {
-            return null;
+        public Cancelable manageService(String serviceName, boolean start, OperationCompletionCallback cb) {
+            PeerManageServiceRequest r = new PeerManageServiceRequest(this, serviceName, start);
+            return requests.addRequest(r.operationId, r);
         }
 
         /**
          * Both peers must have been started before calling this function.
          * This function then obtains a HELLO from this peer, gives it to 'otherPeer'
-         * and asks 'otherPeer' to connect to this peer..
+         * and asks 'otherPeer' to connect to this peer.
+         *
+         * @param otherPeer peer to connect this peer to
+         * @param cb callback object to signal completion or failure
+         * @return token to cancel the request
+         *
          */
-        public Operation connectOverlay(OperationCompletionCallback cb, Peer otherPeer) {
-            return null;
+        public Cancelable connectOverlay(Peer otherPeer, OperationCompletionCallback cb) {
+            PeerConnectOverlayRequest r = new PeerConnectOverlayRequest(this, otherPeer, cb);
+            return requests.addRequest(r.operationId, r);
         }
 
-        public Operation getServiceConnection(String serviceName /*,... */) {
+
+        /**
+         * Connect to a service offered by the given peer.  Will ensure that
+         * the request is queued to not overwhelm our ability to create and
+         * maintain connections with other systems.  The actual service
+         * handle is then returned via the 'op_result' member in the event
+         * callback.  The 'ca' callback is used to create the connection
+         * when the time is right; the 'da' callback will be used to
+         * destroy the connection (upon 'GNUNET_TESTBED_operation_done').
+         * 'GNUNET_TESTBED_operation_done' can be used to abort this
+         * operation until the event callback has been called.
+         *
+         * @param serviceName name of the service to connect to
+         * @param serviceAdapter callback object for connection establishment and tear-down.
+         * @return handle for the operation
+         */
+        public Cancelable getServiceConnection(String serviceName, ServiceAdapter serviceAdapter) {
             return null;
         }
 
+        /**
+         * Get the host this peer is running on.
+         *
+         * @return the host this peer is running on
+         */
+        public Host getHost() {
+            return Controller.this.host;
+        }
     }
 }
diff --git a/src/main/java/org/gnunet/testbed/Operation.java b/src/main/java/org/gnunet/testbed/Operation.java
deleted file mode 100644
index 4403540..0000000
--- a/src/main/java/org/gnunet/testbed/Operation.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.gnunet.testbed;
-
-/**
- * Created with IntelliJ IDEA.
- * User: dold
- * Date: 8/25/13
- * Time: 1:26 PM
- * To change this template use File | Settings | File Templates.
- */
-public interface Operation {
-}
diff --git a/src/main/java/org/gnunet/testbed/callbacks/OperationCompletionCallback.java b/src/main/java/org/gnunet/testbed/callbacks/OperationCompletionCallback.java
index e33364b..c2f4f4e 100644
--- a/src/main/java/org/gnunet/testbed/callbacks/OperationCompletionCallback.java
+++ b/src/main/java/org/gnunet/testbed/callbacks/OperationCompletionCallback.java
@@ -1,11 +1,7 @@
 package org.gnunet.testbed.callbacks;
 
-/**
- * Created with IntelliJ IDEA.
- * User: dold
- * Date: 8/25/13
- * Time: 1:35 PM
- * To change this template use File | Settings | File Templates.
- */
+
 public interface OperationCompletionCallback {
+    void onCompletion();
+    void onError(String emsg);
 }
diff --git a/src/main/java/org/gnunet/testbed/callbacks/PeerInformationCallback.java b/src/main/java/org/gnunet/testbed/callbacks/PeerInformationCallback.java
new file mode 100644
index 0000000..3c9064d
--- /dev/null
+++ b/src/main/java/org/gnunet/testbed/callbacks/PeerInformationCallback.java
@@ -0,0 +1,29 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.testbed.callbacks;
+
+
+import org.gnunet.util.Configuration;
+import org.gnunet.util.PeerIdentity;
+
+public interface PeerInformationCallback {
+    void onSuccess(PeerIdentity peerIdentity, Configuration configuration);
+}
diff --git a/src/main/java/org/gnunet/testbed/callbacks/ServiceAdapter.java b/src/main/java/org/gnunet/testbed/callbacks/ServiceAdapter.java
new file mode 100644
index 0000000..9b3fef7
--- /dev/null
+++ b/src/main/java/org/gnunet/testbed/callbacks/ServiceAdapter.java
@@ -0,0 +1,28 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.testbed.callbacks;
+
+import org.gnunet.util.Configuration;
+
+public interface ServiceAdapter {
+    void onConnect(Configuration cfg);
+    void onDisconnect();
+}
diff --git a/src/main/java/org/gnunet/testbed/messages/ConnectionEventMessage.java b/src/main/java/org/gnunet/testbed/messages/ConnectionEventMessage.java
index 094ee1b..a6e2370 100644
--- a/src/main/java/org/gnunet/testbed/messages/ConnectionEventMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/ConnectionEventMessage.java
@@ -1,11 +1,47 @@
-package org.gnunet.testbed.messages;
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.
 
-/**
- * Created with IntelliJ IDEA.
- * User: dold
- * Date: 9/10/13
- * Time: 1:37 PM
- * To change this template use File | Settings | File Templates.
+  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.
  */
-public class ConnectionEventMessage {
+
+package org.gnunet.testbed.messages;
+
+
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(472)
+public class ConnectionEventMessage implements GnunetMessage.Body {
+    /**
+     * 'enum GNUNET_TESTBED_EventType' (in NBO);
+     * either GNUNET_TESTBED_ET_CONNECT or GNUNET_TESTBED_ET_DISCONNECT.
+     */
+    @UInt32
+    public int eventType;
+
+    @UInt32
+    public int peer1;
+
+    @UInt32
+    public int peer2;
+
+    @UInt64
+    public long operationId;
+
 }
diff --git a/src/main/java/org/gnunet/testbed/messages/ControllerInitMessage.java b/src/main/java/org/gnunet/testbed/messages/ControllerInitMessage.java
index 8255662..b60221c 100644
--- a/src/main/java/org/gnunet/testbed/messages/ControllerInitMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/ControllerInitMessage.java
@@ -1,3 +1,22 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.testbed.messages;
 
 
@@ -8,7 +27,7 @@ import org.gnunet.construct.ZeroTerminatedString;
 import org.gnunet.util.GnunetMessage;
 
 /**
- * Initial message from a client to a testing control service.
+ * Initial message from a client to a testbed control service.
  */
 @UnionCase(460)
 public class ControllerInitMessage implements GnunetMessage.Body {
diff --git a/src/main/java/org/gnunet/testbed/messages/CreatePeerSuccessMessage.java b/src/main/java/org/gnunet/testbed/messages/CreatePeerSuccessMessage.java
deleted file mode 100644
index 984e252..0000000
--- a/src/main/java/org/gnunet/testbed/messages/CreatePeerSuccessMessage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.gnunet.testbed.messages;
-
-
-public class CreatePeerSuccessMessage {
-}
diff --git a/src/main/java/org/gnunet/testbed/messages/GenericOperationSuccessMessage.java b/src/main/java/org/gnunet/testbed/messages/GenericOperationSuccessMessage.java
index 33c4a7a..c2388ba 100644
--- a/src/main/java/org/gnunet/testbed/messages/GenericOperationSuccessMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/GenericOperationSuccessMessage.java
@@ -1,11 +1,19 @@
 package org.gnunet.testbed.messages;
 
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
 /**
- * Created with IntelliJ IDEA.
- * User: dold
- * Date: 9/10/13
- * Time: 2:30 AM
- * To change this template use File | Settings | File Templates.
+ * Event notification from a controller to a client for
+ * a generic operational success where the operation does
+ * not return any data.
  */
-public class GenericOperationSuccessMessage {
+@UnionCase(475)
+public class GenericOperationSuccessMessage implements GnunetMessage.Body {
+    @UInt32
+    public int eventType;
+    @UInt64
+    public long operationId;
 }
diff --git a/src/main/java/org/gnunet/testbed/messages/ManagePeerServiceMessage.java b/src/main/java/org/gnunet/testbed/messages/ManagePeerServiceMessage.java
index deb40ad..c2f8996 100644
--- a/src/main/java/org/gnunet/testbed/messages/ManagePeerServiceMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/ManagePeerServiceMessage.java
@@ -1,5 +1,29 @@
 package org.gnunet.testbed.messages;
 
 
-public class ManagePeerServiceMessage {
+import org.gnunet.construct.*;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(483)
+public class ManagePeerServiceMessage implements GnunetMessage.Body {
+    /**
+     * Testbed-internal ID of the target peer.
+     */
+    @UInt32
+    public int peerId;
+
+    /**
+     * Operation ID.
+     */
+    @UInt64
+    public long operationId;
+
+    @UInt8
+    public boolean start;
+
+    /**
+     * Name of the service to start or stop.
+     */
+    @ZeroTerminatedString(optional = false)
+    public String serviceName;
 }
diff --git a/src/main/java/org/gnunet/testbed/messages/OperationFailEventMessage.java b/src/main/java/org/gnunet/testbed/messages/OperationFailEventMessage.java
index b934e22..be306b7 100644
--- a/src/main/java/org/gnunet/testbed/messages/OperationFailEventMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/OperationFailEventMessage.java
@@ -1,11 +1,18 @@
 package org.gnunet.testbed.messages;
 
-/**
- * Created with IntelliJ IDEA.
- * User: dold
- * Date: 9/10/13
- * Time: 2:30 AM
- * To change this template use File | Settings | File Templates.
- */
-public class OperationFailEventMessage {
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
+
+@UnionCase(473)
+public class OperationFailEventMessage implements GnunetMessage.Body {
+    @UInt32
+    public int eventType;
+    @UInt64
+    public long operationId;
+    @ZeroTerminatedString
+    public String errorMessage;
 }
diff --git a/src/main/java/org/gnunet/testbed/messages/OverlayConnectMessage.java b/src/main/java/org/gnunet/testbed/messages/OverlayConnectMessage.java
index 8bfb07e..2447bf7 100644
--- a/src/main/java/org/gnunet/testbed/messages/OverlayConnectMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/OverlayConnectMessage.java
@@ -21,7 +21,7 @@ public class OverlayConnectMessage implements GnunetMessage.Body {
      * Operation ID that is used to identify this operation.
      */
     @UInt64
-    public int operation_id;
+    public long operationId;
 
     /**
      * Unique ID for the second peer.
@@ -33,5 +33,5 @@ public class OverlayConnectMessage implements GnunetMessage.Body {
      * The ID of the host which runs peer2
      */
     @UInt32
-    public int peer2_host;
+    public int hostOfPeer2;
 }
diff --git a/src/main/java/org/gnunet/testbed/messages/PeerConfigurationInformationMessage.java b/src/main/java/org/gnunet/testbed/messages/PeerConfigurationInformationMessage.java
deleted file mode 100644
index 8c0ea97..0000000
--- a/src/main/java/org/gnunet/testbed/messages/PeerConfigurationInformationMessage.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.gnunet.testbed.messages;
-
-/**
- * Peer configuration and identity reply from controller to a client.
- */
-public class PeerConfigurationInformationMessage {
-
-}
diff --git a/src/main/java/org/gnunet/testbed/messages/PeerCreateSuccessMessage.java b/src/main/java/org/gnunet/testbed/messages/PeerCreateSuccessMessage.java
index 837f2d9..f302136 100644
--- a/src/main/java/org/gnunet/testbed/messages/PeerCreateSuccessMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/PeerCreateSuccessMessage.java
@@ -13,5 +13,5 @@ public class PeerCreateSuccessMessage implements GnunetMessage.Body {
     @UInt32
     public int peer_id;
     @UInt64
-    public long operation_id;
+    public long operationId;
 }
diff --git a/src/main/java/org/gnunet/testbed/messages/PeerDestroyMessage.java b/src/main/java/org/gnunet/testbed/messages/PeerDestroyMessage.java
index 6b4f53c..eddccb7 100644
--- a/src/main/java/org/gnunet/testbed/messages/PeerDestroyMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/PeerDestroyMessage.java
@@ -11,5 +11,5 @@ public class PeerDestroyMessage implements GnunetMessage.Body {
     @UInt32
     public int peer_id;
     @UInt64
-    public int operation_id;
+    public long operation_id;
 }
diff --git a/src/main/java/org/gnunet/testbed/messages/PeerEventMessage.java b/src/main/java/org/gnunet/testbed/messages/PeerEventMessage.java
index 3512d5d..44490cd 100644
--- a/src/main/java/org/gnunet/testbed/messages/PeerEventMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/PeerEventMessage.java
@@ -16,11 +16,11 @@ public class PeerEventMessage implements GnunetMessage.Body {
      * either GNUNET_TESTBED_ET_PEER_START or GNUNET_TESTBED_ET_PEER_STOP.
      */
     @Int32
-    int event_type;
+    public int eventType;
     @Int32
-    int host_id;
+    public int host_id;
     @Int32
-    int peer_id;
+    public int peer_id;
     @Int64
-    int operation_id;
+    public long operationId;
 }
diff --git a/src/main/java/org/gnunet/testbed/messages/PeerGetInformationMessage.java b/src/main/java/org/gnunet/testbed/messages/PeerGetInformationMessage.java
new file mode 100644
index 0000000..315e5eb
--- /dev/null
+++ b/src/main/java/org/gnunet/testbed/messages/PeerGetInformationMessage.java
@@ -0,0 +1,34 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.testbed.messages;
+
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(476)
+public class PeerGetInformationMessage implements GnunetMessage.Body {
+    @UInt32
+    public int peerId;
+    @UInt64
+    public long operationId;
+}
diff --git a/src/main/java/org/gnunet/testbed/messages/PeerInformationMessage.java b/src/main/java/org/gnunet/testbed/messages/PeerInformationMessage.java
new file mode 100644
index 0000000..b009f58
--- /dev/null
+++ b/src/main/java/org/gnunet/testbed/messages/PeerInformationMessage.java
@@ -0,0 +1,56 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.testbed.messages;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+
+@UnionCase(477)
+public class PeerInformationMessage implements GnunetMessage.Body {
+    /**
+     * The testbed-internal id of the peer relevant to this
+     * information.
+     */
+    @UInt32
+    public int peerId;
+
+    /**
+     * Operation ID of the operation that created this event.
+     */
+    @UInt64
+    public long operationId;
+
+    /**
+     * Identity of the peer.
+     */
+    @NestedMessage
+    public PeerIdentity peerIdentity;
+
+    @UInt16
+    public int uncompressedConfigSize;
+
+    @UInt16
+    public int pading1;
+
+    @FillWith @UInt8
+    public byte[] compressedConfig;
+}
diff --git a/src/main/java/org/gnunet/testbed/messages/PeerReconfigureMessage.java b/src/main/java/org/gnunet/testbed/messages/PeerReconfigureMessage.java
index 2c07d79..aac2c0a 100644
--- a/src/main/java/org/gnunet/testbed/messages/PeerReconfigureMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/PeerReconfigureMessage.java
@@ -1,8 +1,21 @@
 package org.gnunet.testbed.messages;
 
+import org.gnunet.construct.*;
+import org.gnunet.util.GnunetMessage;
+
 /**
  * Message sent from client to testing service to
  * reconfigure a (stopped) a peer.
  */
-public class PeerReconfigureMessage {
+@UnionCase(465)
+public class PeerReconfigureMessage implements GnunetMessage.Body {
+    @UInt32
+    public int peerId;
+    @UInt64
+    public long operationId;
+    @UInt16
+    public int uncompressedConfigSize;
+    @FillWith
+    @UInt8
+    public byte[] compressedConfig;
 }
diff --git a/src/main/java/org/gnunet/testbed/messages/PeerStartMessage.java b/src/main/java/org/gnunet/testbed/messages/PeerStartMessage.java
index 2f8e4c2..71c220d 100644
--- a/src/main/java/org/gnunet/testbed/messages/PeerStartMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/PeerStartMessage.java
@@ -11,5 +11,5 @@ public class PeerStartMessage implements GnunetMessage.Body {
     @UInt32
     public int peer_id;
     @UInt64
-    public int operation_id;
+    public long operation_id;
 }
diff --git a/src/main/java/org/gnunet/testbed/messages/PeerStopMessage.java b/src/main/java/org/gnunet/testbed/messages/PeerStopMessage.java
index 8436531..cdf5cd5 100644
--- a/src/main/java/org/gnunet/testbed/messages/PeerStopMessage.java
+++ b/src/main/java/org/gnunet/testbed/messages/PeerStopMessage.java
@@ -11,5 +11,5 @@ public class PeerStopMessage implements GnunetMessage.Body {
     @UInt32
     public int peer_id;
     @UInt64
-    public int operation_id;
+    public long operation_id;
 }
diff --git a/src/main/java/org/gnunet/util/AbsoluteTime.java b/src/main/java/org/gnunet/util/AbsoluteTime.java
index 9d22d36..265abf5 100644
--- a/src/main/java/org/gnunet/util/AbsoluteTime.java
+++ b/src/main/java/org/gnunet/util/AbsoluteTime.java
@@ -266,4 +266,8 @@ public class AbsoluteTime implements Comparable<AbsoluteTime> {
     public Date toDate() {
         return new Date(abs_value_us / 1000);
     }
+
+    public long getSeconds() {
+        return abs_value_us / (1000 * 1000);
+    }
 }
diff --git a/src/main/java/org/gnunet/util/CryptoECC.java b/src/main/java/org/gnunet/util/CryptoECC.java
index c30dd0b..d27a2a4 100644
--- a/src/main/java/org/gnunet/util/CryptoECC.java
+++ b/src/main/java/org/gnunet/util/CryptoECC.java
@@ -24,13 +24,18 @@ import org.gnunet.construct.FixedSizeIntegerArray;
 import org.gnunet.construct.Message;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOError;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.file.Files;
+import java.nio.file.OpenOption;
+import java.nio.file.StandardOpenOption;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Random;
 
 /**
  * Implementation of the Ed25519 public-key signature system. See http://ed25519.cr.yp.to/.
@@ -68,6 +73,19 @@ public class CryptoECC {
             privateKey.d = data;
             return privateKey;
         }
+
+        public static PrivateKey createRandom() {
+            PrivateKey privateKey = new PrivateKey();
+            privateKey.d = new byte[32];
+            SecureRandom r = new SecureRandom();
+            r.nextBytes(privateKey.d);
+            return privateKey;
+        }
+
+        public void write(String privKeyFilename) throws IOException {
+            File f = new File(privKeyFilename);
+            Files.write(f.toPath(), d, StandardOpenOption.CREATE_NEW);
+        }
     }
 
     /**
@@ -97,6 +115,17 @@ public class CryptoECC {
         public BigInteger[] asPoint() {
             return new BigInteger[]{decodeint(x), decodeint(y)};
         }
+
+        public static PublicKey fromString(String s) {
+            PublicKey pk = new PublicKey();
+            byte[] data = Strings.stringToData(s, 32);
+            if (null == data)
+                return null;
+            BigInteger[] point = decodepoint(data);
+            pk.x = encodeint(point[0]);
+            pk.y = encodeint(point[1]);
+            return pk;
+        }
     }
 
     /**
@@ -124,6 +153,35 @@ public class CryptoECC {
             System.arraycopy(s, 0, data, r.length, s.length);
             return Strings.dataToString(data);
         }
+
+        public static Signature fromString(String s) {
+            Signature sig = new Signature();
+            sig.r = new byte[32];
+            sig.s = new byte[32];
+            byte[] data = Strings.stringToData(s, 64);
+            if (null == data) {
+                return null;
+            }
+            System.arraycopy(data, 0, sig.r, 0, 32);
+            System.arraycopy(data, 32, sig.s, 0, 32);
+            return sig;
+        }
+
+        /**
+         * Create a random signature that is invalid with
+         * very high probability.
+         *
+         * @return random signature, most probably invalid
+         */
+        public static Signature randomSignature() {
+            Random r = new Random();
+            Signature sig = new Signature();
+            sig.r = new byte[32];
+            sig.s = new byte[32];
+            r.nextBytes(sig.r);
+            r.nextBytes(sig.s);
+            return sig;
+        }
     }
 
     // curve parameter b
diff --git a/src/main/java/org/gnunet/util/HashCode.java b/src/main/java/org/gnunet/util/HashCode.java
index 0c2790f..2ae127d 100644
--- a/src/main/java/org/gnunet/util/HashCode.java
+++ b/src/main/java/org/gnunet/util/HashCode.java
@@ -91,4 +91,9 @@ public class HashCode implements Message {
     public int hashCode() {
         return Arrays.hashCode(this.data);
     }
+
+    @Override
+    public String toString() {
+        return Strings.dataToString(data);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/gnunet/util/PeerIdentity.java b/src/main/java/org/gnunet/util/PeerIdentity.java
index 46a67cd..39da4cd 100644
--- a/src/main/java/org/gnunet/util/PeerIdentity.java
+++ b/src/main/java/org/gnunet/util/PeerIdentity.java
@@ -66,4 +66,10 @@ public class PeerIdentity implements Message {
     public int hashCode() {
         return Arrays.hashCode(data);
     }
+
+    public static PeerIdentity fromString(String value) {
+        PeerIdentity p = new PeerIdentity();
+        p.data = Strings.stringToData(value, p.data.length);
+        return (p.data == null) ? null : p;
+    }
 }
diff --git a/src/main/java/org/gnunet/util/Program.java b/src/main/java/org/gnunet/util/Program.java
index 4884486..9ce1a44 100644
--- a/src/main/java/org/gnunet/util/Program.java
+++ b/src/main/java/org/gnunet/util/Program.java
@@ -177,8 +177,10 @@ public abstract class Program {
 
     /**
      * Start the Program as the initial task of the Scheduler.
+     *
+     * @return the exit value of the scheduler
      */
-    public final void start() {
+    public final int start() {
         Parser optParser = new Parser(this);
         unprocessedArgs = optParser.parse(args);
 
@@ -204,6 +206,8 @@ public abstract class Program {
                 }
             });
         }
+
+        return returnValue;
     }
 
     /**
@@ -219,9 +223,9 @@ public abstract class Program {
     /**
      * Override to implement the behavior of the Program.
      */
-    public abstract void run();
+    protected abstract void run();
 
-    public final Configuration getConfiguration() {
+    protected final Configuration getConfiguration() {
         return cfg;
     }
 }
diff --git a/src/main/java/org/gnunet/util/RunaboutMessageReceiver.java b/src/main/java/org/gnunet/util/RunaboutMessageReceiver.java
index 2a0f067..1de7ac0 100644
--- a/src/main/java/org/gnunet/util/RunaboutMessageReceiver.java
+++ b/src/main/java/org/gnunet/util/RunaboutMessageReceiver.java
@@ -20,6 +20,7 @@
 
 package org.gnunet.util;
 
+import org.gnunet.construct.ProtocolViolationException;
 import org.grothoff.Runabout;
 
 /**
@@ -30,4 +31,12 @@ public abstract class RunaboutMessageReceiver extends Runabout implements Messag
     public void process(GnunetMessage.Body msg) {
         this.visitAppropriate(msg);
     }
+    public void handleUnknownMessageType(UnknownMessageBody unknownMessageBody) {
+        throw new ProtocolViolationException(
+                String.format("unexpected message type: %s", unknownMessageBody.id));
+    }
+    public void visit(UnknownMessageBody unknownMessageBody) {
+        // FIXME: UnknownMessageBody is ugly and should be removed entirely
+        handleUnknownMessageType(unknownMessageBody);
+    }
 }
diff --git a/src/main/java/org/gnunet/util/Strings.java b/src/main/java/org/gnunet/util/Strings.java
index a35568a..f591cf0 100644
--- a/src/main/java/org/gnunet/util/Strings.java
+++ b/src/main/java/org/gnunet/util/Strings.java
@@ -32,8 +32,6 @@ public class Strings {
      * GNUnet specific.  It was chosen such that it only uses characters
      * in [0-9A-V], can be produced without complex arithmetics and uses a
      * small number of characters.
-     * Does not append 0-terminator, but returns a pointer to the place where
-     * it should be placed, if needed.
      *
      * returned string has length ((size*8) + (((size*8) % 5) > 0 ? 5 - ((size*8) % 5) : 0)) / 5 bytes
      *
@@ -75,7 +73,7 @@ public class Strings {
      *
      * @param string the string to decode
      * @param outSize size of the output buffer
-     * @return GNUNET_OK on success, GNUNET_SYSERR if result has the wrong encoding
+     * @return the decoded data on success, null if result has the wrong encoding
      */
 
     public static byte[] stringToData(String string, int outSize) {
@@ -97,20 +95,20 @@ public class Strings {
             shift = 0;
         }
         if ((encoded_len + shift) / 5 != enclen) {
-            throw new AssertionError();
+            return null;
         }
 
         wpos = outSize;
         rpos = enclen;
         bits = (ret = getValue__(string.charAt((int) (--rpos)))) >> (5 - encoded_len % 5);
         if (-1 == ret) {
-            throw new AssertionError();
+            return null;
         }
         while (wpos > 0) {
             assert rpos > 0;
             bits = ((ret = getValue__(string.charAt((int) (--rpos)))) << vbit) | bits;
             if (-1 == ret) {
-                throw new AssertionError();
+                return null;
             }
             vbit += 5;
             if (vbit >= 8) {
diff --git a/src/main/java/org/gnunet/voting/Ballot.java b/src/main/java/org/gnunet/voting/Ballot.java
new file mode 100644
index 0000000..49f1465
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/Ballot.java
@@ -0,0 +1,289 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.voting;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Optional;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.Maps;
+import org.gnunet.util.*;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+import java.util.regex.Pattern;
+
+/**
+ * Public information about an election.
+ */
+public class Ballot {
+
+    String topic;
+    List<String> choices;
+    AbsoluteTime electionStartTime;
+    AbsoluteTime electionEndTime;
+    BiMap<String,PeerIdentity> authorities;
+    SortedMap<String,CryptoECC.Signature> registrationSigs;
+    CryptoECC.PublicKey caPub;
+    CryptoECC.PublicKey issuerPub;
+    CryptoECC.Signature issuerSig;
+    CryptoECC.PublicKey voter_pub;
+    CryptoECC.Signature permission;
+    CryptoECC.PublicKey voter_sig;
+    SortedMap<String,CryptoECC.Signature> vouchers;
+
+    /**
+     * Choice in plaintext.
+     * This field would be encrypted in a secure version.
+     */
+    int choiceId = -1;
+
+    /**
+     * Load a ballot from file.
+     *
+     * @throws InvalidBallotException
+     * @param filename
+     */
+    public Ballot(String filename) {
+        Configuration cfg = new Configuration();
+        cfg.parse(filename);
+        fillBallot(cfg);
+    }
+
+    public Ballot(Configuration cfg) {
+        fillBallot(cfg);
+    }
+
+    private void fillBallot(Configuration cfg) {
+        Optional<String> optTopic = cfg.getValueString("election", "TOPIC");
+        if (!optTopic.isPresent()) {
+            throw new InvalidBallotException("ballot has no topic");
+        }
+        topic = optTopic.get();
+        Optional<String> optChoices = cfg.getValueString("election", "CHOICES");
+        if (!optChoices.isPresent()) {
+            throw new InvalidBallotException("ballot has no choices");
+        }
+        choices = Arrays.asList(optChoices.get().split(Pattern.quote("//")));
+        if (choices.size() < 2) {
+            throw new InvalidBallotException("less than two choices present");
+        }
+        authorities = HashBiMap.create();
+        for (Map.Entry<String,String> e : cfg.getSection("authorities").entrySet()) {
+            String alias = e.getKey();
+            PeerIdentity peerIdentity = PeerIdentity.fromString(e.getValue());
+            if (peerIdentity == null) {
+                throw new InvalidBallotException(
+                        String.format("authority %s has invalid peer identity", alias));
+            }
+            authorities.put(alias, peerIdentity);
+        }
+        if (authorities.size() < 1) {
+            throw new InvalidBallotException("ballot must specify at least one authority");
+        }
+        Optional<String> optCaPub = cfg.getValueString("election", "CA_PUB");
+        if (!optCaPub.isPresent()) {
+            throw new InvalidBallotException("no CA pub key given");
+        }
+        caPub = CryptoECC.PublicKey.fromString(optCaPub.get());
+        if (null == caPub) {
+            throw new InvalidBallotException("CA pub key invalid");
+        }
+        Optional<String> optIssuerPub = cfg.getValueString("election", "ISSUER_PUB");
+        if (optIssuerPub.isPresent()) {
+            issuerPub = CryptoECC.PublicKey.fromString(optIssuerPub.get());
+            Optional<String> optIssuerSig = cfg.getValueString("election", "ISSUER_SIG");
+            if (!optIssuerSig.isPresent()) {
+                throw new InvalidBallotException("issuer public key present, but no signature");
+            }
+            issuerSig = CryptoECC.Signature.fromString(optIssuerSig.get());
+        }
+        registrationSigs = new TreeMap<String, CryptoECC.Signature>();
+        for (Map.Entry<String,String> e : cfg.getSection("registration-signatures").entrySet()) {
+            CryptoECC.Signature sig = CryptoECC.Signature.fromString(e.getValue());
+            if (null == sig) {
+                throw new InvalidBallotException("registration signature has invalid format");
+            }
+            if (!authorities.containsKey(e.getKey())) {
+                throw new InvalidBallotException("ballot contains superfluous registration signature");
+            }
+            registrationSigs.put(e.getKey(), sig);
+        }
+        Optional<String> optChoiceId = cfg.getValueString("vote", "CHOICE_ID");
+        if (optChoiceId.isPresent()) {
+            choiceId = Integer.parseInt(optChoiceId.get());
+            if (choiceId < 0 || choiceId >= choices.size()) {
+                throw new InvalidBallotException("invalid choice in vote");
+            }
+        } else {
+            choiceId = -1;
+        }
+    }
+
+    public HashCode getBallotGuid() {
+        if (issuerSig == null) {
+            throw new InvalidBallotException("can't compute GUID of non-issued ballot");
+        }
+        MessageDigest digest;
+        try {
+            digest = MessageDigest.getInstance("SHA-512");
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("crypto algorithm required but not provided");
+        }
+        digest.update(topic.getBytes());
+        //digest.update(Longs.toByteArray(electionStartTime.getSeconds()));
+        //digest.update(Longs.toByteArray(electionEndTime.getSeconds()));
+        for (String choice : choices) {
+            digest.update(choice.getBytes());
+        }
+        for (SortedMap.Entry<String,PeerIdentity> x : authorities.entrySet()) {
+            digest.update(x.getKey().getBytes());
+            digest.update(x.getValue().data);
+        }
+        digest.update(issuerPub.x);
+        digest.update(issuerPub.y);
+        digest.update(caPub.x);
+        digest.update(caPub.y);
+        return new HashCode(digest.digest());
+    }
+
+    /**
+     * Encode the given choice permanently in the ballot.
+     *
+     * @param choice the choice to encode the ballot
+     * @param privateKey the private key to use for encoding
+     */
+    public void encodeChoice(String choice, CryptoECC.PrivateKey privateKey) {
+        choiceId = -1;
+        int i = 0;
+        for (String possibleChoice : choices) {
+            if (choice.equals(possibleChoice)) {
+                choiceId = i;
+            }
+            i++;
+        }
+        if (choiceId == -1) {
+            throw new InvalidBallotException(String.format("choice '%s' not valid", choice));
+        }
+    }
+
+    public Configuration toConfiguration() {
+        Configuration cfg = new Configuration();
+        cfg.setValueString("election", "TOPIC", topic);
+        cfg.setValueString("election", "CHOICES", Joiner.on("//").join(choices));
+        cfg.setValueString("election", "CA_PUB", caPub.toString());
+        for (Map.Entry<String, PeerIdentity> e : authorities.entrySet()) {
+            cfg.setValueString("authorities", e.getKey(), e.getValue().toString());
+        }
+        for (Map.Entry<String, CryptoECC.Signature> e : registrationSigs.entrySet()) {
+            cfg.setValueString("registration-signatures", e.getKey(), e.getValue().toString());
+        }
+        if (null != issuerPub) {
+            cfg.setValueString("election", "ISSUER_PUB", issuerPub.toString());
+            cfg.setValueString("election", "ISSUER_SIG", issuerSig.toString());
+        }
+        if (-1 != choiceId) {
+            cfg.setValueNumber("vote", "CHOICE_ID", choiceId);
+        }
+        return cfg;
+    }
+
+    public String serialize() {
+        return toConfiguration().serialize();
+    }
+
+    public String describe() {
+        StringBuilder buf = new StringBuilder();
+        buf.append("Topic: ");
+        buf.append("'");
+        buf.append(topic);
+        buf.append("'\n");
+        buf.append("Choices:\n");
+        for (int i = 0; i < choices.size(); i++) {
+            buf.append(""+(i+1));
+            buf.append(". '");
+            buf.append(choices.get(i));
+            buf.append("'\n");
+        }
+        buf.append("Authorities:\n");
+        for (Map.Entry<String, PeerIdentity> e : authorities.entrySet()) {
+            buf.append("'");
+            buf.append(e.getKey());
+            buf.append("', ");
+            buf.append(e.getValue().toString());
+            buf.append("\n");
+        }
+        if (issuerPub == null) {
+            buf.append("issue status: not issued\n");
+        } else {
+            buf.append("issue status: issued, GUID ");
+            buf.append(getBallotGuid().toString());
+            buf.append("\n");
+        }
+        if (!registrationSigs.isEmpty()) {
+            buf.append("ballot is registered with the following authorities:\n");
+            for (Map.Entry<String, CryptoECC.Signature> e : registrationSigs.entrySet()) {
+                buf.append(e.getKey());
+                buf.append(" ");
+            }
+            buf.append("\n");
+        }
+        else {
+            buf.append("ballot not registered\n");
+        }
+        if (choiceId != -1) {
+            buf.append("choice selected\n");
+        } else {
+            buf.append("no choice selected\n");
+        }
+        return buf.toString();
+    }
+
+    public List<PeerIdentity> getRemainingSubmitAuthorities() {
+        // FIXME: only return remaining authorities
+        return new ArrayList<PeerIdentity>(authorities.values());
+    }
+
+
+    public List<PeerIdentity> getRemainingRegisterAuthorities() {
+        LinkedList<PeerIdentity> remaining = new LinkedList<PeerIdentity>();
+        for (SortedMap.Entry<String,PeerIdentity> x : authorities.entrySet()) {
+            if (!registrationSigs.containsKey(x.getKey()))
+                remaining.add(x.getValue());
+        }
+        return remaining;
+    }
+
+    public void issue(CryptoECC.PrivateKey privateKey) {
+        issuerPub = CryptoECC.computePublicKey(privateKey);
+        issuerSig = CryptoECC.sign(getBallotGuid().data, privateKey, issuerPub);
+    }
+
+    public void addRegistrationSignature(PeerIdentity currentAuthority, CryptoECC.Signature registrationSignature) {
+        String alias = authorities.inverse().get(currentAuthority);
+        registrationSigs.put(alias, registrationSignature);
+    }
+
+    public List<PeerIdentity> getAuthorities() {
+        return new ArrayList<PeerIdentity>(authorities.values());
+    }
+}
diff --git a/src/main/java/org/gnunet/voting/BallotTool.java b/src/main/java/org/gnunet/voting/BallotTool.java
index 48f252f..619afa5 100644
--- a/src/main/java/org/gnunet/voting/BallotTool.java
+++ b/src/main/java/org/gnunet/voting/BallotTool.java
@@ -27,8 +27,10 @@ import com.google.common.io.Files;
 import com.google.common.io.OutputSupplier;
 import org.gnunet.mesh.Mesh;
 import org.gnunet.mesh.MeshRunabout;
+import org.gnunet.mesh.TunnelEndHandler;
 import org.gnunet.util.Configuration;
 import org.gnunet.util.CryptoECC;
+import org.gnunet.util.PeerIdentity;
 import org.gnunet.util.Program;
 import org.gnunet.util.getopt.Argument;
 import org.gnunet.util.getopt.ArgumentAction;
@@ -41,6 +43,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
+import java.util.List;
 import java.util.regex.Pattern;
 
 /**
@@ -71,6 +74,13 @@ public class BallotTool {
             boolean register = false;
 
             @Argument(
+                    shortname = "i",
+                    longname = "issue",
+                    action = ArgumentAction.SET,
+                    description = "sign the ballot as issuer")
+            boolean issue = false;
+
+            @Argument(
                     shortname = "x",
                     longname = "select",
                     action = ArgumentAction.STORE_STRING,
@@ -99,6 +109,21 @@ public class BallotTool {
                     description = "write a template ballot to the give ballot file")
             boolean template = false;
 
+            @Argument(
+                    shortname = "g",
+                    longname = "gen-key",
+                    action = ArgumentAction.SET,
+                    description = "generate a private key")
+            boolean genKey = false;
+
+            @Argument(
+                    shortname = "P",
+                    longname = "print-key",
+                    action = ArgumentAction.SET,
+                    description = "print the public key for the private key")
+            boolean printKey = false;
+
+
             @Override
             protected String makeHelpText() {
                 return "gnunet-ballot [OPTIONS]... BALLOT [PRIVKEYFILE]\n" +
@@ -120,7 +145,7 @@ public class BallotTool {
                 }
             }
 
-            private void runRegister(String ballotFilename, String privKeyFilename) {
+            private void runIssue(String ballotFilename, String privKeyFilename) {
                 File bf = new File(ballotFilename);
                 if (!bf.exists()) {
                     System.err.println("ballot file does not exist");
@@ -131,26 +156,18 @@ public class BallotTool {
                     System.err.println("private-key file does not exist");
                     return;
                 }
-                Configuration ballot = new Configuration();
-                ballot.parse(ballotFilename);
+                Ballot b = new Ballot(ballotFilename);
                 CryptoECC.PrivateKey privateKey = CryptoECC.PrivateKey.fromFile(privKeyFilename);
                 if (privateKey == null) {
                     System.err.println("keyfile invalid");
                     return;
                 }
-                CryptoECC.PublicKey publicKey = CryptoECC.computePublicKey(privateKey);
-                ballot.setValueString("election", "ISSUER_PUB", publicKey.toString());
-                String sigData = ballot.serialize("election", "authorities");
-                CryptoECC.Signature sig = CryptoECC.sign(sigData.getBytes(Charsets.UTF_8), privateKey, publicKey);
-                ballot.setValueString("registration-issuer", "SIGNATURE", sig.toString());
-                String b = ballot.serialize();
+                b.issue(privateKey);
                 try {
-                    Files.write(b, bf, Charsets.UTF_8);
+                    Files.write(b.serialize(), bf, Charsets.UTF_8);
                 } catch (IOException e) {
-                    System.err.println("can not write to ballot file");
-                    return;
+                    System.err.println("could not write ballot file: " + e.getMessage());
                 }
-                System.out.println("ballot registered");
             }
 
             public void runSelect(String ballotFilename, String privKeyFilename, String choice) {
@@ -164,30 +181,13 @@ public class BallotTool {
                     System.err.println("private-key file does not exist");
                     return;
                 }
-                Configuration ballot = new Configuration();
-                ballot.parse(ballotFilename);
                 CryptoECC.PrivateKey privateKey = CryptoECC.PrivateKey.fromFile(privKeyFilename);
                 if (privateKey == null) {
                     System.err.println("keyfile invalid");
                     return;
                 }
-                CryptoECC.PublicKey publicKey = CryptoECC.computePublicKey(privateKey);
-                String choicesStr = ballot.getValueString("election", "CHOICES").get();
-                String[] choices = choicesStr.trim().split(Pattern.quote("//"));
-                choice = choice.trim();
-                boolean found = false;
-                for (String possibleChoice : choices) {
-                    if (possibleChoice.trim().equals(choice))
-                        found = true;
-                }
-                if (!found) {
-                    System.err.println("choice invalid");
-                    return;
-                }
-                CryptoECC.Signature sig = CryptoECC.sign(choice.getBytes(Charsets.UTF_8), privateKey, publicKey);
-                ballot.setValueString("vote", "CHOICE_PLAIN", choice);
-                ballot.setValueString("vote", "PUB", publicKey.toString());
-                ballot.setValueString("vote", "SIG", sig.toString());
+                Ballot ballot = new Ballot(ballotFilename);
+                ballot.encodeChoice(choice, privateKey);
                 try {
                     Files.write(ballot.serialize(), bf, Charsets.UTF_8);
                 } catch (IOException e) {
@@ -197,42 +197,49 @@ public class BallotTool {
                 System.out.println("vote written to ballot file");
             }
 
-            public void runSubmit(String ballotFilename) {
-                class SubmitMessageReceiver extends MeshRunabout {
-                    public void visit(SubmitResponseMessage m) {
-                        // FIXME ...
-                    }
-                }
-                File bf = new File(ballotFilename);
-                if (!bf.exists()) {
-                    System.err.println("ballot file does not exist");
-                    return;
-                }
-                Configuration ballot = new Configuration();
-                ballot.parse(ballotFilename);
-                Mesh mesh = new Mesh(getConfiguration(), null, null, new SubmitMessageReceiver());
-                Mesh.Tunnel<Void> t = mesh.createTunnel(null, CertificateAuthorityService.MESH_PORT, true, true, null);
-                SubmitMessage m = new SubmitMessage();
-                m.ballot = ballot.toString();
-                t.send(m);
-                // FIXME ...
-            }
-
-            public void runQuery(String ballotFilename) {
+            public void runPermission(String ballotFilename, String privKeyFilename) {
 
             }
 
-
-            public void runPermission(String ballotFilename, String privKeyFilename) {
-
+            public void runGenKey(String privKeyFilename) {
+                File kf = new File(privKeyFilename);
+                if (kf.exists()) {
+                    System.err.println("private key file already exists, not overwriting");
+                    return;
+                }
+                CryptoECC.PrivateKey privateKey = CryptoECC.PrivateKey.createRandom();
+                try {
+                    privateKey.write(privKeyFilename);
+                } catch (IOException e) {
+                    System.err.println("can't write to key file: " + e.getMessage());
+                }
             }
 
+            public void runPrintKey(String privKeyFilename) {
+                File kf = new File(privKeyFilename);
+                if (!kf.exists()) {
+                    System.err.println("key file does not exist");
+                    return;
+                }
+                CryptoECC.PrivateKey privateKey = CryptoECC.PrivateKey.fromFile(privKeyFilename);
+                if (privateKey == null) {
+                    System.err.println("key invalid");
+                    return;
+                }
+                CryptoECC.PublicKey publicKey = CryptoECC.computePublicKey(privateKey);
+                System.out.println(publicKey.toString());
+            }
 
             public void runVerify(String ballotFilename) {
-                System.err.print("not implemented");
+                File bf = new File(ballotFilename);
+                if (!bf.exists()) {
+                    System.err.println("ballot file does not exist");
+                    return;
+                }
+                Ballot ballot = new Ballot(ballotFilename);
+                System.out.print(ballot.describe());
             }
 
-
             @Override
             public void run() {
                 if (template) {
@@ -245,11 +252,20 @@ public class BallotTool {
                 }
 
                 if (register) {
+                    if (this.unprocessedArgs.length != 1) {
+                        System.err.println("-r/--register requires exactly one positional argument");
+                        return;
+                    }
+                    RegisterCommand c = new RegisterCommand(getConfiguration(), unprocessedArgs[0]);
+                    c.run();
+                    return;
+                }
+                if (issue) {
                     if (this.unprocessedArgs.length != 2) {
-                        System.err.println("-r/--register requires exactly two positional arguments");
+                        System.err.println("-i/--issue requires exactly two positional arguments");
                         return;
                     }
-                    runRegister(unprocessedArgs[0], unprocessedArgs[1]);
+                    runIssue(unprocessedArgs[0], unprocessedArgs[1]);
                     return;
                 }
                 if (select != null) {
@@ -265,7 +281,8 @@ public class BallotTool {
                         System.err.println("-s/--submit requires exactly one positional argument");
                         return;
                     }
-                    runSubmit(unprocessedArgs[0]);
+                    SubmitCommand c = new SubmitCommand(getConfiguration(), unprocessedArgs[0]);
+                    c.run();
                     return;
                 }
                 if (verify) {
@@ -281,7 +298,8 @@ public class BallotTool {
                         System.err.println("-q/--query requires exactly one positional argument");
                         return;
                     }
-                    runQuery(unprocessedArgs[0]);
+                    QueryCommand c = new QueryCommand(getConfiguration(), unprocessedArgs[0]);
+                    c.run();
                     return;
                 }
                 if (permission) {
@@ -289,9 +307,25 @@ public class BallotTool {
                         System.err.println("-p/--permission requires exactly two positional arguments");
                         return;
                     }
-                    runPermission(unprocessedArgs[0], unprocessedArgs[1]);
+                    PermissionCommand c = new PermissionCommand(getConfiguration(),
+                            unprocessedArgs[0], unprocessedArgs[1]);
+                    c.run();
                     return;
                 }
+                if (genKey) {
+                    if (this.unprocessedArgs.length != 1) {
+                        System.err.println("-g/--gen-key requires exactly one positional argument");
+                        return;
+                    }
+                    runGenKey(unprocessedArgs[0]);
+                }
+                if (printKey) {
+                    if (this.unprocessedArgs.length != 1) {
+                        System.err.println("-P/--print-key requires exactly one positional argument");
+                        return;
+                    }
+                    runPrintKey(unprocessedArgs[0]);
+                }
             }
         }.start();
 
diff --git a/src/main/java/org/gnunet/voting/InvalidBallotException.java b/src/main/java/org/gnunet/voting/InvalidBallotException.java
new file mode 100644
index 0000000..3f74f98
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/InvalidBallotException.java
@@ -0,0 +1,30 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.voting;
+
+/**
+ * Exception thrown when a ballot contains insufficient or invalid data.
+ */
+public class InvalidBallotException extends RuntimeException {
+    public InvalidBallotException(String msg) {
+        super(msg);
+    }
+}
diff --git a/src/main/java/org/gnunet/voting/PermissionCommand.java b/src/main/java/org/gnunet/voting/PermissionCommand.java
new file mode 100644
index 0000000..7e73dbd
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/PermissionCommand.java
@@ -0,0 +1,132 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.
+ */
+
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.
+ */
+
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.voting;
+
+
+import org.gnunet.mesh.Mesh;
+import org.gnunet.mesh.MeshRunabout;
+import org.gnunet.mesh.TunnelEndHandler;
+import org.gnunet.util.Configuration;
+import org.gnunet.util.PeerIdentity;
+import org.gnunet.voting.messages.QueryFailureMessage;
+import org.gnunet.voting.messages.QueryMessage;
+import org.gnunet.voting.messages.QueryResponseMessage;
+
+import java.io.File;
+import java.util.List;
+import java.util.Random;
+
+public class PermissionCommand extends MeshRunabout implements TunnelEndHandler {
+    private final String ballotFilename;
+    private Ballot ballot;
+    private final Configuration cfg;
+    private Mesh mesh;
+    private Mesh.Tunnel<Void> tunnel;
+    private boolean submitted = false;
+
+    @Override
+    public void onTunnelEnd(Mesh.Tunnel tunnel) {
+        if (!submitted)
+            throw new AssertionError();
+    }
+
+    public void visit(QueryResponseMessage m) {
+        submitted = true;
+        if (m.results.length != ballot.choices.size()) {
+            System.out.println("failure to query result: malformed response");
+        } else {
+            System.out.println("got results:");
+            for (int i = 0; i < m.results.length; i++) {
+                System.out.println("'" + ballot.choices.get(i) + "': " + m.results[i]);
+            }
+        }
+
+        tunnel.destroy();
+        mesh.destroy();
+    }
+
+
+    public void visit(QueryFailureMessage m) {
+        submitted = true;
+        System.out.println("failure to query result: authority refused");
+        tunnel.destroy();
+        mesh.destroy();
+    }
+
+    public PermissionCommand(Configuration cfg, String ballotFilename, String pubKeyString) {
+        this.cfg = cfg;
+        this.ballotFilename = ballotFilename;
+    }
+
+    public void run() {
+        File bf = new File(ballotFilename);
+        if (!bf.exists()) {
+            System.err.println("ballot file does not exist");
+            return;
+        }
+        ballot = new Ballot(ballotFilename);
+
+        Random r = new Random();
+        mesh = new Mesh(cfg, this, this);
+        tunnel = mesh.createTunnel(null /* FIXME */, CertificateAuthorityService.MESH_PORT, true, true, null);
+        //tunnel.send(m);
+    }
+}
diff --git a/src/main/java/org/gnunet/voting/QueryCommand.java b/src/main/java/org/gnunet/voting/QueryCommand.java
new file mode 100644
index 0000000..5ab7acb
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/QueryCommand.java
@@ -0,0 +1,120 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.
+ */
+
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.voting;
+
+
+import org.gnunet.mesh.Mesh;
+import org.gnunet.mesh.MeshRunabout;
+import org.gnunet.mesh.TunnelEndHandler;
+import org.gnunet.util.Configuration;
+import org.gnunet.util.PeerIdentity;
+import org.gnunet.voting.messages.QueryFailureMessage;
+import org.gnunet.voting.messages.QueryMessage;
+import org.gnunet.voting.messages.QueryResponseMessage;
+
+import java.io.File;
+import java.util.List;
+import java.util.Random;
+
+public class QueryCommand extends MeshRunabout implements TunnelEndHandler {
+    private final String ballotFilename;
+    private Ballot ballot;
+    private final Configuration cfg;
+    private Mesh mesh;
+    private Mesh.Tunnel<Void> tunnel;
+    private boolean submitted = false;
+
+    @Override
+    public void onTunnelEnd(Mesh.Tunnel tunnel) {
+        if (!submitted)
+            throw new AssertionError();
+    }
+
+    public void visit(QueryResponseMessage m) {
+        submitted = true;
+        if (m.results.length != ballot.choices.size()) {
+            System.out.println("failure to query result: malformed response");
+        } else {
+            System.out.println("got results:");
+            for (int i = 0; i < m.results.length; i++) {
+                System.out.println("'" + ballot.choices.get(i) + "': " + m.results[i]);
+            }
+        }
+
+        tunnel.destroy();
+        mesh.destroy();
+    }
+
+
+    public void visit(QueryFailureMessage m) {
+        submitted = true;
+        System.out.println("failure to query result: authority refused");
+        tunnel.destroy();
+        mesh.destroy();
+    }
+
+    public QueryCommand(Configuration cfg, String ballotFilename) {
+        this.cfg = cfg;
+        this.ballotFilename = ballotFilename;
+    }
+
+    public void run() {
+        File bf = new File(ballotFilename);
+        if (!bf.exists()) {
+            System.err.println("ballot file does not exist");
+            return;
+        }
+        ballot = new Ballot(ballotFilename);
+        List<PeerIdentity> remainingAuthorities = ballot.getAuthorities();
+        if (remainingAuthorities.isEmpty()) {
+            System.err.println("no authorities available");
+            return;
+        }
+        Random r = new Random();
+        PeerIdentity authority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
+        System.out.println("querying authority" + authority.toString());
+        mesh = new Mesh(cfg, this, this);
+        tunnel = mesh.createTunnel(authority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
+        QueryMessage m = new QueryMessage();
+        m.ballotGUID = ballot.getBallotGuid();
+        tunnel.send(m);
+    }
+}
diff --git a/src/main/java/org/gnunet/voting/RegisterCommand.java b/src/main/java/org/gnunet/voting/RegisterCommand.java
new file mode 100644
index 0000000..f9d4c4d
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/RegisterCommand.java
@@ -0,0 +1,119 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.
+ */
+
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.voting;
+
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
+import org.gnunet.mesh.Mesh;
+import org.gnunet.mesh.MeshRunabout;
+import org.gnunet.mesh.TunnelEndHandler;
+import org.gnunet.testbed.CompressedConfig;
+import org.gnunet.util.Configuration;
+import org.gnunet.util.PeerIdentity;
+import org.gnunet.voting.messages.BallotRegisterRequestMessage;
+import org.gnunet.voting.messages.BallotRegisterRespondMessage;
+import org.gnunet.voting.messages.SubmitMessage;
+import org.gnunet.voting.messages.SubmitResponseMessage;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Random;
+
+public class RegisterCommand extends MeshRunabout implements TunnelEndHandler {
+    private final String ballotFilename;
+    private Ballot ballot;
+    private final Configuration cfg;
+    private Mesh mesh;
+    private Mesh.Tunnel<Void> tunnel;
+    private boolean submitted = false;
+    private PeerIdentity currentAuthority;
+
+    @Override
+    public void onTunnelEnd(Mesh.Tunnel tunnel) {
+        if (!submitted)
+            throw new AssertionError();
+    }
+
+    public void visit(BallotRegisterRespondMessage m) {
+        submitted = true;
+        System.out.println("vote successfully registered");
+        ballot.addRegistrationSignature(currentAuthority, m.registrationSignature);
+        try {
+            Files.write(ballot.serialize(), new File(ballotFilename), Charsets.UTF_8);
+        } catch (IOException e) {
+            System.out.println("could not write ballot file");
+            return;
+        }
+        tunnel.destroy();
+        mesh.destroy();
+    }
+
+    public RegisterCommand(Configuration cfg, String ballotFilename) {
+        this.cfg = cfg;
+        this.ballotFilename = ballotFilename;
+    }
+
+    public void run() {
+        File bf = new File(ballotFilename);
+        if (!bf.exists()) {
+            System.err.println("ballot file does not exist");
+            return;
+        }
+        ballot = new Ballot(ballotFilename);
+
+        List<PeerIdentity> remainingAuthorities = ballot.getRemainingRegisterAuthorities();
+        if (remainingAuthorities.isEmpty()) {
+            System.err.println("all authorities already received the ballot");
+            return;
+        }
+        Random r = new Random();
+        currentAuthority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
+        System.out.println("registering ballot with authority " + currentAuthority.toString());
+        mesh = new Mesh(cfg, this, this);
+        tunnel = mesh.createTunnel(currentAuthority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
+        BallotRegisterRequestMessage m = new BallotRegisterRequestMessage();
+        CompressedConfig ccfg = new CompressedConfig(ballot.toConfiguration());
+        m.compressedBallotConfig = ccfg.compressed_data;
+        tunnel.send(m);
+    }
+}
diff --git a/src/main/java/org/gnunet/voting/SubmitCommand.java b/src/main/java/org/gnunet/voting/SubmitCommand.java
new file mode 100644
index 0000000..d00ea69
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/SubmitCommand.java
@@ -0,0 +1,84 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.voting;
+
+
+import org.gnunet.mesh.Mesh;
+import org.gnunet.mesh.MeshRunabout;
+import org.gnunet.mesh.TunnelEndHandler;
+import org.gnunet.util.Configuration;
+import org.gnunet.util.PeerIdentity;
+import org.gnunet.voting.messages.SubmitMessage;
+import org.gnunet.voting.messages.SubmitResponseMessage;
+
+import java.io.File;
+import java.util.List;
+import java.util.Random;
+
+public class SubmitCommand extends MeshRunabout implements TunnelEndHandler {
+    private final String ballotFilename;
+    private Ballot ballot;
+    private final Configuration cfg;
+    private Mesh mesh;
+    private Mesh.Tunnel<Void> tunnel;
+    private boolean submitted = false;
+
+    @Override
+    public void onTunnelEnd(Mesh.Tunnel tunnel) {
+        if (!submitted)
+            throw new AssertionError();
+    }
+
+    public void visit(SubmitResponseMessage m) {
+        submitted = true;
+        System.out.println("vote successfully submitted");
+        tunnel.destroy();
+        mesh.destroy();
+    }
+
+    public SubmitCommand(Configuration cfg, String ballotFilename) {
+        this.cfg = cfg;
+        this.ballotFilename = ballotFilename;
+    }
+
+    public void run() {
+        File bf = new File(ballotFilename);
+        if (!bf.exists()) {
+            System.err.println("ballot file does not exist");
+            return;
+        }
+        ballot = new Ballot(ballotFilename);
+        List<PeerIdentity> remainingAuthorities = ballot.getRemainingSubmitAuthorities();
+        if (remainingAuthorities.isEmpty()) {
+            System.err.println("all authorities already received the ballot");
+            return;
+        }
+        Random r = new Random();
+        PeerIdentity authority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
+        System.out.println("submitting to authority" + authority.toString());
+        mesh = new Mesh(cfg, null, this);
+        tunnel = mesh.createTunnel(authority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
+        SubmitMessage m = new SubmitMessage();
+        m.ballotGuid = ballot.getBallotGuid();
+        m.choiceId = ballot.choiceId;
+        tunnel.send(m);
+    }
+}
diff --git a/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java b/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
new file mode 100644
index 0000000..a74d175
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
@@ -0,0 +1,116 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.voting;
+
+
+import com.google.common.collect.Maps;
+import org.gnunet.mesh.Mesh;
+import org.gnunet.mesh.MeshRunabout;
+import org.gnunet.testbed.CompressedConfig;
+import org.gnunet.util.*;
+import org.gnunet.voting.messages.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+public class TallyAuthorityDaemon extends Program {
+    private static final Logger logger = LoggerFactory
+            .getLogger(TallyAuthorityDaemon.class);
+
+    public static final int MESH_PORT = 1002;
+    private Mesh mesh;
+
+    private HashMap<HashCode, ElectionState> elections = Maps.newHashMap();
+
+    class ElectionState {
+        Ballot ballot;
+        /**
+         * Set of voters that have submitted their ballot.
+         */
+        Set<CryptoECC.PublicKey> voters = new HashSet<CryptoECC.PublicKey>();
+
+        /**
+         * Maping from choice to number of votes for that choice.
+         */
+        int[] tally;
+    }
+
+
+    private class TallyMeshReceiver extends MeshRunabout {
+        public void visit(SubmitMessage m) {
+            ElectionState electionState = elections.get(m.ballotGuid);
+            if (null == electionState) {
+                return;
+            }
+            if (m.choiceId < 0 || m.choiceId >= electionState.tally.length) {
+                return;
+            }
+            electionState.tally[m.choiceId] += 1;
+            SubmitResponseMessage rm = new SubmitResponseMessage();
+            getSender().send(rm);
+            getSender().receiveDone();
+        }
+
+        public void visit(BallotRegisterRequestMessage m) {
+            logger.info("ballot register requested");
+
+            CompressedConfig ccfg = new CompressedConfig(m.compressedBallotConfig);
+            Ballot b = new Ballot(ccfg.decompress());
+            ElectionState electionState = new ElectionState();
+            electionState.tally = new int[b.choices.size()];
+            electionState.ballot = b;
+            elections.put(b.getBallotGuid(), electionState);
+            BallotRegisterRespondMessage rm = new BallotRegisterRespondMessage();
+            rm.registrationSignature = CryptoECC.Signature.randomSignature();
+            getSender().send(rm);
+            getSender().receiveDone();
+        }
+
+        public void visit(QueryMessage m) {
+            ElectionState electionState = elections.get(m.ballotGUID);
+            if (null == electionState) {
+                QueryFailureMessage rm = new QueryFailureMessage();
+                getSender().send(rm);
+
+            } else {
+                QueryResponseMessage rm = new QueryResponseMessage();
+                rm.results = electionState.tally;
+                getSender().send(rm);
+            }
+            getSender().receiveDone();
+        }
+    }
+
+    public TallyAuthorityDaemon(String[] args) {
+        super(args);
+    }
+
+    public static void main(String[] args) {
+        TallyAuthorityDaemon daemon = new TallyAuthorityDaemon(args);
+        daemon.start();
+    }
+
+    @Override
+    public void run() {
+        logger.info("running tally daemon");
+        mesh = new Mesh(getConfiguration(), null, null, new TallyMeshReceiver(), MESH_PORT);
+    }
+}
diff --git a/src/main/java/org/gnunet/voting/TallyAuthorityService.java b/src/main/java/org/gnunet/voting/TallyAuthorityService.java
deleted file mode 100644
index 2170cb2..0000000
--- a/src/main/java/org/gnunet/voting/TallyAuthorityService.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- This file is part of GNUnet.
-  (C) 2012, 2013 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.voting;
-
-
-import com.google.common.collect.Maps;
-import org.gnunet.mesh.Mesh;
-import org.gnunet.mesh.MeshRunabout;
-import org.gnunet.util.CryptoECC;
-import org.gnunet.util.RelativeTime;
-import org.gnunet.util.Service;
-import org.gnunet.voting.messages.BallotRegisterRequestMessage;
-import org.gnunet.voting.messages.CertificateRequestMessage;
-import org.gnunet.voting.messages.QueryResultMessage;
-import org.gnunet.voting.messages.SubmitMessage;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-public class TallyAuthorityService extends Service {
-    public static final int MESH_PORT = 1002;
-    private Mesh mesh;
-
-
-    private class ElectionState {
-        /**
-         * Set of voters that have submitted their ballot.
-         */
-        private Set<CryptoECC.PublicKey> voters = new HashSet<CryptoECC.PublicKey>();
-
-        /**
-         * Maping from choice to number of votes for that choice.
-         */
-        private Map<String,Integer> tally = Maps.newHashMap();
-    }
-
-
-    private class TallyMeshReceiver extends MeshRunabout {
-        public void visit(SubmitMessage m) {
-            // TODO: count!
-        }
-        public void visit(BallotRegisterRequestMessage m) {
-            // TODO ...
-        }
-        public void visit(QueryResultMessage m) {
-
-        }
-    }
-
-    public TallyAuthorityService(String[] args) {
-        super("voting-tally", RelativeTime.FOREVER, true, args);
-    }
-
-    public static void main(String[] args) {
-        CertificateAuthorityService service = new CertificateAuthorityService(args);
-        service.start();
-    }
-
-    @Override
-    public void run() {
-        mesh = new Mesh(getConfiguration(), null, null, new TallyMeshReceiver(), MESH_PORT);
-    }
-}
diff --git a/src/main/java/org/gnunet/voting/messages/BallotRegisterRequestMessage.java b/src/main/java/org/gnunet/voting/messages/BallotRegisterRequestMessage.java
index 3214187..95a7c2f 100644
--- a/src/main/java/org/gnunet/voting/messages/BallotRegisterRequestMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/BallotRegisterRequestMessage.java
@@ -1,6 +1,11 @@
 package org.gnunet.voting.messages;
 
+import org.gnunet.construct.IntegerFill;
+import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
 
+@UnionCase(42001)
 public class BallotRegisterRequestMessage implements GnunetMessage.Body {
+    @IntegerFill(signed = false, bitSize = 8)
+    public byte[] compressedBallotConfig;
 }
diff --git a/src/main/java/org/gnunet/voting/messages/BallotRegisterRespondMessage.java b/src/main/java/org/gnunet/voting/messages/BallotRegisterRespondMessage.java
index 15e10b8..f30f624 100644
--- a/src/main/java/org/gnunet/voting/messages/BallotRegisterRespondMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/BallotRegisterRespondMessage.java
@@ -1,6 +1,12 @@
 package org.gnunet.voting.messages;
 
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.CryptoECC;
 import org.gnunet.util.GnunetMessage;
 
+@UnionCase(42002)
 public class BallotRegisterRespondMessage implements GnunetMessage.Body {
+    @NestedMessage
+    public CryptoECC.Signature registrationSignature;
 }
diff --git a/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java b/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java
index d262047..e57b215 100644
--- a/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java
@@ -1,8 +1,12 @@
 package org.gnunet.voting.messages;
 
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
 /**
  * Request a certificate that allows a voter to submit a ballot.
  * Sent by the voter to the certificate authority.
  */
-public class CertificateRequestMessage {
+@UnionCase(42003)
+public class CertificateRequestMessage implements GnunetMessage.Body {
 }
diff --git a/src/main/java/org/gnunet/voting/messages/CertificateResponseMessage.java b/src/main/java/org/gnunet/voting/messages/CertificateResponseMessage.java
index 87f688b..4a1bcd6 100644
--- a/src/main/java/org/gnunet/voting/messages/CertificateResponseMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/CertificateResponseMessage.java
@@ -1,5 +1,9 @@
 package org.gnunet.voting.messages;
 
 
-public class CertificateResponseMessage {
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(42004)
+public class CertificateResponseMessage implements GnunetMessage.Body {
 }
diff --git a/src/main/java/org/gnunet/voting/messages/QueryFailureMessage.java b/src/main/java/org/gnunet/voting/messages/QueryFailureMessage.java
new file mode 100644
index 0000000..73f8fc8
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/QueryFailureMessage.java
@@ -0,0 +1,28 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 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.voting.messages;
+
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(42009)
+public class QueryFailureMessage implements GnunetMessage.Body {
+}
diff --git a/src/main/java/org/gnunet/voting/messages/QueryMessage.java b/src/main/java/org/gnunet/voting/messages/QueryMessage.java
new file mode 100644
index 0000000..abb04dc
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/QueryMessage.java
@@ -0,0 +1,12 @@
+package org.gnunet.voting.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+@UnionCase(42005)
+public class QueryMessage implements GnunetMessage.Body {
+    @NestedMessage
+    public HashCode ballotGUID;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/QueryResponseMessage.java b/src/main/java/org/gnunet/voting/messages/QueryResponseMessage.java
new file mode 100644
index 0000000..4f0a8f6
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/QueryResponseMessage.java
@@ -0,0 +1,12 @@
+package org.gnunet.voting.messages;
+
+
+import org.gnunet.construct.*;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+@UnionCase(42006)
+public class QueryResponseMessage implements GnunetMessage.Body {
+    @IntegerFill(signed = false, bitSize = 32)
+    public int[] results;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/QueryResultMessage.java b/src/main/java/org/gnunet/voting/messages/QueryResultMessage.java
deleted file mode 100644
index 65f7ecc..0000000
--- a/src/main/java/org/gnunet/voting/messages/QueryResultMessage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.gnunet.voting.messages;
-
-public class QueryResultMessage {
-
-}
diff --git a/src/main/java/org/gnunet/voting/messages/QueryResultResponseMessage.java b/src/main/java/org/gnunet/voting/messages/QueryResultResponseMessage.java
deleted file mode 100644
index c36e722..0000000
--- a/src/main/java/org/gnunet/voting/messages/QueryResultResponseMessage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.gnunet.voting.messages;
-
-
-public class QueryResultResponseMessage {
-}
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
index 6547a05..afd54b9 100644
--- a/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
@@ -1,12 +1,19 @@
 package org.gnunet.voting.messages;
 
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
 import org.gnunet.construct.ZeroTerminatedString;
 import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
 
 /**
  * Message send by the voter to the election authority to submit a vote.
  */
+@UnionCase(42007)
 public class SubmitMessage implements GnunetMessage.Body {
-    @ZeroTerminatedString
-    public String ballot;
+    @NestedMessage
+    public HashCode ballotGuid;
+    @UInt32
+    public int choiceId;
 }
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitResponseMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitResponseMessage.java
index 76dcac8..956ecf2 100644
--- a/src/main/java/org/gnunet/voting/messages/SubmitResponseMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/SubmitResponseMessage.java
@@ -1,5 +1,9 @@
 package org.gnunet.voting.messages;
 
 
-public class SubmitResponseMessage {
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(42008)
+public class SubmitResponseMessage implements GnunetMessage.Body {
 }