diff --git a/kube/client/client.go b/kube/client/client.go
index 6c4d6eb0..0b9a241b 100644
--- a/kube/client/client.go
+++ b/kube/client/client.go
@@ -22,6 +22,8 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"net/http"
+	"os"
 	"time"
 
 	"github.com/docker/compose-cli/api/compose"
@@ -31,12 +33,16 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/portforward"
+	"k8s.io/client-go/transport/spdy"
 )
 
 // KubeClient API to access kube objects
 type KubeClient struct {
 	client    *kubernetes.Clientset
 	namespace string
+	config    *rest.Config
 }
 
 // NewKubeClient new kubernetes client
@@ -59,6 +65,7 @@ func NewKubeClient(config genericclioptions.RESTClientGetter) (*KubeClient, erro
 	return &KubeClient{
 		client:    clientset,
 		namespace: namespace,
+		config:    restConfig,
 	}, nil
 }
 
@@ -161,3 +168,37 @@ func (kc KubeClient) WaitForPodState(ctx context.Context, opts WaitForStatusOpti
 	}
 	return nil
 }
+
+func (kc KubeClient) MapPorts(ctx context.Context, opts PortMappingOptions) error {
+
+	stopChannel := make(chan struct{}, 1)
+	readyChannel := make(chan struct{})
+
+	eg, ctx := errgroup.WithContext(ctx)
+	for serviceName, servicePorts := range opts.Services {
+		serviceName = serviceName
+		servicePorts = servicePorts
+		eg.Go(func() error {
+
+			req := kc.client.RESTClient().Post().Resource("services").Namespace(kc.namespace).Name(serviceName).SubResource("portforward")
+			transport, upgrader, err := spdy.RoundTripperFor(kc.config)
+			if err != nil {
+				return err
+			}
+
+			ports := []string{}
+			for _, p := range servicePorts {
+				ports = append(ports, fmt.Sprintf("%d:%d", p.PublishedPort, p.TargetPort))
+			}
+			//println(req.URL().String())
+			//os.Exit(0)
+			dialer := spdy.NewDialer(upgrader, &http.Client{Transport: transport}, "POST", req.URL())
+			fw, err := portforward.New(dialer, ports, stopChannel, readyChannel, os.Stdout, os.Stderr)
+			if err != nil {
+				return err
+			}
+			return fw.ForwardPorts()
+		})
+	}
+	return eg.Wait()
+}
diff --git a/kube/client/utils.go b/kube/client/utils.go
index 4368dc7a..c6d7ec64 100644
--- a/kube/client/utils.go
+++ b/kube/client/utils.go
@@ -98,3 +98,10 @@ type WaitForStatusOptions struct {
 	Timeout     *time.Duration
 	Log         LogFunc
 }
+
+type Ports []compose.PortPublisher
+
+type PortMappingOptions struct {
+	ProjectName string
+	Services    map[string]Ports
+}
diff --git a/kube/compose.go b/kube/compose.go
index d998915a..c3c5974d 100644
--- a/kube/compose.go
+++ b/kube/compose.go
@@ -110,7 +110,7 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options
 
 	w.Event(progress.NewEvent(eventName, progress.Done, ""))
 
-	return s.client.WaitForPodState(ctx, client.WaitForStatusOptions{
+	err = s.client.WaitForPodState(ctx, client.WaitForStatusOptions{
 		ProjectName: project.Name,
 		Services:    project.ServiceNames(),
 		Status:      compose.RUNNING,
@@ -122,6 +122,36 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options
 			w.Event(progress.NewEvent(pod, state, message))
 		},
 	})
+	return err
+	/*
+		if err != nil {
+			return err
+		}
+
+		// check if there is a port mapping
+		services := map[string]client.Ports{}
+
+		for _, s := range project.Services {
+			if len(s.Ports) > 0 {
+				services[s.Name] = client.Ports{}
+				for _, p := range s.Ports {
+					services[s.Name] = append(services[s.Name], compose.PortPublisher{
+						TargetPort:    int(p.Target),
+						PublishedPort: int(p.Published),
+						Protocol:      p.Protocol,
+					})
+				}
+			}
+		}
+		if len(services) > 0 {
+			return s.client.MapPorts(ctx, client.PortMappingOptions{
+				ProjectName: project.Name,
+				Services:    services,
+			})
+		}
+		return nil
+	*/
+
 }
 
 // Down executes the equivalent to a `compose down`