diff --git a/matsim/JPSclient.cpp b/matsim/JPSclient.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5df7dd854e719db1be8a84d38962e1cda44827ac
--- /dev/null
+++ b/matsim/JPSclient.cpp
@@ -0,0 +1,20 @@
+/*
+ * JPSclient.cpp
+ *
+ *  Created on: Apr 21, 2015
+ *      Author: piccolo
+ */
+
+#include "JPSclient.h"
+
+JPSclient::JPSclient()
+{
+     // TODO Auto-generated constructor stub
+
+}
+
+JPSclient::~JPSclient()
+{
+     // TODO Auto-generated destructor stub
+}
+
diff --git a/matsim/JPSclient.h b/matsim/JPSclient.h
new file mode 100644
index 0000000000000000000000000000000000000000..390e044600e8698a43693cb8b82b6d37143a57b2
--- /dev/null
+++ b/matsim/JPSclient.h
@@ -0,0 +1,37 @@
+/*
+ * JPSclient.h
+ *
+ *  Created on: Apr 21, 2015
+ *      Author: piccolo
+ */
+
+#ifndef MATSIM_JPSCLIENT_H_
+#define MATSIM_JPSCLIENT_H_
+
+
+#include <grpc/grpc.h>
+#include <grpc++/server.h>
+#include <grpc++/server_builder.h>
+#include <grpc++/server_context.h>
+#include <grpc++/server_credentials.h>
+#include <grpc++/status.h>
+#include "MATSimInterface.grpc.pb.h"
+
+using grpc::Server;
+using grpc::ServerBuilder;
+using grpc::ServerContext;
+using grpc::Status;
+//using helloworld::HelloRequest;
+//using helloworld::HelloReply;
+//using helloworld::Greeter;
+using namespace hybrid;
+
+
+class JPSclient
+{
+public:
+     JPSclient();
+     virtual ~JPSclient();
+};
+
+#endif /* MATSIM_JPSCLIENT_H_ */
diff --git a/matsim/JPSserver.cpp b/matsim/JPSserver.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..029da6f3b65b5e844752a4981a3209ac8893acb3
--- /dev/null
+++ b/matsim/JPSserver.cpp
@@ -0,0 +1,47 @@
+/*
+ * JPSserver.cpp
+ *
+ *  Created on: Apr 21, 2015
+ *      Author: piccolo
+ */
+
+#include "JPSserver.h"
+
+JPSserver::JPSserver()
+{
+     // TODO Auto-generated constructor stub
+
+}
+
+JPSserver::~JPSserver()
+{
+     // TODO Auto-generated destructor stub
+}
+
+Status JPSserver::reqMATSim2ExternHasSpace(ServerContext* context,
+          const MATSim2ExternHasSpace* request,
+          MATSim2ExternHasSpaceConfirmed* response)
+{
+}
+
+Status JPSserver::reqMATSim2ExternPutAgent(ServerContext* context,
+          const MATSim2ExternPutAgent* request,
+          MATSim2ExternPutAgentConfirmed* response)
+{
+}
+
+Status JPSserver::reqExternDoSimStep(ServerContext* context,
+          const ExternDoSimStep* request, ExternDoSimStepReceived* response)
+{
+}
+
+Status JPSserver::reqExternOnPrepareSim(ServerContext* context,
+          const ExternOnPrepareSim* request,
+          ExternOnPrepareSimConfirmed* response)
+{
+}
+
+Status JPSserver::reqExternAfterSim(ServerContext* context,
+          const ExternAfterSim* request, ExternAfterSimConfirmed* response)
+{
+}
diff --git a/matsim/JPSserver.h b/matsim/JPSserver.h
new file mode 100644
index 0000000000000000000000000000000000000000..53ab2c69e9e970f17a5dcbe901206caec9dc64af
--- /dev/null
+++ b/matsim/JPSserver.h
@@ -0,0 +1,40 @@
+/*
+ * JPSserver.h
+ *
+ *  Created on: Apr 21, 2015
+ *      Author: piccolo
+ */
+
+#ifndef MATSIM_JPSSERVER_H_
+#define MATSIM_JPSSERVER_H_
+
+#include <grpc/grpc.h>
+#include <grpc++/server.h>
+#include <grpc++/server_builder.h>
+#include <grpc++/server_context.h>
+#include <grpc++/server_credentials.h>
+#include <grpc++/status.h>
+#include "MATSimInterface.grpc.pb.h"
+
+using grpc::Server;
+using grpc::ServerBuilder;
+using grpc::ServerContext;
+using grpc::Status;
+//using helloworld::HelloRequest;
+//using helloworld::HelloReply;
+//using helloworld::Greeter;
+using namespace hybrid;
+
+class JPSserver final : public ExternInterfaceService::Service
+{
+public:
+     JPSserver();
+     virtual ~JPSserver();
+     virtual Status reqMATSim2ExternHasSpace(ServerContext* context, const MATSim2ExternHasSpace* request, MATSim2ExternHasSpaceConfirmed* response);
+     virtual Status reqMATSim2ExternPutAgent(ServerContext* context, const MATSim2ExternPutAgent* request, MATSim2ExternPutAgentConfirmed* response);
+     virtual Status reqExternDoSimStep(ServerContext* context, const ExternDoSimStep* request, ExternDoSimStepReceived* response);
+     virtual Status reqExternOnPrepareSim(ServerContext* context, const ExternOnPrepareSim* request, ExternOnPrepareSimConfirmed* response);
+     virtual Status reqExternAfterSim(ServerContext* context, const ExternAfterSim* request, ExternAfterSimConfirmed* response);
+};
+
+#endif /* MATSIM_JPSSERVER_H_ */