diff --git a/test/codeblocks/ETL.cbp b/test/codeblocks/ETL.cbp
index 61bbedcc..5b2f4af8 100644
--- a/test/codeblocks/ETL.cbp
+++ b/test/codeblocks/ETL.cbp
@@ -219,6 +219,10 @@
 		<Unit filename="../../src/random.cpp" />
 		<Unit filename="../../src/random.h" />
 		<Unit filename="../../src/ratio.h" />
+		<Unit filename="../../src/reference_flat_map.h" />
+		<Unit filename="../../src/reference_flat_multimap.h" />
+		<Unit filename="../../src/reference_flat_multiset.h" />
+		<Unit filename="../../src/reference_flat_set.h" />
 		<Unit filename="../../src/set.h" />
 		<Unit filename="../../src/smallest.h" />
 		<Unit filename="../../src/stack.h" />
@@ -271,10 +275,6 @@
 		<Unit filename="../test_hash.cpp" />
 		<Unit filename="../test_instance_count.cpp" />
 		<Unit filename="../test_integral_limits.cpp" />
-		<Unit filename="../test_intrusive_flat_map.cpp" />
-		<Unit filename="../test_intrusive_flat_multimap.cpp" />
-		<Unit filename="../test_intrusive_flat_multiset.cpp" />
-		<Unit filename="../test_intrusive_flat_set.cpp" />
 		<Unit filename="../test_intrusive_forward_list.cpp" />
 		<Unit filename="../test_intrusive_links.cpp" />
 		<Unit filename="../test_intrusive_list.cpp" />
@@ -299,6 +299,10 @@
 		<Unit filename="../test_priority_queue.cpp" />
 		<Unit filename="../test_queue.cpp" />
 		<Unit filename="../test_random.cpp" />
+		<Unit filename="../test_reference_flat_map.cpp" />
+		<Unit filename="../test_reference_flat_multimap.cpp" />
+		<Unit filename="../test_reference_flat_multiset.cpp" />
+		<Unit filename="../test_reference_flat_set.cpp" />
 		<Unit filename="../test_set.cpp" />
 		<Unit filename="../test_smallest.cpp" />
 		<Unit filename="../test_stack.cpp" />
diff --git a/test/codeblocks/ETL.depend b/test/codeblocks/ETL.depend
index e5fb5a82..f3bcb39a 100644
--- a/test/codeblocks/ETL.depend
+++ b/test/codeblocks/ETL.depend
@@ -3289,7 +3289,7 @@
 	"CurrentTest.h"
 	"ReportAssertImpl.h"
 
-1494277861 source:d:\users\john\documents\programming\github\etl\test\test_algorithm.cpp
+1494283539 source:d:\users\john\documents\programming\github\etl\test\test_algorithm.cpp
 	"UnitTest++.h"
 	"algorithm.h"
 	"container.h"
@@ -3726,7 +3726,7 @@
 
 1482623723 v_1.h"
 
-1494279862 source:d:\users\john\documents\programming\github\etl\test\test_forward_list.cpp
+1494283539 source:d:\users\john\documents\programming\github\etl\test\test_forward_list.cpp
 	"UnitTest++.h"
 	"ExtraCheckMacros.h"
 	"data.h"
@@ -3843,7 +3843,7 @@
 1450265856 d:\users\john\documents\programming\github\etl\largest.h
 	"type_traits.h"
 
-1494279862 source:d:\users\john\documents\programming\github\etl\test\test_list.cpp
+1494283539 source:d:\users\john\documents\programming\github\etl\test\test_list.cpp
 	"UnitTest++.h"
 	"ExtraCheckMacros.h"
 	"list.h"
@@ -5230,7 +5230,7 @@
 
 1452516033 /home/jwellbelove/Programming/etl/visitor.h
 
-1494279862 source:d:\users\john\documents\programming\github\etl\test\test_intrusive_forward_list.cpp
+1494283539 source:d:\users\john\documents\programming\github\etl\test\test_intrusive_forward_list.cpp
 	"UnitTest++.h"
 	"ExtraCheckMacros.h"
 	"data.h"
@@ -6087,7 +6087,7 @@
 
 1482358550 trusive_links.h"
 
-1494278815 source:d:\users\john\documents\programming\github\etl\test\test_intrusive_list.cpp
+1494283539 source:d:\users\john\documents\programming\github\etl\test\test_intrusive_list.cpp
 	"UnitTest++.h"
 	"ExtraCheckMacros.h"
 	"data.h"
@@ -7970,7 +7970,7 @@
 	"UnitTest++.h"
 	"iterator.h"
 
