diff --git a/core/src/main/groovy/com/muwire/core/connection/I2PAcceptor.groovy b/core/src/main/groovy/com/muwire/core/connection/I2PAcceptor.groovy
index c3b15b7b..6e4bc21d 100644
--- a/core/src/main/groovy/com/muwire/core/connection/I2PAcceptor.groovy
+++ b/core/src/main/groovy/com/muwire/core/connection/I2PAcceptor.groovy
@@ -1,19 +1,22 @@
 package com.muwire.core.connection
 
+import net.i2p.client.streaming.I2PServerSocket
 import net.i2p.client.streaming.I2PSocketManager
 
 class I2PAcceptor {
 
 	final I2PSocketManager socketManager
+	final I2PServerSocket serverSocket
 	
 	I2PAcceptor() {}
 	
 	I2PAcceptor(I2PSocketManager socketManager) {
 		this.socketManager = socketManager
+		this.serverSocket = socketManager.getServerSocket()
 	}
 	
 	Endpoint accept() {
-		// TODO implement
-		null
+		def socket = serverSocket.accept()
+		new Endpoint(socket.getPeerDestination(), socket.getInputStream(), socket.getOutputStream())
 	}
 }
diff --git a/core/src/main/groovy/com/muwire/core/connection/I2PConnector.groovy b/core/src/main/groovy/com/muwire/core/connection/I2PConnector.groovy
index 928df39c..0b5c6004 100644
--- a/core/src/main/groovy/com/muwire/core/connection/I2PConnector.groovy
+++ b/core/src/main/groovy/com/muwire/core/connection/I2PConnector.groovy
@@ -14,8 +14,8 @@ class I2PConnector {
 	}
 	
 	Endpoint connect(Destination dest) {
-		//TODO implement
-		null
+		def socket = socketManager.connect(dest)
+		new Endpoint(dest, socket.getInputStream(), socket.getOutputStream())
 	}
 
 }