diff --git a/apps/app-runner/server.go b/apps/app-runner/server.go
index 83bcac4..1661731 100644
--- a/apps/app-runner/server.go
+++ b/apps/app-runner/server.go
@@ -17,11 +17,25 @@
 	"golang.org/x/crypto/ssh"
 )
 
+type CommandState string
+
+type CommandStatus struct {
+	Command string       `json:"command"`
+	State   CommandState `json:"state"`
+}
+
+type Status struct {
+	RepoOK   bool            `json:"repoOK"`
+	Commit   string          `json:"commit"`
+	Commands []CommandStatus `json:"commands"`
+}
+
 type Server struct {
 	l           sync.Locker
 	port        int
 	appId       string
 	service     string
+	id          string
 	ready       bool
 	cmd         *exec.Cmd
 	repoAddr    string
@@ -34,15 +48,17 @@
 	managerAddr string
 	logs        *Log
 	currDir     string
+	status      *Status
 }
 
-func NewServer(port int, appId, service, repoAddr, branch, rootDir string, signer ssh.Signer, appDir string, runCommands []Command, self string, manager string) *Server {
+func NewServer(port int, appId, service, id, repoAddr, branch, rootDir string, signer ssh.Signer, appDir string, runCommands []Command, self string, manager string) *Server {
 	return &Server{
 		l:           &sync.Mutex{},
 		port:        port,
 		ready:       false,
 		appId:       appId,
 		service:     service,
+		id:          id,
 		repoAddr:    repoAddr,
 		branch:      branch,
 		rootDir:     rootDir,
@@ -53,6 +69,7 @@
 		managerAddr: manager,
 		logs:        &Log{},
 		currDir:     "",
+		status:      nil,
 	}
 }
 
@@ -102,23 +119,45 @@
 	if err != nil {
 		return err
 	}
-	if err := CloneRepositoryBranch(s.repoAddr, s.branch, s.rootDir, s.signer, newDir); err != nil {
+	commit, err := CloneRepositoryBranch(s.repoAddr, s.branch, s.rootDir, s.signer, newDir)
+	if err != nil {
+		s.status = &Status{
+			RepoOK: false,
+		}
 		return err
 	}
-	logM := io.MultiWriter(os.Stdout, s.logs)
-	for i, c := range s.runCommands {
+	s.status = &Status{
+		RepoOK:   true,
+		Commit:   commit,
+		Commands: []CommandStatus{},
+	}
+	commands := []string{}
+	for _, c := range s.runCommands {
 		args := []string{c.Bin}
 		args = append(args, c.Args...)
+		cmd := strings.Join(args, " ")
+		commands = append(commands, cmd)
+		s.status.Commands = append(s.status.Commands, CommandStatus{
+			Command: cmd,
+			State:   "waiting",
+		})
+	}
+	logM := io.MultiWriter(os.Stdout, s.logs)
+	for i, c := range commands {
+		if i > 0 {
+			s.status.Commands[i-1].State = "success"
+		}
 		cmd := &exec.Cmd{
 			Dir:    filepath.Join(newDir, s.rootDir),
 			Path:   "/bin/sh",
-			Args:   []string{"/bin/sh", "-c", strings.Join(args, " ")},
-			Env:    append(os.Environ(), c.Env...),
+			Args:   []string{"/bin/sh", "-c", c},
+			Env:    append(os.Environ(), s.runCommands[i].Env...),
 			Stdout: logM,
 			Stderr: logM,
 		}
 		cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
-		fmt.Printf("Running: %s %s\n", c.Bin, c.Args)
+		fmt.Printf("Running: %s\n", c)
+		s.status.Commands[i].State = "running"
 		if i < len(s.runCommands)-1 {
 			if err := cmd.Run(); err != nil {
 				return err
@@ -129,8 +168,10 @@
 				if err := s.kill(); err != nil {
 					return err
 				}
-				if err := os.RemoveAll(s.currDir); err != nil {
-					return err
+				if s.currDir != "" {
+					if err := os.RemoveAll(s.currDir); err != nil {
+						return err
+					}
 				}
 			}
 			if err := cmd.Start(); err != nil {
@@ -144,9 +185,11 @@
 }
 
 type pingReq struct {
-	Service string `json:"service"`
-	Address string `json:"address"`
-	Logs    string `json:"logs"`
+	Id      string  `json:"id"`
+	Service string  `json:"service"`
+	Address string  `json:"address"`
+	Status  *Status `json:"status,omitempty"`
+	Logs    string  `json:"logs"`
 }
 
 func (s *Server) pingManager() {
@@ -157,8 +200,10 @@
 		}()
 	}()
 	buf, err := json.Marshal(pingReq{
+		Id:      s.id,
 		Service: s.service,
 		Address: fmt.Sprintf("http://%s:%d", s.self, s.port),
+		Status:  s.status,
 		Logs:    s.logs.Contents(),
 	})
 	if err != nil {