diff --git a/aws/cwatch/service.go b/aws/cwatch/service.go
index e38f8f4..02f43db 100644
--- a/aws/cwatch/service.go
+++ b/aws/cwatch/service.go
@@ -21,27 +21,31 @@ type Service struct {
 }
 
 // NewService creates a new Cloudwatch service with the given credentials and configuration
-func NewService(accessKey, secretKey, region, namespace, deployment string, wg *sync.WaitGroup) (*Service, error) {
+func NewService(accessKey, secretKey, region, namespace, deployment string) (*Service, error) {
 	cfg, err := awsx.NewConfig(accessKey, secretKey, region)
 	if err != nil {
 		return nil, err
 	}
 
-	s := &Service{
+	return &Service{
 		Client:     cloudwatch.NewFromConfig(cfg),
 		namespace:  namespace,
 		deployment: types.Dimension{Name: aws.String("Deployment"), Value: aws.String(deployment)},
-	}
-	s.batcher = syncx.NewBatcher(s.processBatch, 100, time.Second*3, 1000, wg)
-
-	return s, nil
+	}, nil
 }
 
-func (s *Service) Start() {
+func (s *Service) StartQueue(wg *sync.WaitGroup) {
+	if s.batcher != nil {
+		panic("queue already started")
+	}
+	s.batcher = syncx.NewBatcher(s.processBatch, 100, time.Second*3, 1000, wg)
 	s.batcher.Start()
 }
 
-func (s *Service) Stop() {
+func (s *Service) StopQueue() {
+	if s.batcher == nil {
+		panic("queue wasn't started")
+	}
 	s.batcher.Stop()
 }
 
diff --git a/aws/cwatch/service_test.go b/aws/cwatch/service_test.go
index 4b20b3e..30afe03 100644
--- a/aws/cwatch/service_test.go
+++ b/aws/cwatch/service_test.go
@@ -12,9 +12,7 @@ import (
 )
 
 func TestService(t *testing.T) {
-	wg := &sync.WaitGroup{}
-
-	svc, err := cwatch.NewService("root", "key", "us-east-1", "Foo", "testing", wg)
+	svc, err := cwatch.NewService("root", "key", "us-east-1", "Foo", "testing")
 	assert.NoError(t, err)
 
 	assert.Equal(t, &cloudwatch.PutMetricDataInput{
@@ -41,9 +39,8 @@ func TestService(t *testing.T) {
 		{MetricName: aws.String("NumSheep"), Dimensions: []types.Dimension{{Name: aws.String("Host"), Value: aws.String("foo1")}}, Value: aws.Float64(20)},
 	}))
 
-	svc.Start()
-
-	svc.Stop()
-
+	wg := &sync.WaitGroup{}
+	svc.StartQueue(wg)
+	svc.StopQueue()
 	wg.Wait()
 }