diff --git a/layout/layout_test.go b/layout/layout_test.go
index 8e7b2d01..7d2729d9 100644
--- a/layout/layout_test.go
+++ b/layout/layout_test.go
@@ -257,7 +257,7 @@ func testImage(t *testing.T, when spec.G, it spec.S) {
 			})
 
 			when("existing config has extra fields", func() {
-				it("returns an unmodified digest", func() {
+				it.Focus("returns an unmodified digest", func() {
 					img, err := layout.NewImage(imagePath, layout.FromBaseImagePath(filepath.Join("testdata", "layout", "busybox-latest")))
 					h.AssertNil(t, err)
 					digest, err := img.Digest()
diff --git a/layout/new.go b/layout/new.go
index 9d8586d1..1cf336f6 100644
--- a/layout/new.go
+++ b/layout/new.go
@@ -23,6 +23,8 @@ func NewImage(path string, ops ...ImageOption) (*Image, error) {
 		if err != nil {
 			return nil, err
 		}
+		digest, _ := options.BaseImage.Digest()
+		fmt.Println("XXX Orig", digest)
 	}
 	options.MediaTypes = imgutil.GetPreferredMediaTypes(*options)
 	if options.BaseImage != nil {
@@ -30,6 +32,8 @@ func NewImage(path string, ops ...ImageOption) (*Image, error) {
 		if err != nil {
 			return nil, err
 		}
+		digest, _ := options.BaseImage.Digest()
+		fmt.Println("XXX Facade", digest)
 	}
 
 	if options.PreviousImageRepoName != "" {
@@ -50,6 +54,9 @@ func NewImage(path string, ops ...ImageOption) (*Image, error) {
 		return nil, err
 	}
 
+	manifest, _ := cnbImage.RawManifest()
+	fmt.Println("XXX Manifest: ", string(manifest))
+
 	return &Image{
 		CNBImageCore:      cnbImage,
 		repoPath:          path,
diff --git a/layout/testdata/layout/busybox-latest/blobs/sha256/405fecb6a2fa4f29683f977e7e3b852bf6f8975a2aba647d234d2371894943da b/layout/testdata/layout/busybox-latest/blobs/sha256/405fecb6a2fa4f29683f977e7e3b852bf6f8975a2aba647d234d2371894943da
deleted file mode 100644
index e24db6b6..00000000
Binary files a/layout/testdata/layout/busybox-latest/blobs/sha256/405fecb6a2fa4f29683f977e7e3b852bf6f8975a2aba647d234d2371894943da and /dev/null differ
diff --git a/new.go b/new.go
index 5dfae9eb..31f27723 100644
--- a/new.go
+++ b/new.go
@@ -258,6 +258,7 @@ func NormalizedHistory(history []v1.History, nLayers int) []v1.History {
 }
 
 func prepareNewWindowsImageIfNeeded(image *CNBImageCore) error {
+	fmt.Println("XXX Preparing new Windows image...")
 	configFile, err := getConfigFile(image)
 	if err != nil {
 		return err