diff --git a/internal/cpugroup/cpugroup.go b/internal/cpugroup/cpugroup.go
index ab3b757efb..61cd703586 100644
--- a/internal/cpugroup/cpugroup.go
+++ b/internal/cpugroup/cpugroup.go
@@ -53,9 +53,8 @@ func Create(ctx context.Context, id string, logicalProcessors []uint32) error {
 	return nil
 }
 
-// getCPUGroupConfig finds the cpugroup config information for group with `id`
-//nolint:unused
-func getCPUGroupConfig(ctx context.Context, id string) (*hcsschema.CpuGroupConfig, error) {
+// GetCPUGroupConfig finds the cpugroup config information for group with `id`
+func GetCPUGroupConfig(ctx context.Context, id string) (*hcsschema.CpuGroupConfig, error) {
 	query := hcsschema.PropertyQuery{
 		PropertyTypes: []hcsschema.PropertyType{hcsschema.PTCPUGroup},
 	}
diff --git a/internal/cpugroup/cpugroup_test.go b/internal/cpugroup/cpugroup_test.go
index 07af7894f8..13cd3c83ac 100644
--- a/internal/cpugroup/cpugroup_test.go
+++ b/internal/cpugroup/cpugroup_test.go
@@ -31,7 +31,7 @@ func TestCPUGroupCreateWithIDAndDelete(t *testing.T) {
 		}
 	}()
 
-	_, err = getCPUGroupConfig(ctx, id.String())
+	_, err = GetCPUGroupConfig(ctx, id.String())
 	if err != nil {
 		t.Fatalf("failed to find cpugroup on host with: %v", err)
 	}
diff --git a/internal/hcs/schema2/cpu_group_config.go b/internal/hcs/schema2/cpu_group_config.go
index f1a28cd389..0be0475d41 100644
--- a/internal/hcs/schema2/cpu_group_config.go
+++ b/internal/hcs/schema2/cpu_group_config.go
@@ -14,5 +14,5 @@ type CpuGroupConfig struct {
 	Affinity        *CpuGroupAffinity  `json:"Affinity,omitempty"`
 	GroupProperties []CpuGroupProperty `json:"GroupProperties,omitempty"`
 	// Hypervisor CPU group IDs exposed to clients
-	HypervisorGroupId int32 `json:"HypervisorGroupId,omitempty"`
+	HypervisorGroupId uint64 `json:"HypervisorGroupId,omitempty"`
 }
diff --git a/internal/vm/builder.go b/internal/vm/builder.go
index 4be3eee296..288daad76a 100644
--- a/internal/vm/builder.go
+++ b/internal/vm/builder.go
@@ -67,7 +67,7 @@ type StorageQosManager interface {
 // WindowsConfigManager manages options specific to a Windows host (cpugroups etc.)
 type WindowsConfigManager interface {
 	// SetCPUGroup sets the CPU group that the Utility VM will belong to on a Windows host.
-	SetCPUGroup(id string) error
+	SetCPUGroup(ctx context.Context, id string) error
 }
 
 // LinuxConfigManager manages options specific to a Linux host.
diff --git a/internal/vm/hcs/builder.go b/internal/vm/hcs/builder.go
index f37a0f08b8..676e114bf6 100644
--- a/internal/vm/hcs/builder.go
+++ b/internal/vm/hcs/builder.go
@@ -10,6 +10,8 @@ import (
 	"github.com/pkg/errors"
 )
 
+var _ vm.UVMBuilder = &utilityVMBuilder{}
+
 type utilityVMBuilder struct {
 	id      string
 	guestOS vm.GuestOS
@@ -81,7 +83,6 @@ func (uvmb *utilityVMBuilder) Create(ctx context.Context) (_ vm.UVM, err error)
 		guestOS:     uvmb.guestOS,
 		cs:          cs,
 		backingType: backingType,
-		state:       vm.StateCreated,
 	}
 
 	properties, err := cs.Properties(ctx)
diff --git a/internal/vm/hcs/hcs.go b/internal/vm/hcs/hcs.go
index 67c44a95d9..1c7f337304 100644
--- a/internal/vm/hcs/hcs.go
+++ b/internal/vm/hcs/hcs.go
@@ -12,9 +12,10 @@ import (
 	"golang.org/x/sys/windows"
 )
 
+var _ vm.UVM = &utilityVM{}
+
 type utilityVM struct {
 	id           string
-	state        vm.State
 	guestOS      vm.GuestOS
 	cs           *hcs.System
 	backingType  vm.MemoryBackingType
diff --git a/internal/vm/hcs/windows.go b/internal/vm/hcs/windows.go
index 029c71d417..e4775b0528 100644
--- a/internal/vm/hcs/windows.go
+++ b/internal/vm/hcs/windows.go
@@ -1,10 +1,12 @@
 package hcs
 
 import (
+	"context"
+
 	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
 )
 
-func (uvmb *utilityVMBuilder) SetCPUGroup(id string) error {
+func (uvmb *utilityVMBuilder) SetCPUGroup(ctx context.Context, id string) error {
 	uvmb.doc.VirtualMachine.ComputeTopology.Processor.CpuGroup = &hcsschema.CpuGroup{Id: id}
 	return nil
 }
diff --git a/internal/vm/remotevm/boot.go b/internal/vm/remotevm/boot.go
new file mode 100644
index 0000000000..9f170033b1
--- /dev/null
+++ b/internal/vm/remotevm/boot.go
@@ -0,0 +1,27 @@
+package remotevm
+
+import (
+	"github.com/Microsoft/hcsshim/internal/vmservice"
+)
+
+func (uvmb *utilityVMBuilder) SetLinuxKernelDirectBoot(kernel, initRD, cmd string) error {
+	uvmb.config.BootConfig = &vmservice.VMConfig_DirectBoot{
+		DirectBoot: &vmservice.DirectBoot{
+			KernelPath:    kernel,
+			InitrdPath:    initRD,
+			KernelCmdline: cmd,
+		},
+	}
+	return nil
+}
+
+func (uvmb *utilityVMBuilder) SetUEFIBoot(firmware, devPath, args string) error {
+	uvmb.config.BootConfig = &vmservice.VMConfig_Uefi{
+		Uefi: &vmservice.UEFI{
+			FirmwarePath: firmware,
+			DevicePath:   devPath,
+			OptionalData: args,
+		},
+	}
+	return nil
+}
diff --git a/internal/vm/remotevm/builder.go b/internal/vm/remotevm/builder.go
new file mode 100644
index 0000000000..b289428044
--- /dev/null
+++ b/internal/vm/remotevm/builder.go
@@ -0,0 +1,109 @@
+package remotevm
+
+import (
+	"context"
+	"io"
+	"io/ioutil"
+	"net"
+	"os/exec"
+
+	"github.com/Microsoft/hcsshim/internal/jobobject"
+	"github.com/Microsoft/hcsshim/internal/log"
+	"github.com/Microsoft/hcsshim/internal/vm"
+	"github.com/Microsoft/hcsshim/internal/vmservice"
+	"github.com/containerd/ttrpc"
+	ptypes "github.com/gogo/protobuf/types"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+)
+
+var _ vm.UVMBuilder = &utilityVMBuilder{}
+
+type utilityVMBuilder struct {
+	id      string
+	guestOS vm.GuestOS
+	job     *jobobject.JobObject
+	config  *vmservice.VMConfig
+	client  vmservice.VMService
+}
+
+func NewUVMBuilder(ctx context.Context, id, owner, binPath, addr string, guestOS vm.GuestOS) (vm.UVMBuilder, error) {
+	var job *jobobject.JobObject
+	if binPath != "" {
+		log.G(ctx).WithFields(logrus.Fields{
+			"binary":  binPath,
+			"address": addr,
+		}).Debug("starting remotevm server process")
+
+		opts := &jobobject.Options{
+			Name: id,
+		}
+		job, err := jobobject.Create(ctx, opts)
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to create job object for remotevm process")
+		}
+
+		cmd := exec.Command(binPath, "--ttrpc", addr)
+		p, err := cmd.StdoutPipe()
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to create stdout pipe")
+		}
+
+		if err := cmd.Start(); err != nil {
+			return nil, errors.Wrap(err, "failed to start remotevm server process")
+		}
+
+		if err := job.Assign(uint32(cmd.Process.Pid)); err != nil {
+			return nil, errors.Wrap(err, "failed to assign remotevm process to job")
+		}
+
+		if err := job.SetTerminateOnLastHandleClose(); err != nil {
+			return nil, errors.Wrap(err, "failed to set terminate on last handle closed for remotevm job object")
+		}
+
+		// Wait for stdout to close. This is our signal that the server is successfully up and running.
+		_, _ = io.Copy(ioutil.Discard, p)
+	}
+
+	conn, err := net.Dial("unix", addr)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to dial remotevm address %q", addr)
+	}
+
+	c := ttrpc.NewClient(conn, ttrpc.WithOnClose(func() { conn.Close() }))
+	vmClient := vmservice.NewVMClient(c)
+
+	return &utilityVMBuilder{
+		id:      id,
+		guestOS: guestOS,
+		config: &vmservice.VMConfig{
+			MemoryConfig:    &vmservice.MemoryConfig{},
+			DevicesConfig:   &vmservice.DevicesConfig{},
+			ProcessorConfig: &vmservice.ProcessorConfig{},
+			SerialConfig:    &vmservice.SerialConfig{},
+			ExtraData:       make(map[string]string),
+		},
+		job:    job,
+		client: vmClient,
+	}, nil
+}
+
+func (uvmb *utilityVMBuilder) Create(ctx context.Context) (vm.UVM, error) {
+	// Grab what capabilities the virtstack supports up front.
+	capabilities, err := uvmb.client.CapabilitiesVM(ctx, &ptypes.Empty{})
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get virtstack capabilities from vmservice")
+	}
+
+	if _, err := uvmb.client.CreateVM(ctx, &vmservice.CreateVMRequest{Config: uvmb.config, LogID: uvmb.id}); err != nil {
+		return nil, errors.Wrap(err, "failed to create remote VM")
+	}
+
+	return &utilityVM{
+		id:           uvmb.id,
+		job:          uvmb.job,
+		config:       uvmb.config,
+		client:       uvmb.client,
+		capabilities: capabilities,
+	}, nil
+}
diff --git a/internal/vm/remotevm/memory.go b/internal/vm/remotevm/memory.go
new file mode 100644
index 0000000000..f0933cfc4e
--- /dev/null
+++ b/internal/vm/remotevm/memory.go
@@ -0,0 +1,36 @@
+package remotevm
+
+import (
+	"github.com/Microsoft/hcsshim/internal/vm"
+	"github.com/Microsoft/hcsshim/internal/vmservice"
+)
+
+func (uvmb *utilityVMBuilder) SetMemoryLimit(memoryMB uint64) error {
+	if uvmb.config.MemoryConfig == nil {
+		uvmb.config.MemoryConfig = &vmservice.MemoryConfig{}
+	}
+	uvmb.config.MemoryConfig.MemoryMb = memoryMB
+	return nil
+}
+
+func (uvmb *utilityVMBuilder) SetMemoryConfig(config *vm.MemoryConfig) error {
+	if uvmb.config.MemoryConfig == nil {
+		uvmb.config.MemoryConfig = &vmservice.MemoryConfig{}
+	}
+	uvmb.config.MemoryConfig.AllowOvercommit = config.BackingType == vm.MemoryBackingTypeVirtual
+	uvmb.config.MemoryConfig.ColdHint = config.ColdHint
+	uvmb.config.MemoryConfig.ColdDiscardHint = config.ColdDiscardHint
+	uvmb.config.MemoryConfig.DeferredCommit = config.DeferredCommit
+	uvmb.config.MemoryConfig.HotHint = config.HotHint
+	return vm.ErrNotSupported
+}
+
+func (uvmb *utilityVMBuilder) SetMMIOConfig(lowGapMB uint64, highBaseMB uint64, highGapMB uint64) error {
+	if uvmb.config.MemoryConfig == nil {
+		uvmb.config.MemoryConfig = &vmservice.MemoryConfig{}
+	}
+	uvmb.config.MemoryConfig.HighMmioBaseInMb = highBaseMB
+	uvmb.config.MemoryConfig.LowMmioGapInMb = lowGapMB
+	uvmb.config.MemoryConfig.HighMmioGapInMb = highGapMB
+	return nil
+}
diff --git a/internal/vm/remotevm/network.go b/internal/vm/remotevm/network.go
new file mode 100644
index 0000000000..ceddeb4752
--- /dev/null
+++ b/internal/vm/remotevm/network.go
@@ -0,0 +1,120 @@
+package remotevm
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/Microsoft/go-winio/pkg/guid"
+	"github.com/Microsoft/hcsshim/hcn"
+	"github.com/Microsoft/hcsshim/internal/vmservice"
+	"github.com/pkg/errors"
+)
+
+func getSwitchID(endpointID, portID string) (string, error) {
+	// Get updated endpoint with new fields (need switch ID)
+	ep, err := hcn.GetEndpointByID(endpointID)
+	if err != nil {
+		return "", errors.Wrapf(err, "failed to get endpoint %q", endpointID)
+	}
+
+	type ExtraInfo struct {
+		Allocators []struct {
+			SwitchId         string
+			EndpointPortGuid string
+		}
+	}
+
+	var exi ExtraInfo
+	if err := json.Unmarshal(ep.Health.Extra.Resources, &exi); err != nil {
+		return "", errors.Wrapf(err, "failed to unmarshal resource data from endpoint %q", endpointID)
+	}
+
+	if len(exi.Allocators) == 0 {
+		return "", errors.New("no resource data found for endpoint")
+	}
+
+	// NIC should only ever belong to one switch but there are cases where there's more than one allocator
+	// in the returned data. It seems they only ever contain empty strings so search for the first entry
+	// that actually contains a switch ID and that has the matching port GUID we made earlier.
+	var switchID string
+	for _, allocator := range exi.Allocators {
+		if allocator.SwitchId != "" && strings.ToLower(allocator.EndpointPortGuid) == portID {
+			switchID = allocator.SwitchId
+			break
+		}
+	}
+	return switchID, nil
+}
+
+func (uvm *utilityVM) AddNIC(ctx context.Context, nicID, endpointID, macAddr string) error {
+	portID, err := guid.NewV4()
+	if err != nil {
+		return errors.Wrap(err, "failed to generate guid for port")
+	}
+
+	vmEndpointRequest := hcn.VmEndpointRequest{
+		PortId:           portID,
+		VirtualNicName:   fmt.Sprintf("%s--%s", nicID, portID),
+		VirtualMachineId: guid.GUID{},
+	}
+
+	m, err := json.Marshal(vmEndpointRequest)
+	if err != nil {
+		return errors.Wrap(err, "failed to marshal endpoint request json")
+	}
+
+	if err := hcn.ModifyEndpointSettings(endpointID, &hcn.ModifyEndpointSettingRequest{
+		ResourceType: hcn.EndpointResourceTypePort,
+		RequestType:  hcn.RequestTypeAdd,
+		Settings:     json.RawMessage(m),
+	}); err != nil {
+		return errors.Wrap(err, "failed to configure switch port")
+	}
+
+	switchID, err := getSwitchID(endpointID, portID.String())
+	if err != nil {
+		return err
+	}
+
+	nic := &vmservice.NICConfig{
+		NicID:      nicID,
+		MacAddress: macAddr,
+		PortID:     portID.String(),
+		SwitchID:   switchID,
+	}
+
+	if _, err := uvm.client.ModifyResource(ctx,
+		&vmservice.ModifyResourceRequest{
+			Type: vmservice.ModifyType_ADD,
+			Resource: &vmservice.ModifyResourceRequest_NicConfig{
+				NicConfig: nic,
+			},
+		},
+	); err != nil {
+		return errors.Wrap(err, "failed to add network adapter")
+	}
+
+	return nil
+}
+
+func (uvm *utilityVM) RemoveNIC(ctx context.Context, nicID, endpointID, macAddr string) error {
+	nic := &vmservice.NICConfig{
+		NicID:      nicID,
+		MacAddress: macAddr,
+	}
+
+	if _, err := uvm.client.ModifyResource(ctx,
+		&vmservice.ModifyResourceRequest{
+			Type: vmservice.ModifyType_REMOVE,
+			Resource: &vmservice.ModifyResourceRequest_NicConfig{
+				NicConfig: nic,
+			},
+		},
+	); err != nil {
+		return errors.Wrap(err, "failed to remove network adapter")
+	}
+
+	return nil
+}
diff --git a/internal/vm/remotevm/processor.go b/internal/vm/remotevm/processor.go
new file mode 100644
index 0000000000..9e1ca2264a
--- /dev/null
+++ b/internal/vm/remotevm/processor.go
@@ -0,0 +1,15 @@
+package remotevm
+
+import (
+	"context"
+
+	"github.com/Microsoft/hcsshim/internal/vmservice"
+)
+
+func (uvmb *utilityVMBuilder) SetProcessorCount(ctx context.Context, count uint32) error {
+	if uvmb.config.ProcessorConfig == nil {
+		uvmb.config.ProcessorConfig = &vmservice.ProcessorConfig{}
+	}
+	uvmb.config.ProcessorConfig.ProcessorCount = count
+	return nil
+}
diff --git a/internal/vm/remotevm/remotevm.go b/internal/vm/remotevm/remotevm.go
new file mode 100644
index 0000000000..733e33b49d
--- /dev/null
+++ b/internal/vm/remotevm/remotevm.go
@@ -0,0 +1,105 @@
+package remotevm
+
+import (
+	"context"
+
+	"github.com/Microsoft/hcsshim/internal/jobobject"
+	"github.com/Microsoft/hcsshim/internal/vm"
+	"github.com/Microsoft/hcsshim/internal/vmservice"
+	ptypes "github.com/gogo/protobuf/types"
+	"github.com/pkg/errors"
+)
+
+var _ vm.UVM = &utilityVM{}
+
+type utilityVM struct {
+	id           string
+	waitError    error
+	job          *jobobject.JobObject
+	config       *vmservice.VMConfig
+	client       vmservice.VMService
+	capabilities *vmservice.CapabilitiesVMResponse
+}
+
+var vmSupportedResourceToVMService = map[vm.Resource]vmservice.CapabilitiesVMResponse_Resource{
+	vm.VPMem:     vmservice.CapabilitiesVMResponse_Vpmem,
+	vm.SCSI:      vmservice.CapabilitiesVMResponse_Scsi,
+	vm.PCI:       vmservice.CapabilitiesVMResponse_Vpci,
+	vm.Plan9:     vmservice.CapabilitiesVMResponse_Plan9,
+	vm.Network:   vmservice.CapabilitiesVMResponse_VMNic,
+	vm.Memory:    vmservice.CapabilitiesVMResponse_Memory,
+	vm.Processor: vmservice.CapabilitiesVMResponse_Processor,
+}
+
+func (uvm *utilityVM) ID() string {
+	return uvm.id
+}
+
+func (uvm *utilityVM) Start(ctx context.Context) error {
+	// The expectation is the VM should be in a paused state after creation.
+	if _, err := uvm.client.ResumeVM(ctx, &ptypes.Empty{}); err != nil {
+		return errors.Wrap(err, "failed to start remote VM")
+	}
+	return nil
+}
+
+func (uvm *utilityVM) Stop(ctx context.Context) error {
+	if _, err := uvm.client.TeardownVM(ctx, &ptypes.Empty{}); err != nil {
+		return errors.Wrap(err, "failed to stop remote VM")
+	}
+	return nil
+}
+
+func (uvm *utilityVM) Wait() error {
+	_, err := uvm.client.WaitVM(context.Background(), &ptypes.Empty{})
+	if err != nil {
+		uvm.waitError = err
+		return errors.Wrap(err, "failed to wait on remote VM")
+	}
+	return nil
+}
+
+func (uvm *utilityVM) Pause(ctx context.Context) error {
+	if _, err := uvm.client.PauseVM(ctx, &ptypes.Empty{}); err != nil {
+		return errors.Wrap(err, "failed to pause remote VM")
+	}
+	return nil
+}
+
+func (uvm *utilityVM) Resume(ctx context.Context) error {
+	if _, err := uvm.client.ResumeVM(ctx, &ptypes.Empty{}); err != nil {
+		return errors.Wrap(err, "failed to resume remote VM")
+	}
+	return nil
+}
+
+func (uvm *utilityVM) Save(ctx context.Context) error {
+	return vm.ErrNotSupported
+}
+
+func (uvm *utilityVM) Supported(resource vm.Resource, operation vm.ResourceOperation) bool {
+	var foundResource *vmservice.CapabilitiesVMResponse_SupportedResource
+	for _, supportedResource := range uvm.capabilities.SupportedResources {
+		if vmSupportedResourceToVMService[resource] == supportedResource.Resource {
+			foundResource = supportedResource
+		}
+	}
+
+	supported := false
+	switch operation {
+	case vm.Add:
+		supported = foundResource.Add
+	case vm.Remove:
+		supported = foundResource.Remove
+	case vm.Update:
+		supported = foundResource.Update
+	default:
+		return false
+	}
+
+	return supported
+}
+
+func (uvm *utilityVM) ExitError() error {
+	return uvm.waitError
+}
diff --git a/internal/vm/remotevm/scsi.go b/internal/vm/remotevm/scsi.go
new file mode 100644
index 0000000000..ba30dde4af
--- /dev/null
+++ b/internal/vm/remotevm/scsi.go
@@ -0,0 +1,104 @@
+package remotevm
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/Microsoft/hcsshim/internal/vm"
+	"github.com/Microsoft/hcsshim/internal/vmservice"
+	"github.com/pkg/errors"
+)
+
+func getSCSIDiskType(typ vm.SCSIDiskType) (vmservice.DiskType, error) {
+	var diskType vmservice.DiskType
+	switch typ {
+	case vm.SCSIDiskTypeVHD1:
+		diskType = vmservice.DiskType_SCSI_DISK_TYPE_VHD1
+	case vm.SCSIDiskTypeVHDX:
+		diskType = vmservice.DiskType_SCSI_DISK_TYPE_VHDX
+	case vm.SCSIDiskTypePassThrough:
+		diskType = vmservice.DiskType_SCSI_DISK_TYPE_PHYSICAL
+	default:
+		return -1, fmt.Errorf("unsupported SCSI disk type: %d", typ)
+	}
+	return diskType, nil
+}
+
+func (uvmb *utilityVMBuilder) AddSCSIController(id uint32) error {
+	return nil
+}
+
+func (uvmb *utilityVMBuilder) AddSCSIDisk(ctx context.Context, controller, lun uint32, path string, typ vm.SCSIDiskType, readOnly bool) error {
+	diskType, err := getSCSIDiskType(typ)
+	if err != nil {
+		return err
+	}
+
+	disk := &vmservice.SCSIDisk{
+		Controller: controller,
+		Lun:        lun,
+		HostPath:   path,
+		Type:       diskType,
+		ReadOnly:   readOnly,
+	}
+
+	uvmb.config.DevicesConfig.ScsiDisks = append(uvmb.config.DevicesConfig.ScsiDisks, disk)
+	return nil
+}
+
+func (uvmb *utilityVMBuilder) RemoveSCSIDisk(ctx context.Context, controller, lun uint32, path string) error {
+	return vm.ErrNotSupported
+}
+
+func (uvm *utilityVM) AddSCSIController(id uint32) error {
+	return vm.ErrNotSupported
+}
+
+func (uvm *utilityVM) AddSCSIDisk(ctx context.Context, controller, lun uint32, path string, typ vm.SCSIDiskType, readOnly bool) error {
+	diskType, err := getSCSIDiskType(typ)
+	if err != nil {
+		return err
+	}
+
+	disk := &vmservice.SCSIDisk{
+		Controller: controller,
+		Lun:        lun,
+		HostPath:   path,
+		Type:       diskType,
+		ReadOnly:   readOnly,
+	}
+
+	if _, err := uvm.client.ModifyResource(ctx,
+		&vmservice.ModifyResourceRequest{
+			Type: vmservice.ModifyType_ADD,
+			Resource: &vmservice.ModifyResourceRequest_ScsiDisk{
+				ScsiDisk: disk,
+			},
+		},
+	); err != nil {
+		return errors.Wrap(err, "failed to add SCSI disk")
+	}
+
+	return nil
+}
+
+func (uvm *utilityVM) RemoveSCSIDisk(ctx context.Context, controller, lun uint32, path string) error {
+	disk := &vmservice.SCSIDisk{
+		Controller: controller,
+		Lun:        lun,
+		HostPath:   path,
+	}
+
+	if _, err := uvm.client.ModifyResource(ctx,
+		&vmservice.ModifyResourceRequest{
+			Type: vmservice.ModifyType_REMOVE,
+			Resource: &vmservice.ModifyResourceRequest_ScsiDisk{
+				ScsiDisk: disk,
+			},
+		},
+	); err != nil {
+		return errors.Wrapf(err, "failed to remove SCSI disk %q", path)
+	}
+
+	return nil
+}
diff --git a/internal/vm/remotevm/serial.go b/internal/vm/remotevm/serial.go
new file mode 100644
index 0000000000..599f7b5242
--- /dev/null
+++ b/internal/vm/remotevm/serial.go
@@ -0,0 +1,14 @@
+package remotevm
+
+import (
+	"github.com/Microsoft/hcsshim/internal/vmservice"
+)
+
+func (uvmb *utilityVMBuilder) SetSerialConsole(port uint32, listenerPath string) error {
+	config := &vmservice.SerialConfig_Config{
+		Port:       port,
+		SocketPath: listenerPath,
+	}
+	uvmb.config.SerialConfig.Ports = []*vmservice.SerialConfig_Config{config}
+	return nil
+}
diff --git a/internal/vm/remotevm/stats.go b/internal/vm/remotevm/stats.go
new file mode 100644
index 0000000000..ca2a780280
--- /dev/null
+++ b/internal/vm/remotevm/stats.go
@@ -0,0 +1,12 @@
+package remotevm
+
+import (
+	"context"
+
+	"github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats"
+	"github.com/Microsoft/hcsshim/internal/vm"
+)
+
+func (uvm *utilityVM) Stats(ctx context.Context) (*stats.VirtualMachineStatistics, error) {
+	return nil, vm.ErrNotSupported
+}
diff --git a/internal/vm/remotevm/storage.go b/internal/vm/remotevm/storage.go
new file mode 100644
index 0000000000..f2f7783316
--- /dev/null
+++ b/internal/vm/remotevm/storage.go
@@ -0,0 +1,18 @@
+package remotevm
+
+import (
+	"github.com/pkg/errors"
+)
+
+func (uvmb *utilityVMBuilder) SetStorageQos(iopsMaximum int64, bandwidthMaximum int64) error {
+	// The way that HCS handles these options is a bit odd. They launch the vmworker process in a job object and
+	// set the bandwidth and iops limits on the worker process' job object. To keep parity with what we expose today
+	// in HCS we can do the same here as we launch the server process in a job object.
+	if uvmb.job != nil {
+		if err := uvmb.job.SetIOLimit(bandwidthMaximum, iopsMaximum); err != nil {
+			return errors.Wrap(err, "failed to set storage qos values on remotevm process")
+		}
+	}
+
+	return nil
+}
diff --git a/internal/vm/remotevm/vmsocket.go b/internal/vm/remotevm/vmsocket.go
new file mode 100644
index 0000000000..048c9e48bd
--- /dev/null
+++ b/internal/vm/remotevm/vmsocket.go
@@ -0,0 +1,93 @@
+package remotevm
+
+import (
+	"context"
+	"io/ioutil"
+	"net"
+	"os"
+
+	"github.com/Microsoft/go-winio/pkg/guid"
+	"github.com/Microsoft/hcsshim/internal/vm"
+	"github.com/Microsoft/hcsshim/internal/vmservice"
+	"github.com/pkg/errors"
+)
+
+func (uvm *utilityVM) VMSocketListen(ctx context.Context, listenType vm.VMSocketType, connID interface{}) (_ net.Listener, err error) {
+	// Make a temp file and delete to "reserve" a unique name for the unix socket
+	f, err := ioutil.TempFile("", "")
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to create temp file for unix socket")
+	}
+
+	if err := f.Close(); err != nil {
+		return nil, errors.Wrap(err, "failed to close temp file")
+	}
+
+	if err := os.Remove(f.Name()); err != nil {
+		return nil, errors.Wrap(err, "failed to delete temp file to free up name")
+	}
+
+	l, err := net.Listen("unix", f.Name())
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to listen on unix socket %q", f.Name())
+	}
+
+	defer func() {
+		if err != nil {
+			_ = l.Close()
+		}
+	}()
+
+	switch listenType {
+	case vm.HvSocket:
+		serviceGUID, ok := connID.(guid.GUID)
+		if !ok {
+			return nil, errors.New("parameter passed to hvsocketlisten is not a GUID")
+		}
+		if err := uvm.hvSocketListen(ctx, serviceGUID.String(), f.Name()); err != nil {
+			return nil, errors.Wrap(err, "failed to setup relay to hvsocket listener")
+		}
+	case vm.VSock:
+		port, ok := connID.(uint32)
+		if !ok {
+			return nil, errors.New("parameter passed to vsocklisten is not the right type")
+		}
+		if err := uvm.vsockListen(ctx, port, f.Name()); err != nil {
+			return nil, errors.Wrap(err, "failed to setup relay to vsock listener")
+		}
+	default:
+		return nil, errors.New("unknown vmsocket type requested")
+	}
+
+	return l, nil
+}
+
+func (uvm *utilityVM) hvSocketListen(ctx context.Context, serviceID string, listenerPath string) error {
+	if _, err := uvm.client.VMSocket(ctx, &vmservice.VMSocketRequest{
+		Type: vmservice.ModifyType_ADD,
+		Config: &vmservice.VMSocketRequest_HvsocketList{
+			HvsocketList: &vmservice.HVSocketListen{
+				ServiceID:    serviceID,
+				ListenerPath: listenerPath,
+			},
+		},
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (uvm *utilityVM) vsockListen(ctx context.Context, port uint32, listenerPath string) error {
+	if _, err := uvm.client.VMSocket(ctx, &vmservice.VMSocketRequest{
+		Type: vmservice.ModifyType_ADD,
+		Config: &vmservice.VMSocketRequest_VsockListen{
+			VsockListen: &vmservice.VSockListen{
+				Port:         port,
+				ListenerPath: listenerPath,
+			},
+		},
+	}); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/internal/vm/remotevm/windows.go b/internal/vm/remotevm/windows.go
new file mode 100644
index 0000000000..17aefa5422
--- /dev/null
+++ b/internal/vm/remotevm/windows.go
@@ -0,0 +1,21 @@
+package remotevm
+
+import (
+	"context"
+
+	"github.com/Microsoft/hcsshim/internal/cpugroup"
+	"github.com/Microsoft/hcsshim/internal/vmservice"
+)
+
+func (uvmb *utilityVMBuilder) SetCPUGroup(ctx context.Context, id string) error {
+	if uvmb.config.WindowsOptions == nil {
+		uvmb.config.WindowsOptions = &vmservice.WindowsOptions{}
+	}
+	// Map from guid to the underlying hypervisor ID.
+	conf, err := cpugroup.GetCPUGroupConfig(ctx, id)
+	if err != nil {
+		return err
+	}
+	uvmb.config.WindowsOptions.CpuGroupID = conf.HypervisorGroupId
+	return nil
+}
diff --git a/internal/vm/vm.go b/internal/vm/vm.go
index 0799d933f1..4e0b31ca5f 100644
--- a/internal/vm/vm.go
+++ b/internal/vm/vm.go
@@ -9,14 +9,10 @@ import (
 )
 
 var (
-	ErrNotSupported   = errors.New("virtstack does not support the operation")
-	ErrAlreadySet     = errors.New("field has already been set")
-	ErrUnknownGuestOS = errors.New("unknown guest operating system supplied")
-
-	ErrNotInPreCreatedState = errors.New("VM is not in pre-created state")
-	ErrNotInCreatedState    = errors.New("VM is not in created state")
-	ErrNotInRunningState    = errors.New("VM is not in running state")
-	ErrNotInPausedState     = errors.New("VM is not in paused state")
+	ErrNotSupported       = errors.New("virtstack does not support the operation")
+	ErrAlreadySet         = errors.New("field has already been set")
+	ErrUnsupportedGuestOS = errors.New("virtstack does not support the guest operating system")
+	ErrUnknownGuestOS     = errors.New("unknown guest operating system supplied")
 )
 
 const (
@@ -76,6 +72,8 @@ const (
 	VSMB
 	PCI
 	Plan9
+	Memory
+	Processor
 	CPUGroup
 )
 
@@ -96,18 +94,6 @@ const (
 	Linux   GuestOS = "linux"
 )
 
-// State signifies the states that a Utility VM can be in. The state of the Utility VM should be the source of truth for what
-// operations can be performed at a given moment.
-type State uint8
-
-const (
-	StatePreCreated State = iota
-	StateCreated
-	StateRunning
-	StateTerminated
-	StatePaused
-)
-
 // SCSIDiskType refers to the disk type of the scsi device. This is either a vhd, vhdx, or a physical disk.
 type SCSIDiskType uint8
 
diff --git a/internal/vmservice/vmservice.pb.go b/internal/vmservice/vmservice.pb.go
index 417a109bf7..9a97c1c738 100644
--- a/internal/vmservice/vmservice.pb.go
+++ b/internal/vmservice/vmservice.pb.go
@@ -27,9 +27,6 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
-//
-// Modify existing VM request/response
-//
 type ModifyType int32
 
 const (
@@ -176,9 +173,6 @@ func (CapabilitiesVMResponse_SupportedGuestOS) EnumDescriptor() ([]byte, []int)
 	return fileDescriptor_272f12cfdaa6c7c8, []int{15, 1}
 }
 
-//
-// VM lifecycle request/response
-//
 type DirectBoot struct {
 	KernelPath           string   `protobuf:"bytes,1,opt,name=kernel_path,json=kernelPath,proto3" json:"kernel_path,omitempty"`
 	InitrdPath           string   `protobuf:"bytes,2,opt,name=initrd_path,json=initrdPath,proto3" json:"initrd_path,omitempty"`
@@ -555,7 +549,7 @@ func _VMConfig_OneofSizer(msg proto.Message) (n int) {
 
 // WindowsOptions contains virtual machine configurations that are only present on a Windows host.
 type WindowsOptions struct {
-	CpuGroupID           uint32   `protobuf:"varint,1,opt,name=cpu_group_id,json=cpuGroupId,proto3" json:"cpu_group_id,omitempty"`
+	CpuGroupID           uint64   `protobuf:"varint,1,opt,name=cpu_group_id,json=cpuGroupId,proto3" json:"cpu_group_id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -676,8 +670,8 @@ var xxx_messageInfo_SerialConfig_Config proto.InternalMessageInfo
 type CreateVMRequest struct {
 	Config *VMConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
 	// Optional ID to be used by the VM service in log messages. It's up to the
-	// server/virtstack to make use of this field. Useful for debugging to be able to
-	// correlate events in the virtstack for a given vm that the client launched.
+	// virtstack to make use of this field. Useful for debugging to be able to
+	// correlate events for a given vm that the client launched.
 	LogID                string   `protobuf:"bytes,2,opt,name=log_id,json=logId,proto3" json:"log_id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -1121,7 +1115,6 @@ func (m *VSockListen) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_VSockListen proto.InternalMessageInfo
 
-// Abstraction around a hypervisor socket transport (Hvsocket, Vsock)
 type VMSocketRequest struct {
 	Type ModifyType `protobuf:"varint,1,opt,name=type,proto3,enum=vmservice.ModifyType" json:"type,omitempty"`
 	// Types that are valid to be assigned to Config:
@@ -1971,95 +1964,95 @@ var fileDescriptor_272f12cfdaa6c7c8 = []byte{
 	0x5e, 0xc8, 0xa3, 0x33, 0xab, 0x8c, 0x93, 0xf5, 0xc6, 0x3d, 0xa8, 0x67, 0x37, 0x51, 0x03, 0x96,
 	0x8e, 0xf1, 0x99, 0x4e, 0xb1, 0xe2, 0x13, 0x5d, 0x81, 0xe5, 0x13, 0xc7, 0x8f, 0xb1, 0xce, 0xa9,
 	0x6a, 0x71, 0x37, 0x7f, 0xdb, 0x68, 0x55, 0x01, 0xc4, 0x9d, 0xd5, 0x29, 0x66, 0x0b, 0xea, 0x59,
-	0x85, 0xd1, 0xff, 0x41, 0xd5, 0x9d, 0xc4, 0xf6, 0x28, 0xa2, 0xf1, 0xc4, 0x26, 0x9e, 0x0a, 0xe3,
-	0x56, 0xfd, 0xfc, 0xe5, 0x16, 0xb4, 0x27, 0xf1, 0x03, 0x41, 0xee, 0x75, 0x2c, 0x70, 0x93, 0x6f,
-	0xcf, 0xfc, 0x8d, 0x01, 0xd5, 0xb4, 0x5b, 0xd0, 0x4f, 0x60, 0x79, 0x42, 0x23, 0xce, 0x74, 0x34,
-	0x6c, 0x5e, 0xe2, 0xbe, 0x6d, 0xed, 0x45, 0x05, 0xde, 0xf8, 0x39, 0x14, 0x35, 0x3f, 0x82, 0x82,
-	0x20, 0xe9, 0x0c, 0x22, 0xbf, 0x45, 0xa9, 0x60, 0xd4, 0x3d, 0xc6, 0x3c, 0x53, 0x2a, 0x14, 0x49,
-	0x94, 0x0a, 0xf3, 0x5b, 0x58, 0x6d, 0x47, 0xd8, 0xe1, 0x78, 0xd8, 0xb7, 0xf0, 0xf3, 0x18, 0x33,
-	0x8e, 0x3e, 0x81, 0x62, 0x26, 0x1a, 0xd6, 0x2e, 0xb0, 0xb3, 0xa5, 0x21, 0xe8, 0x3a, 0x14, 0x7d,
-	0x3a, 0x12, 0x37, 0x96, 0xb2, 0x5b, 0xe5, 0xf3, 0x97, 0x5b, 0xcb, 0x0f, 0xe9, 0xa8, 0xd7, 0xb1,
-	0x96, 0x7d, 0x3a, 0xea, 0x79, 0xe6, 0xd7, 0xd0, 0xe8, 0x85, 0x6c, 0x82, 0x5d, 0x3e, 0x3b, 0xe2,
-	0x0a, 0x2c, 0x3f, 0x8f, 0x71, 0x94, 0xd8, 0x5e, 0x2d, 0x44, 0xe6, 0x8a, 0xb0, 0x1b, 0x47, 0x8c,
-	0xd0, 0x50, 0x67, 0x2e, 0x95, 0xe3, 0xea, 0x53, 0xb2, 0xca, 0x5c, 0x6d, 0x78, 0x2b, 0x25, 0x92,
-	0x4d, 0x68, 0xc8, 0x30, 0xda, 0x86, 0x62, 0x84, 0x59, 0xec, 0x73, 0xad, 0xf6, 0xd5, 0x6d, 0x55,
-	0xe8, 0xb7, 0x93, 0x42, 0xbf, 0x3d, 0x14, 0xde, 0xb4, 0x34, 0xca, 0xfc, 0x8b, 0x01, 0x15, 0x15,
-	0xdc, 0x03, 0xee, 0x70, 0x26, 0xaa, 0xca, 0x29, 0x8d, 0x8e, 0x49, 0x38, 0xb2, 0x19, 0xe6, 0xf6,
-	0xe1, 0x19, 0xc7, 0x4c, 0x97, 0xc1, 0x55, 0xbd, 0x31, 0xc0, 0xbc, 0x25, 0xc8, 0xb2, 0x1a, 0x9e,
-	0x38, 0xc4, 0x77, 0x0e, 0x7d, 0x6c, 0xab, 0x9c, 0x20, 0x55, 0x2d, 0x58, 0xab, 0x53, 0xba, 0x92,
-	0xad, 0x2e, 0x25, 0xcc, 0x87, 0xbd, 0x04, 0xb9, 0xa4, 0xaa, 0x4f, 0x42, 0x9e, 0x01, 0x1d, 0xc6,
-	0xc8, 0x28, 0x9c, 0x01, 0x0b, 0x0a, 0x98, 0x90, 0x15, 0xd0, 0xbc, 0x0b, 0xf5, 0x69, 0x4e, 0x51,
-	0xaa, 0x7f, 0x04, 0x0d, 0x4e, 0xb9, 0xe3, 0xdb, 0x51, 0x1c, 0x72, 0x12, 0x60, 0x3b, 0x4c, 0x34,
-	0xaf, 0x4b, 0xba, 0xa5, 0xc8, 0x8f, 0x98, 0xf9, 0x5b, 0x03, 0xd6, 0x0e, 0x22, 0x3a, 0xc1, 0x11,
-	0x27, 0x98, 0xcd, 0x1c, 0xd2, 0x86, 0x65, 0x7e, 0x36, 0xc1, 0x2a, 0xe9, 0xd7, 0x9b, 0x9f, 0x65,
-	0xf3, 0xd7, 0x3c, 0x3c, 0x45, 0x7b, 0x7c, 0x36, 0xc1, 0x96, 0xe2, 0x35, 0x3f, 0x91, 0x8a, 0xa5,
-	0x36, 0x10, 0x40, 0x51, 0x29, 0xdd, 0xc8, 0xa1, 0x1a, 0x94, 0xa7, 0x6a, 0x37, 0x0c, 0xf3, 0x8f,
-	0x06, 0x5c, 0xc9, 0x8a, 0xd6, 0x7e, 0xbc, 0x03, 0x3a, 0xcb, 0xda, 0x4c, 0x5c, 0x6e, 0xea, 0xcd,
-	0xf9, 0x94, 0x2c, 0xaf, 0x6e, 0x55, 0x82, 0x94, 0x0b, 0x5b, 0xe9, 0xd2, 0xa7, 0xb8, 0xf3, 0x0b,
-	0x99, 0x26, 0x6b, 0xbb, 0x54, 0x55, 0x94, 0x6b, 0xf3, 0x77, 0x05, 0xb8, 0xda, 0x76, 0x26, 0xce,
-	0x21, 0xf1, 0xc9, 0x9c, 0x66, 0x1e, 0xac, 0xb1, 0x78, 0x22, 0xe2, 0x0a, 0x7b, 0x76, 0x84, 0x19,
-	0x8d, 0x23, 0x17, 0x27, 0x75, 0xf2, 0x56, 0xea, 0x88, 0x8b, 0xf9, 0xb7, 0x07, 0x09, 0xb3, 0xa5,
-	0x79, 0x2d, 0xc4, 0xe6, 0x49, 0x0c, 0x7d, 0x0b, 0x33, 0xaa, 0x3d, 0x12, 0xe6, 0xb6, 0xa9, 0xaa,
-	0xab, 0xf5, 0x66, 0xf3, 0x35, 0x0e, 0x79, 0x20, 0x58, 0xf7, 0x07, 0x56, 0x83, 0x65, 0x29, 0x6c,
-	0xe3, 0x4f, 0x06, 0xbc, 0xb5, 0xa0, 0x8b, 0xc8, 0x86, 0xbb, 0x9e, 0x4a, 0x5c, 0x25, 0x4b, 0x7c,
-	0xa2, 0xab, 0x50, 0xb4, 0x70, 0x40, 0x4f, 0xb0, 0xee, 0xf4, 0xf4, 0x4a, 0xd0, 0x9f, 0x4c, 0x3c,
-	0x87, 0x63, 0xdd, 0xd7, 0xe9, 0x15, 0xba, 0x0f, 0xa5, 0xc4, 0x2a, 0xf2, 0xe9, 0xd6, 0x9b, 0x37,
-	0x7f, 0x58, 0xdf, 0xa9, 0x2d, 0xa6, 0xbc, 0xe6, 0x37, 0x50, 0x9a, 0x6a, 0x55, 0x86, 0xe5, 0xa1,
-	0xe8, 0x1a, 0x1a, 0x39, 0x54, 0x82, 0xc2, 0xc0, 0x65, 0xa4, 0x61, 0x88, 0xaf, 0xe1, 0xc4, 0x25,
-	0x8d, 0xbc, 0xd8, 0x3e, 0xf0, 0x9d, 0xf0, 0x4e, 0x63, 0x49, 0x22, 0xfb, 0x8f, 0x88, 0xdb, 0x28,
-	0xa4, 0x9e, 0xdd, 0x72, 0xf6, 0xd9, 0x15, 0xcd, 0x9b, 0xd0, 0x98, 0xb7, 0x10, 0xaa, 0xc0, 0x8a,
-	0xce, 0xe6, 0x8d, 0x9c, 0x10, 0xf3, 0x90, 0x84, 0xf1, 0x8b, 0x86, 0x61, 0xba, 0x50, 0xef, 0x0e,
-	0x07, 0x32, 0x57, 0x3e, 0x24, 0x8c, 0xe3, 0x10, 0x7d, 0x0a, 0xa0, 0xaf, 0x93, 0xe4, 0xf8, 0x72,
-	0xab, 0x76, 0xfe, 0x72, 0xab, 0x3c, 0x50, 0xd4, 0x5e, 0xc7, 0x2a, 0x6b, 0x40, 0xcf, 0x13, 0x6d,
-	0xb8, 0x2f, 0xf9, 0x70, 0x94, 0x4e, 0xbf, 0xd5, 0x84, 0x28, 0x13, 0xf0, 0x7d, 0xa8, 0xc8, 0x33,
-	0xf4, 0x09, 0x17, 0x25, 0xf1, 0x1f, 0x25, 0xe7, 0xef, 0x06, 0xac, 0x0e, 0xfb, 0x4a, 0xdb, 0x24,
-	0xaa, 0x3f, 0x86, 0x82, 0x88, 0x4c, 0x29, 0xac, 0x9e, 0xa9, 0xe9, 0x7d, 0xea, 0x91, 0xa3, 0x33,
-	0x19, 0xbc, 0x12, 0x82, 0x7e, 0x01, 0xb5, 0xf1, 0x89, 0x2e, 0x15, 0x42, 0xee, 0x05, 0x81, 0x93,
-	0xb5, 0x45, 0x37, 0x67, 0x55, 0x13, 0x0e, 0x41, 0x41, 0x3f, 0x83, 0xaa, 0x5c, 0xda, 0x4a, 0x2d,
-	0xdd, 0xc4, 0xa4, 0xe3, 0x36, 0x75, 0xcf, 0x6e, 0xce, 0xaa, 0x48, 0xb4, 0x5a, 0xb6, 0x4a, 0x49,
-	0x15, 0x33, 0xff, 0x6c, 0x40, 0x29, 0xe9, 0x33, 0xd1, 0x26, 0x80, 0x4b, 0x43, 0x1e, 0x51, 0xdf,
-	0xc7, 0x91, 0xb6, 0x49, 0x8a, 0x22, 0xde, 0xac, 0x1f, 0x87, 0xba, 0x4a, 0x88, 0x4f, 0x31, 0x38,
-	0x8c, 0x29, 0xd3, 0xe5, 0x4e, 0x8d, 0x3d, 0x25, 0x41, 0x90, 0x73, 0xd1, 0x0d, 0x6d, 0x0f, 0xf5,
-	0x38, 0xd7, 0x32, 0x3d, 0x0e, 0x3b, 0x4e, 0x59, 0xe3, 0x1a, 0x94, 0x23, 0xec, 0x78, 0x36, 0x0d,
-	0xfd, 0xb3, 0x64, 0xfc, 0x10, 0x84, 0xfd, 0xd0, 0x3f, 0x33, 0x43, 0x28, 0x4f, 0x7b, 0xda, 0xec,
-	0x79, 0xc6, 0x25, 0xe7, 0xe5, 0x5f, 0xeb, 0xbc, 0xa5, 0xb9, 0xf3, 0xfe, 0x6a, 0x40, 0x79, 0xda,
-	0x0e, 0x8b, 0x82, 0x2b, 0x1a, 0xe7, 0xe9, 0xf3, 0x93, 0x05, 0xf7, 0x11, 0x71, 0x45, 0xc1, 0x0d,
-	0x89, 0x2b, 0x9f, 0xdd, 0x8a, 0x78, 0x36, 0xb3, 0x9a, 0x0c, 0xe7, 0x2f, 0xb7, 0x8a, 0x07, 0x34,
-	0xe2, 0xbd, 0x8e, 0x55, 0x14, 0x5b, 0x3d, 0x4f, 0x34, 0x06, 0x81, 0xe3, 0xda, 0x8e, 0xe7, 0x45,
-	0x98, 0x31, 0x6d, 0x29, 0x08, 0x1c, 0x77, 0x57, 0x51, 0xd0, 0xc7, 0x50, 0x66, 0xa7, 0x84, 0xbb,
-	0x63, 0x21, 0xa7, 0x20, 0xe5, 0x54, 0xcf, 0x5f, 0x6e, 0x95, 0x06, 0x92, 0xd8, 0xeb, 0x58, 0x25,
-	0xb5, 0xdd, 0xf3, 0xc4, 0x1c, 0x27, 0x54, 0x0a, 0x9d, 0x00, 0x4b, 0x63, 0x95, 0xad, 0x95, 0x90,
-	0xb8, 0x8f, 0x9c, 0x00, 0x9b, 0x6d, 0x68, 0xcc, 0x37, 0xe4, 0x68, 0x47, 0xcc, 0xcc, 0x8c, 0x3b,
-	0x61, 0x3a, 0x8a, 0x64, 0xa7, 0xd4, 0xd3, 0x64, 0xd1, 0x29, 0x25, 0x90, 0x9e, 0x67, 0x36, 0x61,
-	0x4d, 0xbd, 0x57, 0x15, 0xd4, 0xc9, 0xeb, 0x7e, 0xd5, 0xbc, 0x6a, 0xee, 0xc2, 0x55, 0xc5, 0x33,
-	0x0d, 0xfe, 0x84, 0x2d, 0x33, 0x1f, 0x91, 0xd0, 0xc3, 0x2f, 0x16, 0x66, 0xae, 0x9e, 0xa0, 0x9a,
-	0x11, 0xbc, 0x37, 0x27, 0x42, 0xf7, 0x3e, 0xd3, 0xe8, 0x5a, 0x9c, 0xc9, 0x8c, 0x1f, 0x3d, 0x93,
-	0xe5, 0x2f, 0x9c, 0xc9, 0x7e, 0x5f, 0x80, 0xb7, 0xd5, 0xa1, 0xd3, 0xbc, 0xf8, 0xfa, 0xb1, 0xbc,
-	0x0b, 0xe5, 0xa9, 0x58, 0x1d, 0xc7, 0xef, 0x2f, 0xe0, 0xe7, 0xed, 0xd2, 0xcd, 0x59, 0x33, 0x2e,
-	0xf4, 0xf8, 0x82, 0xd1, 0x46, 0x05, 0xf4, 0x8d, 0xcb, 0x25, 0x65, 0xcc, 0xd3, 0xcd, 0x2d, 0x4e,
-	0x3a, 0xb7, 0xa1, 0x98, 0xea, 0x6c, 0xb2, 0x2d, 0xee, 0x05, 0x1e, 0xee, 0xe6, 0x2c, 0x8d, 0x47,
-	0x4d, 0x28, 0x4f, 0x27, 0x53, 0x3d, 0xa2, 0x5c, 0x34, 0x98, 0x76, 0x73, 0x56, 0x29, 0x19, 0x4d,
-	0xd1, 0xe7, 0x00, 0xb3, 0xc9, 0x54, 0x0f, 0x29, 0x17, 0x0e, 0xa6, 0xe2, 0xea, 0xd3, 0xd1, 0x54,
-	0xb0, 0xa5, 0x26, 0xd3, 0x95, 0x05, 0xb6, 0x69, 0x28, 0x0a, 0xb6, 0xd9, 0x6c, 0xda, 0x59, 0x98,
-	0x4d, 0x4b, 0x92, 0xf5, 0x55, 0xb3, 0x69, 0x37, 0x37, 0x37, 0x9d, 0xb6, 0x60, 0x56, 0x42, 0x6f,
-	0x7e, 0x06, 0x30, 0x73, 0x2d, 0x5a, 0x81, 0xa5, 0xdd, 0x4e, 0xa7, 0x91, 0x13, 0xc5, 0xcd, 0xda,
-	0xeb, 0xef, 0x0f, 0xf7, 0x1a, 0x86, 0xf8, 0x7e, 0x72, 0xd0, 0xd9, 0x7d, 0xbc, 0xd7, 0xc8, 0xdf,
-	0x7c, 0x06, 0xa5, 0x24, 0xab, 0xa0, 0x77, 0x60, 0x4d, 0x98, 0xc4, 0xee, 0xf4, 0x06, 0x5f, 0xd9,
-	0x8f, 0x9f, 0x1d, 0xec, 0xd9, 0xc3, 0x6e, 0xe7, 0xff, 0x1b, 0xb9, 0x8b, 0x37, 0x7e, 0xd5, 0x30,
-	0xd0, 0x35, 0x78, 0x67, 0x6e, 0xe3, 0xa0, 0xfb, 0x6c, 0xd0, 0x6b, 0xef, 0x3e, 0x6c, 0xe4, 0x9b,
-	0xff, 0x5a, 0x86, 0xfc, 0xb0, 0x8f, 0xbe, 0x80, 0x52, 0x32, 0x2b, 0xa0, 0xf4, 0x84, 0x3b, 0x37,
-	0x40, 0x6c, 0x2c, 0x76, 0xde, 0x7b, 0xc1, 0x84, 0x9f, 0xa1, 0x7b, 0x00, 0x8f, 0xb1, 0x13, 0x79,
-	0xf4, 0x34, 0x1c, 0xf6, 0xd1, 0x25, 0xa8, 0x4b, 0xb9, 0xef, 0xc0, 0xca, 0x81, 0x13, 0x33, 0xfc,
-	0x06, 0xac, 0x77, 0x65, 0x43, 0x11, 0x07, 0x6f, 0xc2, 0x7b, 0x1b, 0x8a, 0x4f, 0x1d, 0xc2, 0xdf,
-	0x80, 0xf3, 0x3e, 0x94, 0xa7, 0x53, 0x0a, 0x4a, 0x3f, 0x83, 0xf9, 0x71, 0x68, 0xe3, 0xbd, 0x8b,
-	0x37, 0x75, 0xdb, 0xf9, 0x15, 0xd4, 0xb3, 0xbd, 0xd3, 0xa5, 0x9a, 0xbc, 0xff, 0x83, 0xed, 0x16,
-	0xda, 0x87, 0x6a, 0xba, 0xeb, 0x46, 0x9b, 0xaf, 0xee, 0xf4, 0x37, 0xb6, 0x2e, 0xdd, 0xd7, 0x02,
-	0x7f, 0x09, 0xf5, 0x6c, 0xc2, 0x42, 0xd7, 0x17, 0xa2, 0x7a, 0x2e, 0x97, 0x5d, 0x6a, 0xb1, 0x2f,
-	0xa0, 0x94, 0xb4, 0x30, 0x99, 0x07, 0x36, 0xd7, 0xd7, 0x5c, 0xca, 0xff, 0x53, 0x28, 0x7c, 0x1d,
-	0x13, 0xfe, 0xba, 0x9e, 0x6a, 0x7d, 0xf0, 0xdd, 0xf7, 0x9b, 0xb9, 0x7f, 0x7e, 0xbf, 0x99, 0xfb,
-	0xf5, 0xf9, 0xa6, 0xf1, 0xdd, 0xf9, 0xa6, 0xf1, 0x8f, 0xf3, 0x4d, 0xe3, 0xdf, 0xe7, 0x9b, 0xc6,
-	0x37, 0xb3, 0x9f, 0xca, 0x87, 0x45, 0xc9, 0x74, 0xeb, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfc,
-	0x8a, 0x18, 0x1a, 0xa9, 0x16, 0x00, 0x00,
+	0x85, 0xd1, 0xff, 0x41, 0xd5, 0x9d, 0xc4, 0xf6, 0x28, 0xa2, 0xf1, 0xc4, 0x26, 0x9e, 0xca, 0x9f,
+	0xad, 0xfa, 0xf9, 0xcb, 0x2d, 0x68, 0x4f, 0xe2, 0x07, 0x82, 0xdc, 0xeb, 0x58, 0xe0, 0x26, 0xdf,
+	0x9e, 0xf9, 0x1b, 0x03, 0xaa, 0x69, 0xb7, 0xa0, 0x9f, 0xc0, 0xf2, 0x84, 0x46, 0x9c, 0xe9, 0x68,
+	0xd8, 0xbc, 0xc4, 0x7d, 0xdb, 0xda, 0x8b, 0x0a, 0xbc, 0xf1, 0x73, 0x28, 0x6a, 0x7e, 0x04, 0x05,
+	0x41, 0xd2, 0x19, 0x44, 0x7e, 0x8b, 0x52, 0xc1, 0xa8, 0x7b, 0x8c, 0x79, 0xa6, 0x54, 0x28, 0x92,
+	0x28, 0x15, 0xe6, 0xb7, 0xb0, 0xda, 0x8e, 0xb0, 0xc3, 0xf1, 0xb0, 0x6f, 0xe1, 0xe7, 0x31, 0x66,
+	0x1c, 0x7d, 0x02, 0xc5, 0x4c, 0x34, 0xac, 0x5d, 0x60, 0x67, 0x4b, 0x43, 0xd0, 0x75, 0x28, 0xfa,
+	0x74, 0x24, 0x6e, 0x2c, 0x65, 0xb7, 0xca, 0xe7, 0x2f, 0xb7, 0x96, 0x1f, 0xd2, 0x51, 0xaf, 0x63,
+	0x2d, 0xfb, 0x74, 0xd4, 0xf3, 0xcc, 0xaf, 0xa1, 0xd1, 0x0b, 0xd9, 0x04, 0xbb, 0x7c, 0x76, 0xc4,
+	0x15, 0x58, 0x7e, 0x1e, 0xe3, 0x28, 0xb1, 0xbd, 0x5a, 0x88, 0xcc, 0x15, 0x61, 0x37, 0x8e, 0x18,
+	0xa1, 0xa1, 0xce, 0x5c, 0x2a, 0xc7, 0xd5, 0xa7, 0x64, 0x95, 0xb9, 0xda, 0xf0, 0x56, 0x4a, 0x24,
+	0x9b, 0xd0, 0x90, 0x61, 0xb4, 0x0d, 0xc5, 0x08, 0xb3, 0xd8, 0xe7, 0x5a, 0xed, 0xab, 0xdb, 0xaa,
+	0xd0, 0x6f, 0x27, 0x85, 0x7e, 0x7b, 0x28, 0xbc, 0x69, 0x69, 0x94, 0xf9, 0x17, 0x03, 0x2a, 0x2a,
+	0xb8, 0x07, 0xdc, 0xe1, 0x4c, 0x54, 0x95, 0x53, 0x1a, 0x1d, 0x93, 0x70, 0x64, 0x33, 0xcc, 0xed,
+	0xc3, 0x33, 0x8e, 0x99, 0x2e, 0x83, 0xab, 0x7a, 0x63, 0x80, 0x79, 0x4b, 0x90, 0x65, 0x35, 0x3c,
+	0x71, 0x88, 0xef, 0x1c, 0xfa, 0xd8, 0x56, 0x39, 0x41, 0xaa, 0x5a, 0xb0, 0x56, 0xa7, 0x74, 0x25,
+	0x5b, 0x5d, 0x4a, 0x98, 0x0f, 0x7b, 0x09, 0x72, 0x49, 0x55, 0x9f, 0x84, 0x3c, 0x03, 0x3a, 0x8c,
+	0x91, 0x51, 0x38, 0x03, 0x16, 0x14, 0x30, 0x21, 0x2b, 0xa0, 0x79, 0x17, 0xea, 0xd3, 0x9c, 0xa2,
+	0x54, 0xff, 0x08, 0x1a, 0x9c, 0x72, 0xc7, 0xb7, 0xa3, 0x38, 0xe4, 0x24, 0xc0, 0x76, 0x98, 0x68,
+	0x5e, 0x97, 0x74, 0x4b, 0x91, 0x1f, 0x31, 0xf3, 0xb7, 0x06, 0xac, 0x1d, 0x44, 0x74, 0x82, 0x23,
+	0x4e, 0x30, 0x9b, 0x39, 0xa4, 0x0d, 0xcb, 0xfc, 0x6c, 0x82, 0x55, 0xd2, 0xaf, 0x37, 0x3f, 0xcb,
+	0xe6, 0xaf, 0x79, 0x78, 0x8a, 0xf6, 0xf8, 0x6c, 0x82, 0x2d, 0xc5, 0x6b, 0x7e, 0x22, 0x15, 0x4b,
+	0x6d, 0x20, 0x80, 0xa2, 0x52, 0xba, 0x91, 0x43, 0x35, 0x28, 0x4f, 0xd5, 0x6e, 0x18, 0xe6, 0x1f,
+	0x0d, 0xb8, 0x92, 0x15, 0xad, 0xfd, 0x78, 0x07, 0x74, 0x96, 0xb5, 0x99, 0xb8, 0xdc, 0xd4, 0x9b,
+	0xf3, 0x29, 0x59, 0x5e, 0xdd, 0xaa, 0x04, 0x29, 0x17, 0xb6, 0xd2, 0xa5, 0x4f, 0x71, 0xe7, 0x17,
+	0x32, 0x4d, 0xd6, 0x76, 0xa9, 0xaa, 0x28, 0xd7, 0xe6, 0xef, 0x0a, 0x70, 0xb5, 0xed, 0x4c, 0x9c,
+	0x43, 0xe2, 0x93, 0x39, 0xcd, 0x3c, 0x58, 0x63, 0xf1, 0x44, 0xc4, 0x15, 0xf6, 0xec, 0x08, 0x33,
+	0x1a, 0x47, 0x2e, 0x4e, 0xea, 0xe4, 0xad, 0xd4, 0x11, 0x17, 0xf3, 0x6f, 0x0f, 0x12, 0x66, 0x4b,
+	0xf3, 0x5a, 0x88, 0xcd, 0x93, 0x18, 0xfa, 0x16, 0x66, 0x54, 0x7b, 0x24, 0xcc, 0x6d, 0x53, 0x55,
+	0x57, 0xeb, 0xcd, 0xe6, 0x6b, 0x1c, 0xf2, 0x40, 0xb0, 0xee, 0x0f, 0xac, 0x06, 0xcb, 0x52, 0xd8,
+	0xc6, 0x9f, 0x0c, 0x78, 0x6b, 0x41, 0x17, 0x91, 0x0d, 0x77, 0x3d, 0x95, 0xb8, 0x4a, 0x96, 0xf8,
+	0x44, 0x57, 0xa1, 0x68, 0xe1, 0x80, 0x9e, 0x60, 0xdd, 0xe9, 0xe9, 0x95, 0xa0, 0x3f, 0x99, 0x78,
+	0x0e, 0xc7, 0xba, 0xaf, 0xd3, 0x2b, 0x74, 0x1f, 0x4a, 0x89, 0x55, 0xe4, 0xd3, 0xad, 0x37, 0x6f,
+	0xfe, 0xb0, 0xbe, 0x53, 0x5b, 0x4c, 0x79, 0xcd, 0x6f, 0xa0, 0x34, 0xd5, 0xaa, 0x0c, 0xcb, 0x43,
+	0xd1, 0x35, 0x34, 0x72, 0xa8, 0x04, 0x85, 0x81, 0xcb, 0x48, 0xc3, 0x10, 0x5f, 0xc3, 0x89, 0x4b,
+	0x1a, 0x79, 0xb1, 0x7d, 0xe0, 0x3b, 0xe1, 0x9d, 0xc6, 0x92, 0x44, 0xf6, 0x1f, 0x11, 0xb7, 0x51,
+	0x48, 0x3d, 0xbb, 0xe5, 0xec, 0xb3, 0x2b, 0x9a, 0x37, 0xa1, 0x31, 0x6f, 0x21, 0x54, 0x81, 0x15,
+	0x9d, 0xcd, 0x1b, 0x39, 0x21, 0xe6, 0x21, 0x09, 0xe3, 0x17, 0x0d, 0xc3, 0x74, 0xa1, 0xde, 0x1d,
+	0x0e, 0x64, 0xae, 0x7c, 0x48, 0x18, 0xc7, 0x21, 0xfa, 0x14, 0x40, 0x5f, 0x27, 0xc9, 0xf1, 0xe5,
+	0x56, 0xed, 0xfc, 0xe5, 0x56, 0x79, 0xa0, 0xa8, 0xbd, 0x8e, 0x55, 0xd6, 0x80, 0x9e, 0x27, 0xda,
+	0x70, 0x5f, 0xf2, 0xe1, 0x28, 0x9d, 0x7e, 0xab, 0x09, 0x51, 0x26, 0xe0, 0xfb, 0x50, 0x91, 0x67,
+	0xe8, 0x13, 0x2e, 0x4a, 0xe2, 0x3f, 0x4a, 0xce, 0xdf, 0x0d, 0x58, 0x1d, 0xf6, 0x95, 0xb6, 0x49,
+	0x54, 0x7f, 0x0c, 0x05, 0x11, 0x99, 0x52, 0x58, 0x3d, 0x53, 0xd3, 0xfb, 0xd4, 0x23, 0x47, 0x67,
+	0x32, 0x78, 0x25, 0x04, 0xfd, 0x02, 0x6a, 0xe3, 0x13, 0x5d, 0x2a, 0x84, 0xdc, 0x0b, 0x02, 0x27,
+	0x6b, 0x8b, 0x6e, 0xce, 0xaa, 0x26, 0x1c, 0x82, 0x82, 0x7e, 0x06, 0x55, 0xb9, 0xb4, 0x95, 0x5a,
+	0xba, 0x89, 0x49, 0xc7, 0x6d, 0xea, 0x9e, 0xdd, 0x9c, 0x55, 0x91, 0x68, 0xb5, 0x6c, 0x95, 0x92,
+	0x2a, 0x66, 0xfe, 0xd9, 0x80, 0x52, 0xd2, 0x67, 0xa2, 0x4d, 0x00, 0x97, 0x86, 0x3c, 0xa2, 0xbe,
+	0x8f, 0x23, 0x6d, 0x93, 0x14, 0x45, 0xbc, 0x59, 0x3f, 0x0e, 0x75, 0x95, 0x10, 0x9f, 0x62, 0x70,
+	0x18, 0x53, 0xa6, 0xcb, 0x9d, 0x1a, 0x7b, 0x4a, 0x82, 0x20, 0xe7, 0xa2, 0x1b, 0xda, 0x1e, 0xea,
+	0x71, 0xae, 0x65, 0x7a, 0x1c, 0x76, 0x9c, 0xb2, 0xc6, 0x35, 0x28, 0x47, 0xd8, 0xf1, 0x6c, 0x1a,
+	0xfa, 0x67, 0xc9, 0xf8, 0x21, 0x08, 0xfb, 0xa1, 0x7f, 0x66, 0x86, 0x50, 0x9e, 0xf6, 0xb4, 0xd9,
+	0xf3, 0x8c, 0x4b, 0xce, 0xcb, 0xbf, 0xd6, 0x79, 0x4b, 0x73, 0xe7, 0xfd, 0xd5, 0x80, 0xf2, 0xb4,
+	0x1d, 0x16, 0x05, 0x57, 0x34, 0xce, 0xd3, 0xe7, 0x27, 0x0b, 0xee, 0x23, 0xe2, 0x8a, 0x82, 0x1b,
+	0x12, 0x57, 0x3e, 0xbb, 0x15, 0xf1, 0x6c, 0x66, 0x35, 0x19, 0xce, 0x5f, 0x6e, 0x15, 0x0f, 0x68,
+	0xc4, 0x7b, 0x1d, 0xab, 0x28, 0xb6, 0x7a, 0x9e, 0x68, 0x0c, 0x02, 0xc7, 0xb5, 0x1d, 0xcf, 0x8b,
+	0x30, 0x63, 0xda, 0x52, 0x10, 0x38, 0xee, 0xae, 0xa2, 0xa0, 0x8f, 0xa1, 0xcc, 0x4e, 0x09, 0x77,
+	0xc7, 0x42, 0x4e, 0x41, 0xca, 0xa9, 0x9e, 0xbf, 0xdc, 0x2a, 0x0d, 0x24, 0xb1, 0xd7, 0xb1, 0x4a,
+	0x6a, 0xbb, 0xe7, 0x89, 0x39, 0x4e, 0xa8, 0x14, 0x3a, 0x01, 0x96, 0xc6, 0x2a, 0x5b, 0x2b, 0x21,
+	0x71, 0x1f, 0x39, 0x01, 0x36, 0xdb, 0xd0, 0x98, 0x6f, 0xc8, 0xd1, 0x8e, 0x98, 0x99, 0x19, 0x77,
+	0xc2, 0x74, 0x14, 0xc9, 0x4e, 0xa9, 0xa7, 0xc9, 0xa2, 0x53, 0x4a, 0x20, 0x3d, 0xcf, 0x6c, 0xc2,
+	0x9a, 0x7a, 0xaf, 0x2a, 0xa8, 0x93, 0xd7, 0xfd, 0xaa, 0x79, 0xd5, 0xdc, 0x85, 0xab, 0x8a, 0x67,
+	0x1a, 0xfc, 0x09, 0x5b, 0x66, 0x3e, 0x22, 0xa1, 0x87, 0x5f, 0x2c, 0xcc, 0x5c, 0x3d, 0x41, 0x35,
+	0x23, 0x78, 0x6f, 0x4e, 0x84, 0xee, 0x7d, 0xa6, 0xd1, 0xb5, 0x38, 0x93, 0x19, 0x3f, 0x7a, 0x26,
+	0xcb, 0x5f, 0x38, 0x93, 0xfd, 0xbe, 0x00, 0x6f, 0xab, 0x43, 0xa7, 0x79, 0xf1, 0xf5, 0x63, 0x79,
+	0x17, 0xca, 0x53, 0xb1, 0x3a, 0x8e, 0xdf, 0x5f, 0xc0, 0xcf, 0xdb, 0xa5, 0x9b, 0xb3, 0x66, 0x5c,
+	0xe8, 0xf1, 0x05, 0xa3, 0x8d, 0x0a, 0xe8, 0x1b, 0x97, 0x4b, 0xca, 0x98, 0xa7, 0x9b, 0x5b, 0x9c,
+	0x74, 0x6e, 0x43, 0x31, 0xd5, 0xd9, 0x64, 0x5b, 0xdc, 0x0b, 0x3c, 0xdc, 0xcd, 0x59, 0x1a, 0x8f,
+	0x9a, 0x50, 0x9e, 0x4e, 0xa6, 0x7a, 0x44, 0xb9, 0x68, 0x30, 0xed, 0xe6, 0xac, 0x52, 0x32, 0x9a,
+	0xa2, 0xcf, 0x01, 0x66, 0x93, 0xa9, 0x1e, 0x52, 0x2e, 0x1c, 0x4c, 0xc5, 0xd5, 0xa7, 0xa3, 0xa9,
+	0x60, 0x4b, 0x4d, 0xa6, 0x2b, 0x0b, 0x6c, 0xd3, 0x50, 0x14, 0x6c, 0xb3, 0xd9, 0xb4, 0xb3, 0x30,
+	0x9b, 0x96, 0x24, 0xeb, 0xab, 0x66, 0xd3, 0x6e, 0x6e, 0x6e, 0x3a, 0x6d, 0xc1, 0xac, 0x84, 0xde,
+	0xfc, 0x0c, 0x60, 0xe6, 0x5a, 0xb4, 0x02, 0x4b, 0xbb, 0x9d, 0x4e, 0x23, 0x27, 0x8a, 0x9b, 0xb5,
+	0xd7, 0xdf, 0x1f, 0xee, 0x35, 0x0c, 0xf1, 0xfd, 0xe4, 0xa0, 0xb3, 0xfb, 0x78, 0xaf, 0x91, 0xbf,
+	0xf9, 0x0c, 0x4a, 0x49, 0x56, 0x41, 0xef, 0xc0, 0x9a, 0x30, 0x89, 0xdd, 0xe9, 0x0d, 0xbe, 0xb2,
+	0x1f, 0x3f, 0x3b, 0xd8, 0xb3, 0x87, 0xdd, 0xce, 0xff, 0x37, 0x72, 0x17, 0x6f, 0xfc, 0xaa, 0x61,
+	0xa0, 0x6b, 0xf0, 0xce, 0xdc, 0xc6, 0x41, 0xf7, 0xd9, 0xa0, 0xd7, 0xde, 0x7d, 0xd8, 0xc8, 0x37,
+	0xff, 0xb5, 0x0c, 0xf9, 0x61, 0x1f, 0x7d, 0x01, 0xa5, 0x64, 0x56, 0x40, 0xe9, 0x09, 0x77, 0x6e,
+	0x80, 0xd8, 0x58, 0xec, 0xbc, 0xf7, 0x82, 0x09, 0x3f, 0x43, 0xf7, 0x00, 0x1e, 0x63, 0x27, 0xf2,
+	0xe8, 0x69, 0x38, 0xec, 0xa3, 0x4b, 0x50, 0x97, 0x72, 0xdf, 0x81, 0x95, 0x03, 0x27, 0x66, 0xf8,
+	0x0d, 0x58, 0xef, 0xca, 0x86, 0x22, 0x0e, 0xde, 0x84, 0xf7, 0x36, 0x14, 0x9f, 0x3a, 0x84, 0xbf,
+	0x01, 0xe7, 0x7d, 0x28, 0x4f, 0xa7, 0x14, 0x94, 0x7e, 0x06, 0xf3, 0xe3, 0xd0, 0xc6, 0x7b, 0x17,
+	0x6f, 0xea, 0xb6, 0xf3, 0x2b, 0xa8, 0x67, 0x7b, 0xa7, 0x4b, 0x35, 0x79, 0xff, 0x07, 0xdb, 0x2d,
+	0xb4, 0x0f, 0xd5, 0x74, 0xd7, 0x8d, 0x36, 0x5f, 0xdd, 0xe9, 0x6f, 0x6c, 0x5d, 0xba, 0xaf, 0x05,
+	0xfe, 0x12, 0xea, 0xd9, 0x84, 0x85, 0xae, 0x2f, 0x44, 0xf5, 0x5c, 0x2e, 0xbb, 0xd4, 0x62, 0x5f,
+	0x40, 0x29, 0x69, 0x61, 0x32, 0x0f, 0x6c, 0xae, 0xaf, 0xb9, 0x94, 0xff, 0xa7, 0x50, 0xf8, 0x3a,
+	0x26, 0xfc, 0x75, 0x3d, 0xd5, 0xfa, 0xe0, 0xbb, 0xef, 0x37, 0x73, 0xff, 0xfc, 0x7e, 0x33, 0xf7,
+	0xeb, 0xf3, 0x4d, 0xe3, 0xbb, 0xf3, 0x4d, 0xe3, 0x1f, 0xe7, 0x9b, 0xc6, 0xbf, 0xcf, 0x37, 0x8d,
+	0x6f, 0x66, 0x3f, 0x95, 0x0f, 0x8b, 0x92, 0xe9, 0xd6, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x96,
+	0xae, 0xa5, 0x20, 0xa9, 0x16, 0x00, 0x00,
 }
 
 func (m *DirectBoot) Marshal() (dAtA []byte, err error) {
@@ -6206,7 +6199,7 @@ func (m *WindowsOptions) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.CpuGroupID |= uint32(b&0x7F) << shift
+				m.CpuGroupID |= uint64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
diff --git a/internal/vmservice/vmservice.proto b/internal/vmservice/vmservice.proto
index 81645fb9b5..be32b09e8b 100644
--- a/internal/vmservice/vmservice.proto
+++ b/internal/vmservice/vmservice.proto
@@ -109,7 +109,7 @@ message VMConfig {
 
 // WindowsOptions contains virtual machine configurations that are only present on a Windows host.
 message WindowsOptions {
-    uint32 cpu_group_id = 1;
+    uint64 cpu_group_id = 1;
 }
 
 message SerialConfig {