diff --git a/CMakeLists.txt b/CMakeLists.txt
index f796797f..1697b74c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ add_definitions(
 	-DNDEBUG=1
 	-D__KEYCHAINCORE__=1
 	-DOSSPINLOCK_USE_INLINED=0
+	-DDTRACE_PROBES_DISABLED
 )
 
 include_directories(
diff --git a/OSX/CMakeLists.txt b/OSX/CMakeLists.txt
index 3202ad25..8f9eb9a7 100644
--- a/OSX/CMakeLists.txt
+++ b/OSX/CMakeLists.txt
@@ -26,6 +26,86 @@ add_subdirectory(libsecurity_sd_cspdl)
 add_subdirectory(libsecurity_smime)
 add_subdirectory(libsecurity_ssl)
 add_subdirectory(libsecurity_transform)
+add_subdirectory(libsecurity_translocate)
 add_subdirectory(libsecurity_utilities)
 add_subdirectory(libsecurityd)
 add_subdirectory(utilities)
+
+set(DYLIB_COMPAT_VERSION "1.0.0")
+set(DYLIB_CURRENT_VERSION "57740.51.3")
+
+set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-flat_namespace,-undefined,suppress")
+
+add_framework(Security
+	FAT
+	CURRENT_VERSION
+	VERSION "A"
+
+	SOURCES
+		lib/dummy.cpp
+		Breadcrumb/SecBreadcrumb.c
+		../../coretls/coretls_cfhelpers/tls_helpers.c
+		../../coretls/coretls_cfhelpers/tls_helpers_identity.c
+		../../coretls/lib/sslMemory.c
+
+		#$<TARGET_OBJECTS:libsecurity_asn1>
+		#$<TARGET_OBJECTS:libSecItemShimOSX>
+		$<TARGET_OBJECTS:libSecOtrOSX>
+		#$<TARGET_OBJECTS:libSecTrustOSX>
+		#$<TARGET_OBJECTS:libSecureObjectSync>
+		$<TARGET_OBJECTS:liblogging>
+		$<TARGET_OBJECTS:libsecipc_client>
+		$<TARGET_OBJECTS:libsecurity_apple_csp>
+		$<TARGET_OBJECTS:libsecurity_apple_cspdl>
+		$<TARGET_OBJECTS:libsecurity_apple_file_dl>
+		$<TARGET_OBJECTS:libsecurity_apple_x509_cl>
+		#$<TARGET_OBJECTS:libsecurity_apple_x509_tp>
+		$<TARGET_OBJECTS:libsecurity_authorization>
+		$<TARGET_OBJECTS:libsecurity_cdsa_client>
+		$<TARGET_OBJECTS:libsecurity_cdsa_plugin>
+		$<TARGET_OBJECTS:libsecurity_cdsa_utilities>
+		#$<TARGET_OBJECTS:libsecurity_cdsa_utils>
+		$<TARGET_OBJECTS:libsecurity_checkpw>
+		$<TARGET_OBJECTS:libsecurity_cms>
+		$<TARGET_OBJECTS:libsecurity_codesigning>
+		$<TARGET_OBJECTS:libsecurity_comcryption>
+		$<TARGET_OBJECTS:libsecurity_cryptkit>
+		$<TARGET_OBJECTS:libsecurity_cssm>
+		$<TARGET_OBJECTS:libsecurity_filedb>
+		#$<TARGET_OBJECTS:libsecurity_keychain>
+		$<TARGET_OBJECTS:libsecurity_keychain_DER>
+		$<TARGET_OBJECTS:libsecurity_manifest>
+		$<TARGET_OBJECTS:libsecurity_mds>
+		$<TARGET_OBJECTS:libsecurity_ocspd>
+		$<TARGET_OBJECTS:libsecurity_pkcs12>
+		$<TARGET_OBJECTS:libsecurity_sd_cspdl>
+		$<TARGET_OBJECTS:libsecurity_smime>
+		#$<TARGET_OBJECTS:libsecurity_ssl>
+		$<TARGET_OBJECTS:libsecurity_transform>
+		$<TARGET_OBJECTS:libsecurity_translocate>
+		$<TARGET_OBJECTS:libsecurity_utilities>
+		$<TARGET_OBJECTS:libsecurityd_client>
+		$<TARGET_OBJECTS:libutilities>
+
+	DEPENDENCIES
+		system
+		#coretls_cfhelpers
+		objc
+		pam.2
+		bsm.0
+		auto
+		z
+		xar
+		sqlite3
+		CoreFoundation
+
+		# Static libraries
+		#libsecurity_asn1	
+		#libSecItemShimOSX
+		#libSecTrustOSX
+		#libSecureObjectSync	
+		#libsecurity_cdsa_utils	
+		#libsecurity_apple_x509_tp
+		#libsecurity_keychain
+		#libsecurity_ssl
+)
diff --git a/OSX/libsecurity_apple_x509_tp/CMakeLists.txt b/OSX/libsecurity_apple_x509_tp/CMakeLists.txt
index 7b8d5fd0..0f6702b4 100644
--- a/OSX/libsecurity_apple_x509_tp/CMakeLists.txt
+++ b/OSX/libsecurity_apple_x509_tp/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/lib
 )
 
