diff --git a/branches/follower/wiz810mj/src/demo/WizDemo4/WizDemo4.pde b/branches/follower/wiz810mj/src/demo/WizDemo4/WizDemo4.pde
index aec5081..47d41fb 100644
--- a/branches/follower/wiz810mj/src/demo/WizDemo4/WizDemo4.pde
+++ b/branches/follower/wiz810mj/src/demo/WizDemo4/WizDemo4.pde
@@ -414,6 +414,11 @@ NetworkConnection NetworkInterface::listen(uint16_t port) {
 
 /* ----- EchoServer ------ */
 
+#define ECHO_CONNECT_WAIT 0
+#define ECHO_CONNECTED 1
+#define ECHO_CLOSE 2
+#define ECHO_HALT 3
+
 class EchoServer {
   
   public:
@@ -421,12 +426,17 @@ class EchoServer {
     
   private:
     NetworkConnection _connection; // TODO: Make public?
+    int _state;
 };
 
 EchoServer::EchoServer(int port) : _connection (NetworkConnection(port)) {
   /*
   
    */
+
+  _state = ECHO_CONNECT_WAIT;
+
+  _connection.listen(); // TODO: We should be using Network.listen(...) here and in initialisation list.
 }