diff --git a/configfile/main.go b/configfile/main.go
index bbd2c70..627649f 100644
--- a/configfile/main.go
+++ b/configfile/main.go
@@ -14,7 +14,7 @@ import pb "go.wit.com/lib/protobuf/virtbuf"
 //
 
 func main() {
-	TestWriteDroplet()
+	TestWriteCluster()
 
 	in, err := ioutil.ReadFile("/tmp/testing4.protobuf")
 	if err != nil {
@@ -47,7 +47,7 @@ func marshalWriteToFile(myWriter *bufio.Writer, c *pb.Cluster) {
 	log.Println("bufio.Write() tmp2, err = ", tmp2, err)
 }
 
-func TestWriteDroplet() {
+func TestWriteCluster() {
 	buf := new(bytes.Buffer)
 
 	c := pb.CreateSampleCluster(3)
@@ -59,7 +59,7 @@ func TestWriteDroplet() {
 	myWriter := bufio.NewWriter(newfile)
 	marshalWriteToFile(myWriter, c)
 
-	marshalUnmarshal()
+	// marshalUnmarshal()
 }
 
 func marshalUnmarshal() {
diff --git a/sampleData.go b/sampleData.go
index 7f64b96..d0932d4 100644
--- a/sampleData.go
+++ b/sampleData.go
@@ -3,18 +3,22 @@ package virtbuf
 import (
 	"fmt"
 	"log"
+
+	"github.com/google/uuid"
 )
 
 //
-// This generates some sample data. It *should* match the .proto file
+// This generates some sample data.
 //
 
 func CreateSampleDroplet(hostname string) *Droplet {
 	// TODO: flush this out to do all the fields
 	log.Println("CreateSampleDroplet() is generating a new droplet", hostname)
 
+	// Generate a new UUID
+	id := uuid.New()
 	d := &Droplet{
-		Uuid:     "6a1c571b-1d02-462b-9288-63d205306d76",
+		Uuid:     id.String(),
 		Hostname: hostname,
 		Comment:  "this is a droplet for testing",
 	}
@@ -28,8 +32,6 @@ func CreateSampleCluster(total int) *Cluster {
 	for i := 0; i < total; i++ {
 		hostname := fmt.Sprintf("bmath%d.wit.com", i)
 		d := CreateSampleDroplet(hostname)
-
-		// e.Id += 1000 + int32(i)
 		d.Comment = fmt.Sprintf("Sample Droplet %d", i)
 
 		c.Droplets = append(c.Droplets, d)