-add_library(libsecurity_apple_x509_tp OBJECT
+add_darling_static_library(libsecurity_apple_x509_tp
 	lib/TPDatabase.cpp
 	lib/TPCertInfo.cpp
 	lib/AppleTP.cpp
@@ -22,4 +22,4 @@ add_library(libsecurity_apple_x509_tp OBJECT
 	lib/tpOcspCertVfy.cpp
 	lib/tpCredRequest.cpp
 )
-make_fat(libsecurity_apple_x509_tp)
+#make_fat(libsecurity_apple_x509_tp)
diff --git a/OSX/libsecurity_asn1/CMakeLists.txt b/OSX/libsecurity_asn1/CMakeLists.txt
index d7a7bda8..69a5074a 100644
--- a/OSX/libsecurity_asn1/CMakeLists.txt
+++ b/OSX/libsecurity_asn1/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_library(libsecurity_asn1 OBJECT
+add_darling_static_library(libsecurity_asn1
 	lib/X509Templates.c
 	lib/keyTemplates.c
 	lib/SecAsn1Templates.c
@@ -27,4 +27,4 @@ add_library(libsecurity_asn1 OBJECT
 	lib/SecAsn1Coder.c
 	lib/secasn1u.c
 )
-make_fat(libsecurity_asn1)
+#make_fat(libsecurity_asn1)
diff --git a/OSX/libsecurity_cdsa_utils/CMakeLists.txt b/OSX/libsecurity_cdsa_utils/CMakeLists.txt
index 55296cf7..e7ea878c 100644
--- a/OSX/libsecurity_cdsa_utils/CMakeLists.txt
+++ b/OSX/libsecurity_cdsa_utils/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/lib
 )
 
-add_library(libsecurity_cdsa_utils OBJECT
+add_darling_static_library(libsecurity_cdsa_utils
 	lib/cuPem.cpp
 	lib/cuEnc64.c
 	lib/cuCdsaUtils.cpp
@@ -12,4 +12,4 @@ add_library(libsecurity_cdsa_utils OBJECT
 	lib/cuTimeStr.cpp
 	lib/cuFileIo.c
 )
-make_fat(libsecurity_cdsa_utils)
+#make_fat(libsecurity_cdsa_utils)
diff --git a/OSX/libsecurity_keychain/CMakeLists.txt b/OSX/libsecurity_keychain/CMakeLists.txt
index 07583dc7..8fe189d5 100644
--- a/OSX/libsecurity_keychain/CMakeLists.txt
+++ b/OSX/libsecurity_keychain/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/libDER
 )
 
-add_library(libsecurity_keychain OBJECT
+add_darling_static_library(libsecurity_keychain
 	lib/ACL.cpp
 	lib/Access.cpp
 	lib/CCallbackMgr.cp
@@ -84,7 +84,34 @@ add_library(libsecurity_keychain OBJECT
 	lib/defaultcreds.cpp
 	lib/tsaDERUtilities.c
 )
-make_fat(libsecurity_keychain)
+set(auto_sources
+	Admin.cpp
+	auto_gdb_interface.cpp
+	auto_impl_utilities.c
+	auto_weak.cpp
+	auto_zone.cpp
+	Bitmap.cpp
+	BlockRef.cpp
+	ClearStack.cpp
+	Definitions.cpp
+	Environment.cpp
+	InUseEnumerator.cpp
+	Large.cpp
+	PointerHash.cpp
+	Region.cpp
+	Subzone.cpp
+	SubzonePartition.cpp
+	Thread.cpp
+	ThreadLocalCollector.cpp
+	WriteBarrier.cpp
+	ZoneCollectionChecking.cpp
+	ZoneCollectors.cpp
+	ZoneCompaction.cpp
+	Zone.cpp
+	ZoneDump.cpp
+)
+
+#make_fat(libsecurity_keychain)
 
 add_library(libsecurity_keychain_DER OBJECT
 	libDER/libDER/DER_Decode.c
diff --git a/OSX/libsecurity_ssl/CMakeLists.txt b/OSX/libsecurity_ssl/CMakeLists.txt
index 8e57db55..a9a86dac 100644
--- a/OSX/libsecurity_ssl/CMakeLists.txt
+++ b/OSX/libsecurity_ssl/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/lib
 )
 
-add_library(libsecurity_ssl OBJECT
+add_darling_static_library(libsecurity_ssl
 	lib/sslRecord.c
 	lib/sslContext.c
 	lib/tlsCallbacks.c
@@ -13,4 +13,4 @@ add_library(libsecurity_ssl OBJECT
 	lib/sslCipherSpecs.c
 	lib/sslCrypto.c
 )
-make_fat(libsecurity_ssl)
+#make_fat(libsecurity_ssl)
diff --git a/OSX/sec/CMakeLists.txt b/OSX/sec/CMakeLists.txt
index d77072d9..071afcdf 100644
--- a/OSX/sec/CMakeLists.txt
+++ b/OSX/sec/CMakeLists.txt
@@ -25,7 +25,7 @@ add_library(libSecOtrOSX OBJECT
 )
 make_fat(libSecOtrOSX)
 
-add_library(libSecureObjectSync OBJECT
+add_darling_static_library(libSecureObjectSync
 	SOSCircle/Tool/accountCirclesViewsPrint.c
 	SOSCircle/SecureObjectSync/SOSBackupInformation.c
 	SOSCircle/SecureObjectSync/SOSAccount.c
@@ -99,7 +99,7 @@ add_library(libSecureObjectSync OBJECT
 	SOSCircle/Tool/secToolFileIO.c
 	SOSCircle/Tool/secViewDisplay.c
 )
-make_fat(libSecureObjectSync)
+#make_fat(libSecureObjectSync)
 
 add_library(liblogging OBJECT
 	Security/SecLogging.c
@@ -110,7 +110,7 @@ add_definitions(
 	-DECITEM_SHIM_OSX=1
 )
 
-add_library(libSecItemShimOSX OBJECT
+add_darling_static_library(libSecItemShimOSX
 	Security/SecItemBackup.c
 	Security/SecKeyAdaptors.c
 	Security/SecCFAllocator.c
@@ -126,9 +126,9 @@ add_library(libSecItemShimOSX OBJECT
 	Security/SecItemConstants.c
 	Security/SecPasswordGenerate.c
 )
-make_fat(libSecItemShimOSX)
+#make_fat(libSecItemShimOSX)
 
-add_library(libSecTrustOSX OBJECT
+add_darling_static_library(libSecTrustOSX
 	Security/SecCertificateRequest.c
 	Security/SecCertificate.c
 	Security/SecDigest.c
@@ -146,7 +146,7 @@ add_library(libSecTrustOSX OBJECT
 	../utilities/src/SecInternalRelease.c
 	Security/SecSignatureVerificationSupport.c
 )
-make_fat(libSecTrustOSX)
+#make_fat(libSecTrustOSX)
 
 add_library(libsecipc_client OBJECT
 	ipc/client.c
diff --git a/include/Security/SecBreadcrumb.h b/include/Security/SecBreadcrumb.h
new file mode 120000
index 00000000..57798346
--- /dev/null
+++ b/include/Security/SecBreadcrumb.h
@@ -0,0 +1 @@
+../../OSX/Breadcrumb/SecBreadcrumb.h
\ No newline at end of file
diff --git a/internal-include/SecCFAllocator.h b/internal-include/SecCFAllocator.h
new file mode 120000
index 00000000..56193118
--- /dev/null
+++ b/internal-include/SecCFAllocator.h
@@ -0,0 +1 @@
+../OSX/sec/Security/SecCFAllocator.h
\ No newline at end of file
diff --git a/internal-include/sslMemory.h b/internal-include/sslMemory.h
new file mode 120000
index 00000000..15cf4ce1
--- /dev/null
+++ b/internal-include/sslMemory.h
@@ -0,0 +1 @@
+../../coretls/lib/sslMemory.h
\ No newline at end of file
diff --git a/internal-include/tls_helpers.h b/internal-include/tls_helpers.h
new file mode 120000
index 00000000..359c2fda
--- /dev/null
+++ b/internal-include/tls_helpers.h
@@ -0,0 +1 @@
+../../coretls/coretls_cfhelpers/tls_helpers.h
\ No newline at end of file
diff --git a/internal-include/tls_types.h b/internal-include/tls_types.h
new file mode 120000
index 00000000..a51c3e65
--- /dev/null
+++ b/internal-include/tls_types.h
@@ -0,0 +1 @@
+../../coretls/lib/tls_types.h
\ No newline at end of file