diff --git a/Makefile b/Makefile
index 7a9a3aa..9f76d3d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 all:
 	# You must use the current protoc-gen-go
+	# protoc --version 3.6++ does not mean that protoc will generate version3 .go files
 	#
 	# apt remove golang-goprotobuf-dev
 	# apt install protobuf-compiler
@@ -10,17 +11,18 @@ all:
 	# go install
 	#
 	# Then:
+	protoc --version
 	make events.pb.go
 	make config.pb.go
+	make account.pb.go
 
 events.pb.go: events.proto
-	# protoc --version 3.6++ does not mean that protoc will generate version3 .go files
-	protoc --version
 	protoc --go_out=. events.proto
 
+account.pb.go: account.proto
+	protoc --go_out=. account.proto
+
 config.pb.go: config.proto
-	# protoc --version 3.6++ does not mean that protoc will generate version3 .go files
-	protoc --version
 	protoc --go_out=. config.proto
 
 compile:
diff --git a/account.pb.go b/account.pb.go
new file mode 100644
index 0000000..f40c2ef
--- /dev/null
+++ b/account.pb.go
@@ -0,0 +1,129 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: account.proto
+
+package witProtobuf
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type Account struct {
+	Nick                 string   `protobuf:"bytes,1,opt,name=nick,proto3" json:"nick,omitempty"`
+	Username             string   `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`
+	Token                string   `protobuf:"bytes,3,opt,name=token,proto3" json:"token,omitempty"`
+	Password             string   `protobuf:"bytes,4,opt,name=password,proto3" json:"password,omitempty"`
+	Hostname             string   `protobuf:"bytes,5,opt,name=hostname,proto3" json:"hostname,omitempty"`
+	Domainname           string   `protobuf:"bytes,6,opt,name=domainname,proto3" json:"domainname,omitempty"`
+	Port                 int32    `protobuf:"varint,7,opt,name=port,proto3" json:"port,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Account) Reset()         { *m = Account{} }
+func (m *Account) String() string { return proto.CompactTextString(m) }
+func (*Account) ProtoMessage()    {}
+func (*Account) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8e28828dcb8d24f0, []int{0}
+}
+
+func (m *Account) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Account.Unmarshal(m, b)
+}
+func (m *Account) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Account.Marshal(b, m, deterministic)
+}
+func (m *Account) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Account.Merge(m, src)
+}
+func (m *Account) XXX_Size() int {
+	return xxx_messageInfo_Account.Size(m)
+}
+func (m *Account) XXX_DiscardUnknown() {
+	xxx_messageInfo_Account.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Account proto.InternalMessageInfo
+
+func (m *Account) GetNick() string {
+	if m != nil {
+		return m.Nick
+	}
+	return ""
+}
+
+func (m *Account) GetUsername() string {
+	if m != nil {
+		return m.Username
+	}
+	return ""
+}
+
+func (m *Account) GetToken() string {
+	if m != nil {
+		return m.Token
+	}
+	return ""
+}
+
+func (m *Account) GetPassword() string {
+	if m != nil {
+		return m.Password
+	}
+	return ""
+}
+
+func (m *Account) GetHostname() string {
+	if m != nil {
+		return m.Hostname
+	}
+	return ""
+}
+
+func (m *Account) GetDomainname() string {
+	if m != nil {
+		return m.Domainname
+	}
+	return ""
+}
+
+func (m *Account) GetPort() int32 {
+	if m != nil {
+		return m.Port
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*Account)(nil), "witProtobuf.Account")
+}
+
+func init() { proto.RegisterFile("account.proto", fileDescriptor_8e28828dcb8d24f0) }
+
+var fileDescriptor_8e28828dcb8d24f0 = []byte{
+	// 172 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4d, 0x4c, 0x4e, 0xce,
+	0x2f, 0xcd, 0x2b, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x2e, 0xcf, 0x2c, 0x09, 0x00,
+	0xb1, 0x92, 0x4a, 0xd3, 0x94, 0x76, 0x33, 0x72, 0xb1, 0x3b, 0x42, 0xa4, 0x85, 0x84, 0xb8, 0x58,
+	0xf2, 0x32, 0x93, 0xb3, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x21, 0x29, 0x2e,
+	0x8e, 0xd2, 0xe2, 0xd4, 0xa2, 0xbc, 0xc4, 0xdc, 0x54, 0x09, 0x26, 0xb0, 0x38, 0x9c, 0x2f, 0x24,
+	0xc2, 0xc5, 0x5a, 0x92, 0x9f, 0x9d, 0x9a, 0x27, 0xc1, 0x0c, 0x96, 0x80, 0x70, 0x40, 0x3a, 0x0a,
+	0x12, 0x8b, 0x8b, 0xcb, 0xf3, 0x8b, 0x52, 0x24, 0x58, 0x20, 0x3a, 0x60, 0x7c, 0x90, 0x5c, 0x46,
+	0x7e, 0x71, 0x09, 0xd8, 0x34, 0x56, 0x88, 0x1c, 0x8c, 0x2f, 0x24, 0xc7, 0xc5, 0x95, 0x92, 0x9f,
+	0x9b, 0x98, 0x99, 0x07, 0x96, 0x65, 0x03, 0xcb, 0x22, 0x89, 0x80, 0x5c, 0x57, 0x90, 0x5f, 0x54,
+	0x22, 0xc1, 0xae, 0xc0, 0xa8, 0xc1, 0x1a, 0x04, 0x66, 0x27, 0xb1, 0x81, 0x7d, 0x64, 0x0c, 0x08,
+	0x00, 0x00, 0xff, 0xff, 0x9b, 0x98, 0x99, 0x5e, 0xe2, 0x00, 0x00, 0x00,
+}
diff --git a/account.proto b/account.proto
new file mode 100644
index 0000000..0f19fe7
--- /dev/null
+++ b/account.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+package witProtobuf;
+
+message Account {
+	string nick = 1;
+	string username = 2;
+	string token = 3;
+	string password = 4;
+	string hostname = 5;
+	string domainname = 6;
+	int32  port = 7;
+}
diff --git a/config.pb.go b/config.pb.go
index bec4a87..1e7f293 100644
--- a/config.pb.go
+++ b/config.pb.go
@@ -21,21 +21,21 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Config struct {
-	USER                 string            `protobuf:"bytes,1,opt,name=USER,proto3" json:"USER,omitempty"`
-	Width                int32             `protobuf:"varint,2,opt,name=width,proto3" json:"width,omitempty"`
-	Height               int32             `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"`
-	Hostname             string            `protobuf:"bytes,4,opt,name=hostname,proto3" json:"hostname,omitempty"`
-	Debugging            bool              `protobuf:"varint,5,opt,name=debugging,proto3" json:"debugging,omitempty"`
-	Debugtable           bool              `protobuf:"varint,6,opt,name=debugtable,proto3" json:"debugtable,omitempty"`
-	Filename             string            `protobuf:"bytes,7,opt,name=filename,proto3" json:"filename,omitempty"`
-	Accounts             []*Config_Account `protobuf:"bytes,8,rep,name=accounts,proto3" json:"accounts,omitempty"`
-	Counter              int32             `protobuf:"varint,9,opt,name=counter,proto3" json:"counter,omitempty"`
-	Errors               int32             `protobuf:"varint,10,opt,name=errors,proto3" json:"errors,omitempty"`
-	Crashes              int32             `protobuf:"varint,11,opt,name=crashes,proto3" json:"crashes,omitempty"`
-	Crash                string            `protobuf:"bytes,12,opt,name=crash,proto3" json:"crash,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
-	XXX_unrecognized     []byte            `json:"-"`
-	XXX_sizecache        int32             `json:"-"`
+	USER                 string     `protobuf:"bytes,1,opt,name=USER,proto3" json:"USER,omitempty"`
+	Width                int32      `protobuf:"varint,2,opt,name=width,proto3" json:"width,omitempty"`
+	Height               int32      `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"`
+	Hostname             string     `protobuf:"bytes,4,opt,name=hostname,proto3" json:"hostname,omitempty"`
+	Debugging            bool       `protobuf:"varint,5,opt,name=debugging,proto3" json:"debugging,omitempty"`
+	Debugtable           bool       `protobuf:"varint,6,opt,name=debugtable,proto3" json:"debugtable,omitempty"`
+	Filename             string     `protobuf:"bytes,7,opt,name=filename,proto3" json:"filename,omitempty"`
+	Accounts             []*Account `protobuf:"bytes,8,rep,name=accounts,proto3" json:"accounts,omitempty"`
+	Counter              int32      `protobuf:"varint,9,opt,name=counter,proto3" json:"counter,omitempty"`
+	Errors               int32      `protobuf:"varint,10,opt,name=errors,proto3" json:"errors,omitempty"`
+	Crashes              int32      `protobuf:"varint,11,opt,name=crashes,proto3" json:"crashes,omitempty"`
+	Crash                string     `protobuf:"bytes,12,opt,name=crash,proto3" json:"crash,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
 func (m *Config) Reset()         { *m = Config{} }
@@ -112,7 +112,7 @@ func (m *Config) GetFilename() string {
 	return ""
 }
 
-func (m *Config) GetAccounts() []*Config_Account {
+func (m *Config) GetAccounts() []*Account {
 	if m != nil {
 		return m.Accounts
 	}
@@ -147,121 +147,28 @@ func (m *Config) GetCrash() string {
 	return ""
 }
 
-type Config_Account struct {
-	Nick                 string   `protobuf:"bytes,1,opt,name=nick,proto3" json:"nick,omitempty"`
-	Username             string   `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`
-	Token                string   `protobuf:"bytes,3,opt,name=token,proto3" json:"token,omitempty"`
-	Password             string   `protobuf:"bytes,4,opt,name=password,proto3" json:"password,omitempty"`
-	Hostname             string   `protobuf:"bytes,5,opt,name=hostname,proto3" json:"hostname,omitempty"`
-	Domainname           string   `protobuf:"bytes,6,opt,name=domainname,proto3" json:"domainname,omitempty"`
-	Port                 int32    `protobuf:"varint,7,opt,name=port,proto3" json:"port,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Config_Account) Reset()         { *m = Config_Account{} }
-func (m *Config_Account) String() string { return proto.CompactTextString(m) }
-func (*Config_Account) ProtoMessage()    {}
-func (*Config_Account) Descriptor() ([]byte, []int) {
-	return fileDescriptor_3eaf2c85e69e9ea4, []int{0, 0}
-}
-
-func (m *Config_Account) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Config_Account.Unmarshal(m, b)
-}
-func (m *Config_Account) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Config_Account.Marshal(b, m, deterministic)
-}
-func (m *Config_Account) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config_Account.Merge(m, src)
-}
-func (m *Config_Account) XXX_Size() int {
-	return xxx_messageInfo_Config_Account.Size(m)
-}
-func (m *Config_Account) XXX_DiscardUnknown() {
-	xxx_messageInfo_Config_Account.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Config_Account proto.InternalMessageInfo
-
-func (m *Config_Account) GetNick() string {
-	if m != nil {
-		return m.Nick
-	}
-	return ""
-}
-
-func (m *Config_Account) GetUsername() string {
-	if m != nil {
-		return m.Username
-	}
-	return ""
-}
-
-func (m *Config_Account) GetToken() string {
-	if m != nil {
-		return m.Token
-	}
-	return ""
-}
-
-func (m *Config_Account) GetPassword() string {
-	if m != nil {
-		return m.Password
-	}
-	return ""
-}
-
-func (m *Config_Account) GetHostname() string {
-	if m != nil {
-		return m.Hostname
-	}
-	return ""
-}
-
-func (m *Config_Account) GetDomainname() string {
-	if m != nil {
-		return m.Domainname
-	}
-	return ""
-}
-
-func (m *Config_Account) GetPort() int32 {
-	if m != nil {
-		return m.Port
-	}
-	return 0
-}
-
 func init() {
 	proto.RegisterType((*Config)(nil), "witProtobuf.Config")
-	proto.RegisterType((*Config_Account)(nil), "witProtobuf.Config.Account")
 }
 
 func init() { proto.RegisterFile("config.proto", fileDescriptor_3eaf2c85e69e9ea4) }
 
 var fileDescriptor_3eaf2c85e69e9ea4 = []byte{
-	// 327 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0x41, 0x4e, 0xf3, 0x30,
-	0x10, 0x85, 0x95, 0xb6, 0x49, 0x93, 0x69, 0x57, 0xd6, 0xaf, 0x5f, 0xa3, 0x82, 0x50, 0xc4, 0x2a,
-	0xab, 0x2c, 0x60, 0xc1, 0x1a, 0x21, 0xf6, 0xc8, 0x88, 0x03, 0x24, 0xa9, 0x9b, 0x58, 0x6d, 0xed,
-	0xca, 0x76, 0xd4, 0xb3, 0x70, 0x16, 0x2e, 0x87, 0x3c, 0xae, 0x4b, 0x60, 0xf7, 0xbe, 0x19, 0xfb,
-	0xc5, 0xef, 0x29, 0xb0, 0xee, 0xb4, 0xda, 0xc9, 0xbe, 0x3e, 0x19, 0xed, 0x34, 0x5b, 0x9d, 0xa5,
-	0x7b, 0xf3, 0xaa, 0x1d, 0x77, 0xf7, 0x9f, 0x0b, 0xc8, 0x5e, 0x68, 0xcb, 0x18, 0x2c, 0x3e, 0xde,
-	0x5f, 0x39, 0x26, 0x65, 0x52, 0x15, 0x9c, 0x34, 0xfb, 0x07, 0xe9, 0x59, 0x6e, 0xdd, 0x80, 0xb3,
-	0x32, 0xa9, 0x52, 0x1e, 0x80, 0xfd, 0x87, 0x6c, 0x10, 0xb2, 0x1f, 0x1c, 0xce, 0x69, 0x7c, 0x21,
-	0xb6, 0x81, 0x7c, 0xd0, 0xd6, 0xa9, 0xe6, 0x28, 0x70, 0x41, 0x2e, 0x57, 0x66, 0xb7, 0x50, 0x6c,
-	0x45, 0x3b, 0xf6, 0xbd, 0x54, 0x3d, 0xa6, 0x65, 0x52, 0xe5, 0xfc, 0x67, 0xc0, 0xee, 0x00, 0x08,
-	0x5c, 0xd3, 0x1e, 0x04, 0x66, 0xb4, 0x9e, 0x4c, 0xbc, 0xf3, 0x4e, 0x1e, 0x04, 0x39, 0x2f, 0x83,
-	0x73, 0x64, 0xf6, 0x04, 0x79, 0xd3, 0x75, 0x7a, 0x54, 0xce, 0x62, 0x5e, 0xce, 0xab, 0xd5, 0xc3,
-	0x4d, 0x3d, 0x89, 0x58, 0x87, 0x78, 0xf5, 0x73, 0x38, 0xc3, 0xaf, 0x87, 0x19, 0xc2, 0x92, 0x94,
-	0x30, 0x58, 0x50, 0x8e, 0x88, 0x3e, 0xa0, 0x30, 0x46, 0x1b, 0x8b, 0x10, 0x02, 0x06, 0xa2, 0x1b,
-	0xa6, 0xb1, 0x83, 0xb0, 0xb8, 0xba, 0xdc, 0x08, 0xe8, 0x8b, 0x22, 0x89, 0x6b, 0x7a, 0x5d, 0x80,
-	0xcd, 0x57, 0x02, 0xcb, 0xcb, 0x77, 0x7d, 0xbd, 0x4a, 0x76, 0xfb, 0x58, 0xaf, 0xd7, 0x3e, 0xd6,
-	0x68, 0x85, 0xa1, 0x58, 0xb3, 0x10, 0x2b, 0xb2, 0x77, 0x74, 0x7a, 0x2f, 0x14, 0x75, 0x5c, 0xf0,
-	0x00, 0xfe, 0xc6, 0xa9, 0xb1, 0xf6, 0xac, 0xcd, 0x36, 0x56, 0x1c, 0xf9, 0x57, 0xfd, 0xe9, 0x9f,
-	0xfa, 0x7d, 0xc1, 0xfa, 0xd8, 0x48, 0x45, 0xdb, 0x8c, 0xb6, 0x93, 0x89, 0x7f, 0xdd, 0x49, 0x1b,
-	0x47, 0xe5, 0xa6, 0x9c, 0x74, 0x9b, 0xd1, 0xff, 0xf2, 0xf8, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x4b,
-	0xdb, 0xa0, 0x1c, 0x3f, 0x02, 0x00, 0x00,
+	// 255 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0x41, 0x6a, 0xf3, 0x30,
+	0x10, 0x85, 0x71, 0x12, 0x3b, 0xf6, 0x38, 0xff, 0x66, 0x08, 0x3f, 0x43, 0x28, 0xc5, 0x74, 0xe5,
+	0x95, 0x29, 0xed, 0x09, 0x4a, 0xe9, 0xbe, 0xa8, 0xf4, 0x00, 0xb6, 0x23, 0x4b, 0x82, 0xd4, 0x2a,
+	0x92, 0x4c, 0x2e, 0xda, 0x03, 0x15, 0x8f, 0x9c, 0x34, 0xbb, 0xf7, 0xcd, 0xd3, 0x3c, 0xf4, 0x06,
+	0x76, 0xbd, 0x1d, 0x07, 0xa3, 0x9a, 0x6f, 0x67, 0x83, 0xc5, 0xf2, 0x6c, 0xc2, 0xfb, 0xac, 0xba,
+	0x69, 0x38, 0xfc, 0x6b, 0xfb, 0xde, 0x4e, 0x63, 0x88, 0xde, 0xc3, 0xcf, 0x0a, 0xb2, 0x57, 0x7e,
+	0x8c, 0x08, 0x9b, 0xcf, 0x8f, 0x37, 0x41, 0x49, 0x95, 0xd4, 0x85, 0x60, 0x8d, 0x7b, 0x48, 0xcf,
+	0xe6, 0x18, 0x34, 0xad, 0xaa, 0xa4, 0x4e, 0x45, 0x04, 0xfc, 0x0f, 0x99, 0x96, 0x46, 0xe9, 0x40,
+	0x6b, 0x1e, 0x2f, 0x84, 0x07, 0xc8, 0xb5, 0xf5, 0x61, 0x6c, 0xbf, 0x24, 0x6d, 0x38, 0xe5, 0xca,
+	0x78, 0x07, 0xc5, 0x51, 0x76, 0x93, 0x52, 0x66, 0x54, 0x94, 0x56, 0x49, 0x9d, 0x8b, 0xbf, 0x01,
+	0xde, 0x03, 0x30, 0x84, 0xb6, 0x3b, 0x49, 0xca, 0xd8, 0xbe, 0x99, 0xcc, 0xc9, 0x83, 0x39, 0x49,
+	0x4e, 0xde, 0xc6, 0xe4, 0x0b, 0xe3, 0x23, 0xe4, 0x4b, 0x27, 0x4f, 0x79, 0xb5, 0xae, 0xcb, 0xa7,
+	0x7d, 0x73, 0xd3, 0xb8, 0x79, 0x89, 0xa6, 0xb8, 0xbe, 0x42, 0x82, 0x2d, 0x2b, 0xe9, 0xa8, 0xe0,
+	0x02, 0x17, 0x9c, 0x9b, 0x49, 0xe7, 0xac, 0xf3, 0x04, 0xb1, 0x59, 0x24, 0xde, 0x70, 0xad, 0xd7,
+	0xd2, 0x53, 0xb9, 0x6c, 0x44, 0x9c, 0x2f, 0xc4, 0x92, 0x76, 0xfc, 0xad, 0x08, 0x5d, 0xc6, 0xd7,
+	0x7d, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x4b, 0xaf, 0x3e, 0x16, 0x89, 0x01, 0x00, 0x00,
 }
diff --git a/config.proto b/config.proto
index 3b9cddf..fdfbeae 100644
--- a/config.proto
+++ b/config.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package witProtobuf;
 
+import "account.proto";
+
 message Config {
 	string   USER = 1;
 	int32    width = 2;
@@ -14,14 +16,4 @@ message Config {
 	int32    errors = 10;
 	int32    crashes = 11;
 	string   crash = 12;
-
-	message Account {
-		string nick = 1;
-		string username = 2;
-		string token = 3;
-		string password = 4;
-		string hostname = 5;
-		string domainname = 6;
-		int32  port = 7;
-	}
 }
diff --git a/events.pb.go b/events.pb.go
index 2cbc453..f21bc72 100644
--- a/events.pb.go
+++ b/events.pb.go
@@ -83,6 +83,7 @@ type Event struct {
 	Results              []*Event_Response `protobuf:"bytes,8,rep,name=results,proto3" json:"results,omitempty"`
 	Networks             []*Event_Network  `protobuf:"bytes,9,rep,name=networks,proto3" json:"networks,omitempty"`
 	Vms                  []*Event_VM       `protobuf:"bytes,10,rep,name=vms,proto3" json:"vms,omitempty"`
+	Test                 *Config           `protobuf:"bytes,11,opt,name=test,proto3" json:"test,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -183,6 +184,13 @@ func (m *Event) GetVms() []*Event_VM {
 	return nil
 }
 
+func (m *Event) GetTest() *Config {
+	if m != nil {
+		return m.Test
+	}
+	return nil
+}
+
 type Event_Response struct {
 	Type                 Event_EventType `protobuf:"varint,1,opt,name=type,proto3,enum=witProtobuf.Event_EventType" json:"type,omitempty"`
 	Id                   int32           `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`
@@ -439,39 +447,41 @@ func init() {
 func init() { proto.RegisterFile("events.proto", fileDescriptor_8f22242cb04491f9) }
 
 var fileDescriptor_8f22242cb04491f9 = []byte{
-	// 542 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0x4d, 0x6f, 0xd3, 0x40,
-	0x14, 0xc4, 0xdf, 0xf6, 0x6b, 0xa9, 0xac, 0x15, 0xa0, 0x95, 0xdb, 0x43, 0xd4, 0x0b, 0x39, 0x55,
-	0xa8, 0x88, 0xde, 0x0b, 0x71, 0x83, 0x45, 0xbe, 0xb4, 0x0a, 0xe5, 0x58, 0x39, 0xc9, 0x52, 0xac,
-	0xd8, 0x5e, 0x6b, 0x77, 0x9d, 0x28, 0x77, 0x24, 0xee, 0xfc, 0x2c, 0x8e, 0xfc, 0x22, 0xb4, 0x6b,
-	0x3b, 0x8d, 0x44, 0xb8, 0x71, 0x89, 0xde, 0xbc, 0x99, 0xc9, 0xec, 0x8e, 0x6d, 0x38, 0xa5, 0x1b,
-	0x5a, 0x4a, 0x71, 0x55, 0x71, 0x26, 0x19, 0x3a, 0xd9, 0x66, 0x72, 0xa6, 0xa6, 0x45, 0xfd, 0xf5,
-	0xf2, 0xb7, 0x07, 0x4e, 0xac, 0x58, 0xf4, 0x06, 0x6c, 0xb9, 0xab, 0x28, 0x36, 0x7a, 0x46, 0xff,
-	0xec, 0xfa, 0xe2, 0xea, 0x40, 0x75, 0xa5, 0x15, 0xcd, 0xef, 0x7c, 0x57, 0x51, 0xa2, 0x95, 0xe8,
-	0x0c, 0xcc, 0x6c, 0x85, 0xcd, 0x9e, 0xd1, 0x77, 0x88, 0x99, 0xad, 0x10, 0x06, 0x6f, 0xc9, 0x8a,
-	0x82, 0x96, 0x12, 0x5b, 0x3d, 0xa3, 0x1f, 0x90, 0x0e, 0xa2, 0x08, 0xfc, 0x5a, 0x50, 0x5e, 0xa6,
-	0x05, 0xc5, 0xb6, 0xa6, 0xf6, 0x18, 0xbd, 0x00, 0x87, 0x16, 0x69, 0x96, 0x63, 0x47, 0x13, 0x0d,
-	0x50, 0x8e, 0x2a, 0x15, 0x62, 0xcb, 0xf8, 0x0a, 0xbb, 0x8d, 0xa3, 0xc3, 0xca, 0x21, 0xd9, 0x9a,
-	0x96, 0xd8, 0x6b, 0x1c, 0x1a, 0xa0, 0x77, 0xe0, 0x71, 0x2a, 0xea, 0x5c, 0x0a, 0xec, 0xf7, 0xac,
-	0xfe, 0xc9, 0xf5, 0xf9, 0x91, 0x2b, 0x10, 0x2a, 0x2a, 0x56, 0x0a, 0x4a, 0x3a, 0x2d, 0xba, 0x01,
-	0xbf, 0xa4, 0x72, 0xcb, 0xf8, 0x5a, 0xe0, 0x40, 0xfb, 0xa2, 0x23, 0xbe, 0x49, 0x23, 0x21, 0x7b,
-	0x2d, 0x7a, 0x0d, 0xd6, 0xa6, 0x10, 0x18, 0xb4, 0xe5, 0xe5, 0x11, 0xcb, 0xfd, 0x98, 0x28, 0x45,
-	0xf4, 0xd3, 0x00, 0xbf, 0x8b, 0xfd, 0x0f, 0x25, 0x23, 0xb0, 0x75, 0x8d, 0x4d, 0xc3, 0xf6, 0xbe,
-	0x42, 0xce, 0x19, 0x6f, 0xbb, 0x6d, 0x80, 0xaa, 0x50, 0x94, 0x59, 0x55, 0x51, 0x29, 0xb0, 0xd3,
-	0xb3, 0x54, 0x85, 0x1d, 0x8e, 0xbe, 0x1b, 0xe0, 0xb5, 0x77, 0x6a, 0x13, 0x8c, 0xbf, 0x12, 0xcc,
-	0x83, 0x84, 0x73, 0x08, 0x24, 0x93, 0x69, 0xfe, 0xb0, 0xac, 0x6a, 0x1d, 0x6d, 0x11, 0x5f, 0x2f,
-	0x3e, 0x54, 0xf5, 0x13, 0x59, 0xd0, 0x42, 0x1f, 0xa1, 0x23, 0xc7, 0xb4, 0x50, 0x64, 0xce, 0x1e,
-	0xb3, 0xf2, 0xa1, 0xe6, 0xdd, 0x23, 0xf6, 0xf5, 0xe2, 0x33, 0xcf, 0xa3, 0x5f, 0x06, 0x98, 0xf7,
-	0xe3, 0x83, 0x13, 0x58, 0xff, 0x3c, 0x41, 0x04, 0xfe, 0x37, 0x26, 0xe4, 0xc1, 0xdd, 0xf7, 0x58,
-	0xe9, 0x97, 0x55, 0x2d, 0xda, 0x6c, 0x3d, 0xa3, 0x57, 0xe0, 0x16, 0xb4, 0x60, 0x7c, 0xa7, 0x43,
-	0x2d, 0xd2, 0x22, 0xa5, 0x5d, 0x65, 0x62, 0xad, 0x5f, 0x2a, 0x8b, 0xe8, 0x59, 0xed, 0x92, 0xd9,
-	0xe6, 0xa6, 0x7d, 0x9f, 0xf4, 0xac, 0x76, 0x9c, 0xe5, 0x14, 0xfb, 0xcd, 0x4e, 0xcd, 0xe8, 0x02,
-	0x82, 0x45, 0x2a, 0x68, 0x52, 0xa4, 0x8f, 0x14, 0x07, 0x9a, 0x78, 0x5a, 0x5c, 0xfe, 0x30, 0x20,
-	0xd8, 0x3f, 0x3d, 0xe4, 0x81, 0x75, 0x3b, 0x18, 0x84, 0xcf, 0x10, 0x80, 0x3b, 0x88, 0x47, 0xf1,
-	0x3c, 0x0e, 0x0d, 0x74, 0x02, 0xde, 0x6c, 0xfa, 0x25, 0x26, 0xd3, 0x49, 0x68, 0xa2, 0x53, 0xf0,
-	0x1b, 0x70, 0x77, 0x17, 0x5a, 0xe8, 0x39, 0x04, 0x1f, 0x93, 0xf7, 0x31, 0x99, 0xdc, 0xce, 0xe3,
-	0xd0, 0x56, 0xca, 0x71, 0x32, 0x24, 0x0a, 0x38, 0xc8, 0x07, 0x7b, 0x10, 0x8f, 0xa7, 0xa1, 0xab,
-	0xfe, 0x75, 0x18, 0xcf, 0x43, 0x0f, 0x05, 0xe0, 0x8c, 0xa6, 0xc3, 0x64, 0x12, 0xfa, 0xc8, 0x05,
-	0x73, 0xfa, 0x29, 0x0c, 0x94, 0xea, 0xee, 0x36, 0x19, 0x85, 0xb0, 0x70, 0xf5, 0x87, 0xfe, 0xf6,
-	0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xa5, 0x22, 0xd5, 0xf8, 0x03, 0x00, 0x00,
+	// 574 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x4f, 0x4f, 0xdb, 0x4e,
+	0x10, 0xfd, 0xf9, 0xbf, 0x3d, 0xe1, 0x87, 0xac, 0xed, 0x1f, 0xad, 0x0c, 0x07, 0x8b, 0x0b, 0x39,
+	0xa1, 0x8a, 0xaa, 0xdc, 0x29, 0x31, 0xd4, 0x2a, 0x49, 0xd0, 0x2a, 0xa5, 0x47, 0x64, 0x92, 0x85,
+	0x5a, 0xd8, 0x5e, 0x6b, 0x77, 0x9d, 0x28, 0xf7, 0x4a, 0xbd, 0xf7, 0x63, 0xf5, 0x2b, 0xf5, 0x52,
+	0xed, 0xda, 0x0e, 0xa9, 0x9a, 0xde, 0x7a, 0x89, 0xe6, 0xcd, 0x7b, 0x2f, 0x33, 0x3b, 0x33, 0x32,
+	0xec, 0xd1, 0x25, 0xad, 0xa4, 0x38, 0xa9, 0x39, 0x93, 0x0c, 0x0d, 0x56, 0xb9, 0xbc, 0x51, 0xd1,
+	0x7d, 0xf3, 0x10, 0xed, 0xcd, 0x59, 0xf5, 0x90, 0x3f, 0xb6, 0xd4, 0xd1, 0x4f, 0x0f, 0x9c, 0x44,
+	0x69, 0xd1, 0x1b, 0xb0, 0xe5, 0xba, 0xa6, 0xd8, 0x88, 0x8d, 0xe1, 0xfe, 0xe9, 0xe1, 0xc9, 0x96,
+	0xe7, 0x44, 0x2b, 0xda, 0xdf, 0xd9, 0xba, 0xa6, 0x44, 0x2b, 0xd1, 0x3e, 0x98, 0xf9, 0x02, 0x9b,
+	0xb1, 0x31, 0x74, 0x88, 0x99, 0x2f, 0x10, 0x06, 0x6f, 0xce, 0xca, 0x92, 0x56, 0x12, 0x5b, 0xb1,
+	0x31, 0x0c, 0x48, 0x0f, 0x51, 0x04, 0x7e, 0x23, 0x28, 0xaf, 0xb2, 0x92, 0x62, 0x5b, 0x53, 0x1b,
+	0x8c, 0x5e, 0x82, 0x43, 0xcb, 0x2c, 0x2f, 0xb0, 0xa3, 0x89, 0x16, 0x28, 0x47, 0x9d, 0x09, 0xb1,
+	0x62, 0x7c, 0x81, 0xdd, 0xd6, 0xd1, 0x63, 0xe5, 0x90, 0xec, 0x89, 0x56, 0xd8, 0x6b, 0x1d, 0x1a,
+	0xa0, 0x77, 0xe0, 0x71, 0x2a, 0x9a, 0x42, 0x0a, 0xec, 0xc7, 0xd6, 0x70, 0x70, 0x7a, 0xb0, 0xe3,
+	0x09, 0x84, 0x8a, 0x9a, 0x55, 0x82, 0x92, 0x5e, 0x8b, 0xce, 0xc0, 0xaf, 0xa8, 0x5c, 0x31, 0xfe,
+	0x24, 0x70, 0xa0, 0x7d, 0xd1, 0x0e, 0xdf, 0xa4, 0x95, 0x90, 0x8d, 0x16, 0x1d, 0x83, 0xb5, 0x2c,
+	0x05, 0x06, 0x6d, 0x79, 0xb5, 0xc3, 0x72, 0x3b, 0x26, 0x4a, 0x81, 0x8e, 0xc1, 0x96, 0x54, 0x48,
+	0x3c, 0x88, 0x8d, 0xe1, 0xe0, 0xf4, 0xc5, 0x6f, 0xca, 0x0b, 0xbd, 0x0a, 0xa2, 0x05, 0xd1, 0x77,
+	0x03, 0xfc, 0xbe, 0xbf, 0x7f, 0xb0, 0x0d, 0x04, 0xb6, 0x9e, 0x77, 0xbb, 0x0a, 0x7b, 0x33, 0x6b,
+	0xce, 0x19, 0xef, 0x96, 0xd0, 0x02, 0x35, 0x6b, 0x51, 0xe5, 0x75, 0x4d, 0xa5, 0xc0, 0x4e, 0x6c,
+	0xa9, 0x59, 0xf7, 0x38, 0xfa, 0x6a, 0x80, 0xd7, 0x3d, 0xbe, 0xab, 0x60, 0xfc, 0x51, 0xc1, 0xdc,
+	0xaa, 0x70, 0x00, 0x81, 0x64, 0x32, 0x2b, 0xee, 0xe6, 0x75, 0xa3, 0x4b, 0x5b, 0xc4, 0xd7, 0x89,
+	0x8b, 0xba, 0x79, 0x26, 0x4b, 0x5a, 0xea, 0x16, 0x7a, 0x72, 0x4c, 0x4b, 0x45, 0x16, 0xec, 0x31,
+	0xaf, 0xee, 0x1a, 0xde, 0xdf, 0x82, 0xaf, 0x13, 0x9f, 0x78, 0x11, 0xfd, 0x30, 0xc0, 0xbc, 0x1d,
+	0x6f, 0x75, 0x60, 0xfd, 0xb5, 0x83, 0x08, 0xfc, 0x2f, 0x4c, 0xc8, 0xad, 0xb7, 0x6f, 0xb0, 0xd2,
+	0xcf, 0xeb, 0x46, 0x74, 0xb5, 0x75, 0x8c, 0x5e, 0x83, 0x5b, 0xd2, 0x92, 0xf1, 0xb5, 0x2e, 0x6a,
+	0x91, 0x0e, 0x29, 0xed, 0x22, 0x17, 0x4f, 0xfa, 0xfa, 0x2c, 0xa2, 0x63, 0x95, 0x4b, 0x6f, 0x96,
+	0x67, 0xdd, 0xe1, 0xe9, 0x58, 0xe5, 0x38, 0x2b, 0x28, 0xf6, 0xdb, 0x9c, 0x8a, 0xd1, 0x21, 0x04,
+	0xf7, 0x99, 0xa0, 0x69, 0x99, 0x3d, 0x52, 0x1c, 0x68, 0xe2, 0x39, 0x71, 0xf4, 0xcd, 0x80, 0x60,
+	0xb3, 0x3d, 0xe4, 0x81, 0x75, 0x3e, 0x1a, 0x85, 0xff, 0x21, 0x00, 0x77, 0x94, 0x5c, 0x27, 0xb3,
+	0x24, 0x34, 0xd0, 0x00, 0xbc, 0x9b, 0xe9, 0xe7, 0x84, 0x4c, 0x27, 0xa1, 0x89, 0xf6, 0xc0, 0x6f,
+	0xc1, 0xe5, 0x65, 0x68, 0xa1, 0xff, 0x21, 0xf8, 0x90, 0xbe, 0x4f, 0xc8, 0xe4, 0x7c, 0x96, 0x84,
+	0xb6, 0x52, 0x8e, 0xd3, 0x2b, 0xa2, 0x80, 0x83, 0x7c, 0xb0, 0x47, 0xc9, 0x78, 0x1a, 0xba, 0xea,
+	0x5f, 0xaf, 0x92, 0x59, 0xe8, 0xa1, 0x00, 0x9c, 0xeb, 0xe9, 0x55, 0x3a, 0x09, 0x7d, 0xe4, 0x82,
+	0x39, 0xfd, 0x18, 0x06, 0x4a, 0x75, 0x79, 0x9e, 0x5e, 0x87, 0x70, 0xef, 0xea, 0x8f, 0xc0, 0xdb,
+	0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x96, 0xb9, 0x94, 0xca, 0x2f, 0x04, 0x00, 0x00,
 }
diff --git a/events.proto b/events.proto
index 1963de6..a00a83c 100644
--- a/events.proto
+++ b/events.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package witProtobuf;
 
+import "config.proto";
+
 message Event {
 	EventType type = 1;
 	int32 id = 2;
@@ -14,6 +16,8 @@ message Event {
 	repeated Network networks = 9;
 	repeated VM vms = 10;
 
+	Config test = 11;
+
 	enum EventType {
 		ADD = 0;
 		DELETE = 1;
diff --git a/sampleData.go b/sampleData.go
index cc3b6e8..499bd81 100644
--- a/sampleData.go
+++ b/sampleData.go
@@ -148,7 +148,7 @@ func MakeDefaultConfig() *Config {
 		USER:		"jcarr",
 		Width:		700,
 		Height:		500,
-		Accounts:	[]*Config_Account{
+		Accounts:	[]*Account{
 					{
 						Nick:		"jcarr",
 						Username:	"jcarr@wit.com",