diff --git a/.bazelrc b/.bazelrc
index f5c694f926..5bb6fce5d6 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,5 +1,7 @@
 build --strategy=Genrule=local
+build --strategy=SwiftCompile=standalone
 build --apple_platform_type=ios
 build --cxxopt='-std=c++14'
 build --copt='-w'
 build --swiftcopt='-Xcc' --swiftcopt='-w'
+build --features=swift.enable_batch_mode
diff --git a/Wallet/BUILD b/Wallet/BUILD
index 2d99970a18..555004e6e5 100644
--- a/Wallet/BUILD
+++ b/Wallet/BUILD
@@ -22,6 +22,13 @@ genrule(
     cmd = version_info_plist_source,
 )
 
+filegroup(
+    name = "Strings",
+    srcs = glob([
+        "Strings/**/*",
+    ], exclude = ["Strings/**/.*"]),
+)
+
 objc_library(
     name = "Main",
     srcs = [
@@ -34,6 +41,9 @@ swift_library(
     srcs = glob([
         "Sources/**/*.swift",
     ]),
+    data = [
+        ":Strings",
+    ],
     deps = [
         "//submodules/GZip:GZip",
         "//submodules/AsyncDisplayKit:AsyncDisplayKit",
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+AsyncDisplay.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+AsyncDisplay.mm
index 7b17b06f82..068f5509a7 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+AsyncDisplay.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+AsyncDisplay.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "_ASCoreAnimationExtras.h"
+#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
 #import <AsyncDisplayKit/_ASAsyncTransaction.h>
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 #import <AsyncDisplayKit/ASAssert.h>
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+UIViewBridge.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+UIViewBridge.mm
index a1ace00a62..084800a1ed 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+UIViewBridge.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+UIViewBridge.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "_ASCoreAnimationExtras.h"
+#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
 #import "_ASPendingState.h"
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 #import "ASDisplayNodeInternal.h"
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm
index 358a007f2a..e8607e273c 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm
@@ -19,7 +19,7 @@
 
 #import <AsyncDisplayKit/_ASAsyncTransaction.h>
 #import "_ASAsyncTransactionContainer+Private.h"
-#import "_ASCoreAnimationExtras.h"
+#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 #import <AsyncDisplayKit/_ASDisplayView.h>
 #import "_ASPendingState.h"
diff --git a/submodules/AsyncDisplayKit/Source/_ASCoreAnimationExtras.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASCoreAnimationExtras.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/_ASCoreAnimationExtras.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASCoreAnimationExtras.h
diff --git a/submodules/AsyncDisplayKit/Source/_ASCoreAnimationExtras.mm b/submodules/AsyncDisplayKit/Source/_ASCoreAnimationExtras.mm
index a8a0a9fe89..b55bd6442f 100644
--- a/submodules/AsyncDisplayKit/Source/_ASCoreAnimationExtras.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASCoreAnimationExtras.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "_ASCoreAnimationExtras.h"
+#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
 #import <AsyncDisplayKit/ASAssert.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/_ASDisplayView.mm b/submodules/AsyncDisplayKit/Source/_ASDisplayView.mm
index 0d24318b3f..365b141bbf 100644
--- a/submodules/AsyncDisplayKit/Source/_ASDisplayView.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASDisplayView.mm
@@ -10,7 +10,7 @@
 #import <AsyncDisplayKit/_ASDisplayView.h>
 #import "_ASDisplayViewAccessiblity.h"
 
-#import "_ASCoreAnimationExtras.h"
+#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 #import "ASDisplayNodeInternal.h"
 #import <AsyncDisplayKit/ASDisplayNode+Convenience.h>
diff --git a/submodules/AsyncDisplayKit/Source/_ASPendingState.mm b/submodules/AsyncDisplayKit/Source/_ASPendingState.mm
index 5ee9c60576..5bf75e50d1 100644
--- a/submodules/AsyncDisplayKit/Source/_ASPendingState.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASPendingState.mm
@@ -9,7 +9,7 @@
 
 #import "_ASPendingState.h"
 
-#import "_ASCoreAnimationExtras.h"
+#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
diff --git a/submodules/Display/Source/Nodes/ASImageNode.swift b/submodules/Display/Source/Nodes/ASImageNode.swift
index b7c2d02d44..27daca0422 100644
--- a/submodules/Display/Source/Nodes/ASImageNode.swift
+++ b/submodules/Display/Source/Nodes/ASImageNode.swift
@@ -6,8 +6,16 @@ open class ASImageNode: ASDisplayNode {
     public var image: UIImage? {
         didSet {
             if self.isNodeLoaded {
-                self.contents = self.image?.cgImage
-                //(self.view as? ASImageNodeView)?.image = self.image
+                if let image = self.image {
+                    let capInsets = image.capInsets
+                    if capInsets.left.isZero && capInsets.top.isZero {
+                        ASDisplayNodeSetResizableContents(self, image)
+                    } else {
+                        self.contents = self.image?.cgImage
+                    }
+                } else {
+                    self.contents = nil
+                }
             }
         }
     }
@@ -16,15 +24,5 @@ open class ASImageNode: ASDisplayNode {
 
     override public init() {
         super.init()
-
-        /*self.setViewBlock({
-            return ASImageNodeView(frame: CGRect())
-        })*/
-    }
-
-    override open func didLoad() {
-        super.didLoad()
-
-        //(self.view as? ASImageNodeView)?.image = self.image
     }
 }
diff --git a/submodules/WalletUI/BUILD b/submodules/WalletUI/BUILD
index 0f92b151d7..2d352e26df 100644
--- a/submodules/WalletUI/BUILD
+++ b/submodules/WalletUI/BUILD
@@ -1,21 +1,5 @@
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
-'''apple_resource(
-    name = "WalletUIResources",
-    files = glob([
-        "Resources/**/*",
-    ], exclude = ["Resources/**/.*"]),
-    visibility = ["PUBLIC"],
-)'''
-
-'''apple_asset_catalog(
-    name = 'WalletUIAssets',
-    dirs = [
-        "WalletImages.xcassets",
-    ],
-    visibility = ["PUBLIC"],
-)'''
-
 filegroup(
     name = "WalletUIResources",
     srcs = glob([