-1494278993 source:d:\users\john\documents\programming\github\etl\test\test_memory.cpp
+1494283539 source:d:\users\john\documents\programming\github\etl\test\test_memory.cpp
 	"UnitTest++.h"
 	"memory.h"
 	"debug_count.h"
@@ -8173,3 +8173,91 @@
 	"HelperMacros.h"
 	<csetjmp>
 
+1494362778 source:d:\users\john\documents\programming\github\etl\test\test_reference_flat_map.cpp
+	"UnitTest++.h"
+	<map>
+	<array>
+	<algorithm>
+	<utility>
+	<iterator>
+	<string>
+	<vector>
+	<iostream>
+	"data.h"
+	"reference_flat_map.h"
+
+1494362778 d:\users\john\documents\programming\github\etl\src\reference_flat_map.h
+	<stddef.h>
+	"exception.h"
+	"vector.h"
+	"error_handler.h"
+
+1494362778 source:d:\users\john\documents\programming\github\etl\test\test_reference_flat_multimap.cpp
+	"UnitTest++.h"
+	<map>
+	<array>
+	<algorithm>
+	<utility>
+	<iterator>
+	<string>
+	<vector>
+	"data.h"
+	"reference_flat_multimap.h"
+
+1494362778 d:\users\john\documents\programming\github\etl\src\reference_flat_multimap.h
+	<stddef.h>
+	"exception.h"
+	"error_handler.h"
+	"debug_count.h"
+	"vector.h"
+
+1494362778 source:d:\users\john\documents\programming\github\etl\test\test_reference_flat_multiset.cpp
+	"UnitTest++.h"
+	<set>
+	<array>
+	<algorithm>
+	<utility>
+	<iterator>
+	<string>
+	<vector>
+	"data.h"
+	"reference_flat_multiset.h"
+
+1494362778 d:\users\john\documents\programming\github\etl\src\reference_flat_multiset.h
+	<iterator>
+	<algorithm>
+	<functional>
+	<utility>
+	<stddef.h>
+	"platform.h"
+	"type_traits.h"
+	"vector.h"
+	"pool.h"
+	"error_handler.h"
+	"exception.h"
+
+1494362778 source:d:\users\john\documents\programming\github\etl\test\test_reference_flat_set.cpp
+	"UnitTest++.h"
+	<set>
+	<array>
+	<algorithm>
+	<utility>
+	<iterator>
+	<string>
+	<vector>
+	"data.h"
+	"reference_flat_set.h"
+
+1494362778 d:\users\john\documents\programming\github\etl\src\reference_flat_set.h
+	<iterator>
+	<algorithm>
+	<functional>
+	<utility>
+	<stddef.h>
+	"platform.h"
+	"type_traits.h"
+	"pool.h"
+	"error_handler.h"
+	"exception.h"
+	"vector.h"
+
diff --git a/test/codeblocks/ETL.layout b/test/codeblocks/ETL.layout
index 8ecd9372..c0d3ac7a 100644
--- a/test/codeblocks/ETL.layout
+++ b/test/codeblocks/ETL.layout
@@ -2,134 +2,24 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Windows" />
-	<File name="..\..\..\unittest-cpp\UnitTest++\TestReporterStdout.cpp" open="0" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="883" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\test_intrusive_forward_list.cpp" open="1" top="0" tabpos="26" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="27667" topLine="693" />
-		</Cursor>
-	</File>
-	<File name="..\test_intrusive_flat_map.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2984" topLine="53" />
-		</Cursor>
-	</File>
-	<File name="..\test_forward_list.cpp" open="1" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="8440" topLine="209" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\TestRunner.cpp" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2279" topLine="25" />
-		</Cursor>
-	</File>
-	<File name="..\test_flat_multiset.cpp" open="1" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3011" topLine="58" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\ExecuteTest.h" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="426" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\Test.cpp" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="699" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\test_list.cpp" open="1" top="1" tabpos="27" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="17369" topLine="487" />
-		</Cursor>
-	</File>
-	<File name="..\test_algorithm.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="11590" topLine="274" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\binary.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="14624" topLine="373" />
-		</Cursor>
-	</File>
-	<File name="..\test_intrusive_flat_set.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="9812" topLine="311" />
-		</Cursor>
-	</File>
-	<File name="..\test_flat_set.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="11541" topLine="359" />
-		</Cursor>
-	</File>
-	<File name="..\test_io_port.cpp" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1452" topLine="3" />
-		</Cursor>
-	</File>
-	<File name="..\test_map.cpp" open="1" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="6368" topLine="164" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\Checks.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="469" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\algorithm.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="0" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\Config.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="792" topLine="7" />
-		</Cursor>
-	</File>
-	<File name="..\..\src\intrusive_flat_map.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4065" topLine="242" />
-		</Cursor>
-	</File>
-	<File name="..\test_memory.cpp" open="1" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="15446" topLine="391" />
-		</Cursor>
-	</File>
-	<File name="..\test_flat_multimap.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_flat_multimap.cpp" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="3425" topLine="85" />
 		</Cursor>
 	</File>
