diff --git a/clients/internal/base/fhir401_client.go b/clients/internal/base/fhir401_client.go
index beb2111ab..9916bda1e 100644
--- a/clients/internal/base/fhir401_client.go
+++ b/clients/internal/base/fhir401_client.go
@@ -12,6 +12,7 @@ import (
 	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
 	"net/http"
+	"sort"
 	"strings"
 )
 
@@ -79,6 +80,13 @@ func (c *SourceClientFHIR401) SyncAllByPatientEverythingBundle(db models.Databas
 		c.Logger.Errorf("%d error(s) occurred during sync. \n %v", len(syncErrors), syncErrors)
 	}
 
+	db.BackgroundJobCheckpoint(c.Context,
+		map[string]interface{}{
+			"stage":   "PendingResources",
+			"summary": summary,
+		},
+		map[string]interface{}{"errors": syncErrors},
+	)
 	return summary, nil
 }
 
@@ -125,6 +133,8 @@ func (c *SourceClientFHIR401) SyncAllByResourceName(db models.DatabaseRepository
 	lookupResourceReferences := map[string]bool{}
 
 	//query for resources by resource name
+	resourceNames = lo.Uniq(resourceNames)
+	sort.Strings(resourceNames)
 	for _, resourceType := range resourceNames {
 		bundle, err := c.GetResourceBundle(fmt.Sprintf("%s?patient=%s", resourceType, c.SourceCredential.GetPatientId()))
 		if err != nil {
@@ -145,17 +155,38 @@ func (c *SourceClientFHIR401) SyncAllByResourceName(db models.DatabaseRepository
 				syncErrors[resourceType] = err
 				continue
 			}
+		}
 
+		checkpointErrorData := map[string]interface{}{}
+		if len(syncErrors) > 0 {
+			checkpointErrorData["errors"] = syncErrors
 		}
+
+		db.BackgroundJobCheckpoint(c.Context,
+			map[string]interface{}{
+				"stage":   resourceType,
+				"summary": summary,
+			},
+			checkpointErrorData,
+		)
 	}
 
 	//process any pending resources
 	lookupResourceReferences, syncErrors = c.ProcessPendingResources(db, &summary, lookupResourceReferences, syncErrors)
 
+	checkpointErrorData := map[string]interface{}{}
 	if len(syncErrors) > 0 {
-		//TODO: ignore errors.
+		//ignore errors.
 		c.Logger.Errorf("%d error(s) occurred during sync. \n %v", len(syncErrors), syncErrors)
+		checkpointErrorData["errors"] = syncErrors
 	}
+	db.BackgroundJobCheckpoint(c.Context,
+		map[string]interface{}{
+			"stage":   "PendingResources",
+			"summary": summary,
+		},
+		checkpointErrorData,
+	)
 	return summary, nil
 }
 
@@ -290,7 +321,7 @@ func (c *SourceClientFHIR401) GetResourceBundle(relativeResourcePath string) (in
 		}
 	}
 
-	c.Logger.Infof("BUNDLE - %v", bundle)
+	//c.Logger.Debugf("BUNDLE - %v", bundle)
 	return bundle, err
 
 }
diff --git a/clients/models/database_repository.go b/clients/models/database_repository.go
index abac05b62..eb6dfc882 100644
--- a/clients/models/database_repository.go
+++ b/clients/models/database_repository.go
@@ -7,4 +7,5 @@ import (
 //go:generate mockgen -source=database_repository.go -destination=mock/mock_database_repository.go
 type DatabaseRepository interface {
 	UpsertRawResource(ctx context.Context, sourceCredentials SourceCredential, rawResource RawResourceFhir) (bool, error)
+	BackgroundJobCheckpoint(ctx context.Context, checkpointData map[string]interface{}, errorData map[string]interface{})
 }