diff --git a/internal/pkg/proxy/nem_grpc_server.go b/internal/pkg/proxy/nem_grpc_server.go
new file mode 100644
index 0000000..75ef634
--- /dev/null
+++ b/internal/pkg/proxy/nem_grpc_server.go
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Implements a server for nem-ondemand-proxy
+package proxy
+
+import (
+	"context"
+	"github.com/opencord/nem-ondemand-proxy/protos/nem_ondemand_api"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/reflection"
+	"log"
+	"net"
+)
+
+//server is used to implement the grpc server for the proxy
+type server struct {
+	handler    *OnDemandHandler
+	grpcServer *grpc.Server
+}
+
+func NewOnDemandServer(handler *OnDemandHandler) *server {
+	s := &server{}
+
+	s.grpcServer = grpc.NewServer()
+	s.handler = handler
+
+	nem_ondemand_api.RegisterNemServiceServer(s.grpcServer, s)
+	reflection.Register(s.grpcServer)
+
+	return s
+}
+
+func (s *server) StartServing() error {
+	lis, err := net.Listen("tcp", GlobalConfig.Local)
+	if err != nil {
+		log.Fatalf("failed to listen: %v", err)
+	}
+
+	if err := s.grpcServer.Serve(lis); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s *server) OmciTest(ctx context.Context, id *nem_ondemand_api.OnuID) (*nem_ondemand_api.ResponseTest, error) {
+	log.Printf("Request Received from operator client: %s", id.Id)
+	resp, err := s.handler.HandleRequest(&id.Id)
+	if err != nil {
+		log.Printf("%s", err)
+		return nil, err
+	}
+	log.Printf("Result received from voltha-grpc-client: %s", resp.String())
+	if len(resp.String()) > 0 {
+		return &nem_ondemand_api.ResponseTest{Result: resp.String()}, nil
+	}
+	return &nem_ondemand_api.ResponseTest{Result: "FAILURE"}, nil
+}