-	<File name="..\test_intrusive_flat_multimap.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="11909" topLine="350" />
-		</Cursor>
-	</File>
-	<File name="..\test_iterator.cpp" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_iterator.cpp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="6722" topLine="118" />
 		</Cursor>
 	</File>
-	<File name="..\..\src\intrusive_flat_set.h" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="7487" topLine="243" />
-		</Cursor>
-	</File>
 	<File name="..\..\..\unittest-cpp\UnitTest++\TestRunner.h" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="156" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\..\src\intrusive_flat_multimap.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\intrusive_flat_map.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="3269" topLine="248" />
+			<Cursor1 position="4065" topLine="242" />
 		</Cursor>
 	</File>
 	<File name="..\..\..\unittest-cpp\UnitTest++\CurrentTest.cpp" open="0" top="0" tabpos="26" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -137,24 +27,29 @@
 			<Cursor1 position="368" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\main.cpp" open="1" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\..\unittest-cpp\UnitTest++\Config.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="141" topLine="0" />
+			<Cursor1 position="792" topLine="7" />
 		</Cursor>
 	</File>
-	<File name="..\test_flat_map.cpp" open="1" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_intrusive_list.cpp" open="0" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="18781" topLine="559" />
+			<Cursor1 position="27580" topLine="735" />
 		</Cursor>
 	</File>
-	<File name="..\test_intrusive_flat_multiset.cpp" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_flat_set.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="3073" topLine="66" />
+			<Cursor1 position="11541" topLine="359" />
 		</Cursor>
 	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\TestMacros.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\..\unittest-cpp\UnitTest++\ExecuteTest.h" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="1865" topLine="28" />
+			<Cursor1 position="426" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\intrusive_flat_set.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="7487" topLine="243" />
 		</Cursor>
 	</File>
 	<File name="..\..\..\unittest-cpp\UnitTest++\TestResults.cpp" open="0" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -162,9 +57,49 @@
 			<Cursor1 position="537" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\..\src\iterator.h" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\intrusive_flat_multimap.h" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="1557" topLine="0" />
+			<Cursor1 position="3269" topLine="248" />
+		</Cursor>
+	</File>
+	<File name="..\test_flat_map.cpp" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="18781" topLine="559" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\binary.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="14624" topLine="373" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\list.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="35098" topLine="1063" />
+		</Cursor>
+	</File>
+	<File name="..\test_memory.cpp" open="0" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="15446" topLine="391" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\TestReporterStdout.cpp" open="0" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="883" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_list.cpp" open="0" top="0" tabpos="27" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="17914" topLine="493" />
+		</Cursor>
+	</File>
+	<File name="..\test_flat_multiset.cpp" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3011" topLine="58" />
+		</Cursor>
+	</File>
+	<File name="..\main.cpp" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="141" topLine="0" />
 		</Cursor>
 	</File>
 	<File name="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -172,24 +107,69 @@
 			<Cursor1 position="103" topLine="6" />
 		</Cursor>
 	</File>
-	<File name="..\test_intrusive_list.cpp" open="1" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_io_port.cpp" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="27580" topLine="735" />
+			<Cursor1 position="1452" topLine="3" />
 		</Cursor>
 	</File>
-	<File name="..\..\src\integral_limits.h" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\integral_limits.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="7252" topLine="152" />
 		</Cursor>
 	</File>
-	<File name="..\..\src\list.h" open="1" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_intrusive_forward_list.cpp" open="0" top="0" tabpos="26" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="35098" topLine="1063" />
+			<Cursor1 position="27667" topLine="693" />
 		</Cursor>
 	</File>
-	<File name="..\..\src\intrusive_flat_multiset.h" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\..\unittest-cpp\UnitTest++\TestMacros.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1865" topLine="28" />
+		</Cursor>
+	</File>
+	<File name="..\test_map.cpp" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="6368" topLine="164" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\TestRunner.cpp" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2279" topLine="25" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\Test.cpp" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="699" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_algorithm.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="11590" topLine="274" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\Checks.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="469" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\iterator.h" open="0" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1557" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\algorithm.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\intrusive_flat_multiset.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="7605" topLine="248" />
 		</Cursor>
 	</File>
