diff --git a/project/gen.dep.hpp b/project/gen.dep.hpp
index f315397..0e0ae16 100644
--- a/project/gen.dep.hpp
+++ b/project/gen.dep.hpp
@@ -20,6 +20,7 @@ GEN_NS_BEGIN
 #include "dependencies/string_ops.hpp"
 #include "dependencies/printing.hpp"
 #include "dependencies/containers.hpp"
+#include "dependencies/hashing.hpp"
 #include "dependencies/string.hpp"
 #include "dependencies/parsing.hpp"
 #include "dependencies/timing.hpp"
diff --git a/test/Parsed/Array.Parsed.hpp b/test/Parsed/Array.Parsed.hpp
index 61b19cb..9b400dc 100644
--- a/test/Parsed/Array.Parsed.hpp
+++ b/test/Parsed/Array.Parsed.hpp
@@ -229,7 +229,7 @@ Array<GenArrayRequest> GenArrayRequests;
 void gen__array_request( StrC type, StrC dep = {} )
 {
 	do_once_start
-		GenArrayRequests = Array<GenArrayRequest>::init( Memory::GlobalAllocator );
+		GenArrayRequests = Array<GenArrayRequest>::init( GlobalAllocator );
 	do_once_end
 
 	// Make sure we don't already have a request for the type.
diff --git a/test/Parsed/Buffer.Parsed.hpp b/test/Parsed/Buffer.Parsed.hpp
index 9c48679..77ca4e4 100644
--- a/test/Parsed/Buffer.Parsed.hpp
+++ b/test/Parsed/Buffer.Parsed.hpp
@@ -143,7 +143,7 @@ Array<GenBufferRequest> GenBufferRequests;
 void gen__buffer_request( StrC type, StrC dep = {} )
 {
 	do_once_start
-		GenBufferRequests = Array<GenBufferRequest>::init( Memory::GlobalAllocator );
+		GenBufferRequests = Array<GenBufferRequest>::init( GlobalAllocator );
 	do_once_end
 
 	// Make sure we don't already have a request for the type.
diff --git a/test/Parsed/HashTable.Parsed.hpp b/test/Parsed/HashTable.Parsed.hpp
index ffe15ef..439c8df 100644
--- a/test/Parsed/HashTable.Parsed.hpp
+++ b/test/Parsed/HashTable.Parsed.hpp
@@ -292,7 +292,7 @@ Array<GenHashTableRequest> GenHashTableRequests;
 void gen__hashtable_request( StrC type, StrC dep = {} )
 {
 	do_once_start
-		GenHashTableRequests = Array<GenHashTableRequest>::init( Memory::GlobalAllocator );
+		GenHashTableRequests = Array<GenHashTableRequest>::init( GlobalAllocator );
 
 		gen_array( sw );
 	do_once_end
diff --git a/test/Parsed/Ring.Parsed.hpp b/test/Parsed/Ring.Parsed.hpp
index cf2b1d3..12a3b36 100644
--- a/test/Parsed/Ring.Parsed.hpp
+++ b/test/Parsed/Ring.Parsed.hpp
@@ -109,7 +109,7 @@ Array<GenRingRequest> GenRingRequests;
 void gen__ring_request( StrC type, StrC dep = {} )
 {
 	do_once_start
-		GenRingRequests = Array<GenRingRequest>::init( Memory::GlobalAllocator );
+		GenRingRequests = Array<GenRingRequest>::init( GlobalAllocator );
 	do_once_end
 
 	// Make sure we don't already have a request for the type.
diff --git a/test/Upfront/Array.Upfront.hpp b/test/Upfront/Array.Upfront.hpp
index 6a378e3..ee561c8 100644
--- a/test/Upfront/Array.Upfront.hpp
+++ b/test/Upfront/Array.Upfront.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+
+
 #if GEN_TIME
 #include "gen.hpp"
 
@@ -308,7 +310,7 @@ Array<GenArrayRequest> GenArrayRequests;
 void gen__array_request( StrC type, StrC dep = {} )
 {
 	do_once_start
-		GenArrayRequests = Array<GenArrayRequest>::init( Memory::GlobalAllocator );
+		GenArrayRequests = Array<GenArrayRequest>::init( GlobalAllocator );
 	do_once_end
 
 	// Make sure we don't already have a request for the type.
diff --git a/test/Upfront/Buffer.Upfront.hpp b/test/Upfront/Buffer.Upfront.hpp
index 1a78ded..9ced0d3 100644
--- a/test/Upfront/Buffer.Upfront.hpp
+++ b/test/Upfront/Buffer.Upfront.hpp
@@ -190,6 +190,7 @@ Code gen__buffer( StrC type, sw type_size )
 			, free
 			, get_header
 			, num
+			, pop
 			, wipe
 
 			, op_type_ptr
@@ -212,7 +213,7 @@ Array<GenBufferRequest> GenBufferRequests;
 void gen__buffer_request( StrC type, StrC dep = {} )
 {
 	do_once_start
-		GenBufferRequests = Array<GenBufferRequest>::init( Memory::GlobalAllocator );
+		GenBufferRequests = Array<GenBufferRequest>::init( GlobalAllocator );
 	do_once_end
 
 	// Make sure we don't already have a request for the type.
diff --git a/test/Upfront/HashTable.Upfront.hpp b/test/Upfront/HashTable.Upfront.hpp
index af514ff..2a8d03a 100644
--- a/test/Upfront/HashTable.Upfront.hpp
+++ b/test/Upfront/HashTable.Upfront.hpp
@@ -419,7 +419,7 @@ Array<GenHashTableRequest> GenHashTableRequests;
 void gen__hashtable_request( StrC type, StrC dep = {} )
 {
 	do_once_start
-		GenHashTableRequests = Array<GenHashTableRequest>::init( Memory::GlobalAllocator );
+		GenHashTableRequests = Array<GenHashTableRequest>::init( GlobalAllocator );
 
 		gen_array( sw );
 	do_once_end
diff --git a/test/Upfront/Ring.Upfront.hpp b/test/Upfront/Ring.Upfront.hpp
index e7446b8..ade8614 100644
--- a/test/Upfront/Ring.Upfront.hpp
+++ b/test/Upfront/Ring.Upfront.hpp
@@ -163,7 +163,7 @@ Array<GenRingRequest> GenRingRequests;
 void gen__ring_request( StrC type, StrC dep = {} )
 {
 	do_once_start
-		GenRingRequests = Array<GenRingRequest>::init( Memory::GlobalAllocator );
+		GenRingRequests = Array<GenRingRequest>::init( GlobalAllocator );
 	do_once_end
 
 	// Make sure we don't already have a request for the type.
diff --git a/test/Upfront/Sanity.Upfront.hpp b/test/Upfront/Sanity.Upfront.hpp
index 8508b99..6fb1c07 100644
--- a/test/Upfront/Sanity.Upfront.hpp
+++ b/test/Upfront/Sanity.Upfront.hpp
@@ -286,8 +286,8 @@ u32 gen_sanity_upfront()
 
 	// Using
 	{
-		CodeUsing          reg    = def_using( name(TestUsing), t_u8 );
-		CodeUsingNamespace nspace = def_using_namespace( name(TestNamespace) );
+		CodeUsing reg    = def_using( name(TestUsing), t_u8 );
+		CodeUsing nspace = def_using_namespace( name(TestNamespace) );
 
 		gen_sanity_file.print(reg);
 		gen_sanity_file.print(nspace);
diff --git a/test/test.cpp b/test/test.cpp
index 77114a6..7e96636 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -14,7 +14,7 @@ int gen_main()
 
 	// check_sanity();
 
-	check_SOA();
+	checkSOA();
 
 	return 0;
 }
diff --git a/test/test.Upfront.cpp b/test/test.upfront.cpp
similarity index 100%
rename from test/test.Upfront.cpp
rename to test/test.upfront.cpp