diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go
index 8d7304fda..da484fbfe 100644
--- a/client/driver/executor/executor.go
+++ b/client/driver/executor/executor.go
@@ -15,7 +15,9 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-multierror"
+	"github.com/mitchellh/go-ps"
 	cgroupConfig "github.com/opencontainers/runc/libcontainer/configs"
+	"github.com/shirou/gopsutil/process"
 
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/consul"
@@ -146,6 +148,7 @@ type UniversalExecutor struct {
 	ctx     *ExecutorContext
 	command *ExecCommand
 
+	pids          []int
 	taskDir       string
 	exitState     *ProcessState
 	processExited chan interface{}
@@ -251,6 +254,7 @@ func (e *UniversalExecutor) LaunchCmd(command *ExecCommand, ctx *ExecutorContext
 	if err := e.cmd.Start(); err != nil {
 		return nil, err
 	}
+	go e.collectPids()
 	go e.wait()
 	ic := &cstructs.IsolationConfig{Cgroup: e.groups, CgroupPaths: e.cgPaths}
 	return &ProcessState{Pid: e.cmd.Process.Pid, ExitCode: -1, IsolationConfig: ic, Time: time.Now()}, nil
@@ -619,3 +623,104 @@ func (e *UniversalExecutor) interpolateServices(task *structs.Task) {
 		service.Tags = e.ctx.TaskEnv.ParseAndReplace(service.Tags)
 	}
 }
+
+func (e *UniversalExecutor) collectPids() {
+	for {
+		timer := time.NewTimer(5 * time.Second)
+		select {
+		case <-timer.C:
+			pids, err := e.getAllPids()
+			e.logger.Printf("DIPTANU PIDS %#v", pids)
+			timer.Reset(5 * time.Second)
+			if err != nil {
+				e.logger.Printf("[DEBUG] executor: error collecting pids: %v", err)
+			}
+			e.pids = pids
+		case <-e.processExited:
+			timer.Stop()
+			return
+		}
+	}
+}
+
+func (e *UniversalExecutor) scanPids() ([]int, error) {
+	processFamily := make(map[int]struct{})
+	processFamily[os.Getpid()] = struct{}{}
+	pids, err := ps.Processes()
+	if err != nil {
+		return nil, err
+	}
+	for _, pid := range pids {
+		_, parentPid := processFamily[pid.Pid()]
+		_, childPid := processFamily[pid.PPid()]
+		if parentPid || childPid {
+			processFamily[pid.Pid()] = struct{}{}
+		}
+	}
+	res := make([]int, 0, len(processFamily))
+	for pid := range processFamily {
+		res = append(res, pid)
+	}
+	return res, nil
+}
+
+func (e *UniversalExecutor) resourceUsagePids() (*cstructs.TaskResourceUsage, error) {
+	resourceUsage := make(map[int]*cstructs.TaskResourceUsage)
+	ts := time.Now()
+	for _, pid := range e.pids {
+		p, err := process.NewProcess(int32(pid))
+		if err != nil {
+			e.logger.Printf("[DEBUG] executor: unable to create new process with pid: %v", pid)
+		}
+		memInfo, err := p.MemoryInfo()
+		if err != nil {
+			e.logger.Printf("[DEBUG] executor: unable to get memory stats for process: %v", pid)
+		}
+		cpuStats, err := p.Times()
+		if err != nil {
+			e.logger.Printf("[DEBUG] executor: unable to get cpu stats for process: %v", pid)
+		}
+		ms := &cstructs.MemoryStats{
+			RSS:  memInfo.RSS,
+			Swap: memInfo.Swap,
+		}
+
+		percent, _ := p.Percent(0)
+		cs := &cstructs.CpuUsage{
+			SystemMode: cpuStats.System,
+			UserMode:   cpuStats.User,
+			Percent:    percent,
+		}
+		resourceUsage[pid] = &cstructs.TaskResourceUsage{MemoryStats: ms, CpuStats: cs, Timestamp: ts}
+
+	}
+
+	var (
+		systemModeCPU, userModeCPU, percent float64
+
+		totalRSS, totalSwap uint64
+	)
+
+	for _, rs := range resourceUsage {
+		systemModeCPU += rs.CpuStats.SystemMode
+		userModeCPU += rs.CpuStats.UserMode
+		percent += rs.CpuStats.Percent
+
+		totalRSS += rs.MemoryStats.RSS
+		totalSwap += rs.MemoryStats.Swap
+	}
+
+	totalCPU := &cstructs.CpuUsage{
+		SystemMode: systemModeCPU,
+		UserMode:   userModeCPU,
+		Percent:    percent,
+	}
+
+	totalMemory := &cstructs.MemoryStats{
+		RSS:  totalRSS,
+		Swap: totalSwap,
+	}
+
+	return &cstructs.TaskResourceUsage{MemoryStats: totalMemory, CpuStats: totalCPU}, nil
+
+}
diff --git a/client/driver/executor/executor_basic.go b/client/driver/executor/executor_basic.go
index 65558aa91..cb87f0301 100644
--- a/client/driver/executor/executor_basic.go
+++ b/client/driver/executor/executor_basic.go
@@ -32,5 +32,9 @@ func (e *UniversalExecutor) configureIsolation() error {
 }
 
 func (e *UniversalExecutor) Stats() (*cstructs.TaskResourceUsage, error) {
-	return nil, nil
+	return e.resourceUsagePids()
+}
+
+func (e *UniversalExecutor) getAllPids() ([]int, error) {
+	return e.scanPids()
 }
diff --git a/client/driver/executor/executor_linux.go b/client/driver/executor/executor_linux.go
index a2b8a593a..513c6e2ea 100644
--- a/client/driver/executor/executor_linux.go
+++ b/client/driver/executor/executor_linux.go
@@ -126,6 +126,9 @@ func (e *UniversalExecutor) configureCgroups(resources *structs.Resources) error
 
 // Stats reports the resource utilization of the cgroup
 func (e *UniversalExecutor) Stats() (*cstructs.TaskResourceUsage, error) {
+	if !e.command.ResourceLimits {
+		return e.resourceUsagePids()
+	}
 	manager := getCgroupManager(e.groups, e.cgPaths)
 	stats, err := manager.GetStats()
 	if err != nil {
@@ -154,8 +157,8 @@ func (e *UniversalExecutor) Stats() (*cstructs.TaskResourceUsage, error) {
 	kmTicks := (kernelModeTime * clockTicks) / nanosecondsInSecond
 
 	cs := &cstructs.CpuUsage{
-		SystemMode:       kmTicks,
-		UserMode:         umTicks,
+		SystemMode:       float64(kmTicks),
+		UserMode:         float64(umTicks),
 		ThrottledPeriods: stats.CpuStats.ThrottlingData.ThrottledPeriods,
 		ThrottledTime:    stats.CpuStats.ThrottlingData.ThrottledTime,
 	}
@@ -232,6 +235,14 @@ func (e *UniversalExecutor) removeChrootMounts() error {
 	return e.ctx.AllocDir.UnmountAll()
 }
 
+func (e *UniversalExecutor) getAllPids() ([]int, error) {
+	if e.command.ResourceLimits {
+		manager := getCgroupManager(e.groups, e.cgPaths)
+		return manager.GetAllPids()
+	}
+	return e.scanPids()
+}
+
 // destroyCgroup kills all processes in the cgroup and removes the cgroup
 // configuration from the host. This function is idempotent.
 func DestroyCgroup(groups *cgroupConfig.Cgroup, cgPaths map[string]string, executorPid int) error {
diff --git a/client/driver/structs/structs.go b/client/driver/structs/structs.go
index 89e0ed40b..2550e281d 100644
--- a/client/driver/structs/structs.go
+++ b/client/driver/structs/structs.go
@@ -95,10 +95,11 @@ type MemoryStats struct {
 }
 
 type CpuUsage struct {
-	SystemMode       uint64
-	UserMode         uint64
+	SystemMode       float64
+	UserMode         float64
 	ThrottledPeriods uint64
 	ThrottledTime    uint64
+	Percent          float64
 }
 
 type TaskResourceUsage struct {