+	<File name="..\test_forward_list.cpp" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="8440" topLine="209" />
+		</Cursor>
+	</File>
 </CodeBlocks_layout_file>
diff --git a/test/vs2017/etl.vcxproj b/test/vs2017/etl.vcxproj
index 334efe0c..19d99833 100644
--- a/test/vs2017/etl.vcxproj
+++ b/test/vs2017/etl.vcxproj
@@ -197,10 +197,6 @@
     <ClInclude Include="..\..\src\ihash.h" />
     <ClInclude Include="..\..\src\instance_count.h" />
     <ClInclude Include="..\..\src\integral_limits.h" />
-    <ClInclude Include="..\..\src\intrusive_flat_map.h" />
-    <ClInclude Include="..\..\src\intrusive_flat_multimap.h" />
-    <ClInclude Include="..\..\src\intrusive_flat_multiset.h" />
-    <ClInclude Include="..\..\src\intrusive_flat_set.h" />
     <ClInclude Include="..\..\src\intrusive_forward_list.h" />
     <ClInclude Include="..\..\src\intrusive_links.h" />
     <ClInclude Include="..\..\src\intrusive_list.h" />
@@ -238,6 +234,10 @@
     <ClInclude Include="..\..\src\queue.h" />
     <ClInclude Include="..\..\src\radix.h" />
     <ClInclude Include="..\..\src\random.h" />
+    <ClInclude Include="..\..\src\reference_flat_map.h" />
+    <ClInclude Include="..\..\src\reference_flat_multimap.h" />
+    <ClInclude Include="..\..\src\reference_flat_multiset.h" />
+    <ClInclude Include="..\..\src\reference_flat_set.h" />
     <ClInclude Include="..\..\src\rr_cache.h" />
     <ClInclude Include="..\..\src\set.h" />
     <ClInclude Include="..\..\src\smallest.h" />
@@ -336,12 +336,6 @@
     <ClCompile Include="..\test_hash.cpp" />
     <ClCompile Include="..\test_instance_count.cpp" />
     <ClCompile Include="..\test_integral_limits.cpp" />
-    <ClCompile Include="..\test_intrusive_flat_map.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\test_intrusive_flat_multimap.cpp" />
-    <ClCompile Include="..\test_intrusive_flat_multiset.cpp" />
-    <ClCompile Include="..\test_intrusive_flat_set.cpp" />
     <ClCompile Include="..\test_intrusive_forward_list.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
     </ClCompile>
@@ -388,6 +382,10 @@
     <ClCompile Include="..\test_random.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\test_reference_flat_map.cpp" />
+    <ClCompile Include="..\test_reference_flat_multimap.cpp" />
+    <ClCompile Include="..\test_reference_flat_multiset.cpp" />
+    <ClCompile Include="..\test_reference_flat_set.cpp" />
     <ClCompile Include="..\test_set.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
diff --git a/test/vs2017/etl.vcxproj.filters b/test/vs2017/etl.vcxproj.filters
index 4cc3568c..e37d92fc 100644
--- a/test/vs2017/etl.vcxproj.filters
+++ b/test/vs2017/etl.vcxproj.filters
@@ -423,24 +423,24 @@
     <ClInclude Include="..\..\src\memory.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\intrusive_flat_map.h">
-      <Filter>ETL\Containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\intrusive_flat_multimap.h">
-      <Filter>ETL\Containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\intrusive_flat_multiset.h">
-      <Filter>ETL\Containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\intrusive_flat_set.h">
-      <Filter>ETL\Containers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\message_processor.h">
       <Filter>ETL\Patterns</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\message_processor_generator.h">
       <Filter>ETL\Patterns</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\reference_flat_map.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\reference_flat_multimap.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\reference_flat_multiset.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\reference_flat_set.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\AssertException.cpp">
@@ -752,16 +752,16 @@
     <ClCompile Include="..\test_vector_non_trivial.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_intrusive_flat_map.cpp">
+    <ClCompile Include="..\test_reference_flat_map.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_intrusive_flat_multimap.cpp">
+    <ClCompile Include="..\test_reference_flat_multimap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_intrusive_flat_set.cpp">
+    <ClCompile Include="..\test_reference_flat_multiset.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_intrusive_flat_multiset.cpp">
+    <ClCompile Include="..\test_reference_flat_set.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>