diff --git a/test/codeblocks/ETL.cbp b/test/codeblocks/ETL.cbp
index 46a5bab7..7ddc1a0d 100644
--- a/test/codeblocks/ETL.cbp
+++ b/test/codeblocks/ETL.cbp
@@ -22,10 +22,6 @@
 					<Add option="-DETL_VERBOSE_ERRORS" />
 					<Add option="-DETL_CHECK_PUSH_POP" />
 				</Compiler>
-				<ExtraCommands>
-					<Add after="bin\Debug\ETL.exe" />
-					<Mode after="always" />
-				</ExtraCommands>
 			</Target>
 			<Target title="Linux">
 				<Option output="bin/Debug/ETL" prefix_auto="1" extension_auto="1" />
@@ -120,112 +116,111 @@
 		<Unit filename="../../../unittest-cpp/UnitTest++/Win32/TimeHelpers.h" />
 		<Unit filename="../../../unittest-cpp/UnitTest++/XmlTestReporter.cpp" />
 		<Unit filename="../../../unittest-cpp/UnitTest++/XmlTestReporter.h" />
-		<Unit filename="../../.gitattributes" />
-		<Unit filename="../../.gitignore" />
-		<Unit filename="../../Doxyfile" />
-		<Unit filename="../../LICENSE" />
-		<Unit filename="../../README.md" />
-		<Unit filename="../../alignment.h" />
-		<Unit filename="../../array.h" />
-		<Unit filename="../../binary.h" />
-		<Unit filename="../../bitset.h" />
-		<Unit filename="../../bloom_filter.h" />
-		<Unit filename="../../container.h" />
-		<Unit filename="../../crc16.cpp" />
-		<Unit filename="../../crc16.h" />
-		<Unit filename="../../crc16_ccitt.cpp" />
-		<Unit filename="../../crc16_ccitt.h" />
-		<Unit filename="../../crc16_kermit.cpp" />
-		<Unit filename="../../crc16_kermit.h" />
-		<Unit filename="../../crc32.cpp" />
-		<Unit filename="../../crc32.h" />
-		<Unit filename="../../crc64_ecma.cpp" />
-		<Unit filename="../../crc64_ecma.h" />
-		<Unit filename="../../crc8_ccitt.cpp" />
-		<Unit filename="../../crc8_ccitt.h" />
-		<Unit filename="../../cyclic_value.h" />
-		<Unit filename="../../deque.h" />
-		<Unit filename="../../doxygen.h" />
-		<Unit filename="../../endian.h" />
-		<Unit filename="../../enum_type.h" />
-		<Unit filename="../../error_handler.cpp" />
-		<Unit filename="../../error_handler.h" />
-		<Unit filename="../../etl.jpg" />
-		<Unit filename="../../exception.h" />
-		<Unit filename="../../factorial.h" />
-		<Unit filename="../../fibonacci.h" />
-		<Unit filename="../../flat_map.h" />
-		<Unit filename="../../flat_map_base.h" />
-		<Unit filename="../../flat_set.h" />
-		<Unit filename="../../flat_set_base.h" />
-		<Unit filename="../../forward_list.h" />
-		<Unit filename="../../forward_list_base.h" />
-		<Unit filename="../../function.h" />
-		<Unit filename="../../functional.h" />
-		<Unit filename="../../ibitset.h" />
-		<Unit filename="../../ideque.h" />
-		<Unit filename="../../iflat_map.h" />
-		<Unit filename="../../iflat_set.h" />
-		<Unit filename="../../iforward_list.h" />
-		<Unit filename="../../ihash.h" />
-		<Unit filename="../../ilist.h" />
-		<Unit filename="../../imap.h" />
-		<Unit filename="../../instance_count.h" />
-		<Unit filename="../../integral_limits.h" />
-		<Unit filename="../../intrusive_forward_list.h" />
-		<Unit filename="../../intrusive_forward_list_link.h" />
-		<Unit filename="../../io_port.h" />
-		<Unit filename="../../iqueue.h" />
-		<Unit filename="../../iset.h" />
-		<Unit filename="../../istack.h" />
-		<Unit filename="../../iunordered_map.h" />
-		<Unit filename="../../ivector.h" />
-		<Unit filename="../../largest.h" />
-		<Unit filename="../../list.h" />
-		<Unit filename="../../list_base.h" />
-		<Unit filename="../../log.h" />
-		<Unit filename="../../lookup.h" />
-		<Unit filename="../../lookup_base.h" />
-		<Unit filename="../../map.h" />
-		<Unit filename="../../map_base.h" />
-		<Unit filename="../../nullptr.h" />
-		<Unit filename="../../numeric.h" />
-		<Unit filename="../../observer.h" />
-		<Unit filename="../../optional.h" />
-		<Unit filename="../../parameter_type.h" />
-		<Unit filename="../../pool.h" />
-		<Unit filename="../../power.h" />
-		<Unit filename="../../private/deque_base.h" />
-		<Unit filename="../../private/flat_map_base.h" />
-		<Unit filename="../../private/flat_multimap_base.h" />
-		<Unit filename="../../private/flat_multiset_base.h" />
-		<Unit filename="../../private/flat_set_base.h" />
-		<Unit filename="../../private/forward_list_base.h" />
-		<Unit filename="../../private/list_base.h" />
-		<Unit filename="../../private/map_base.h" />
-		<Unit filename="../../private/multimap_base.h" />
-		<Unit filename="../../private/multiset_base.h" />
-		<Unit filename="../../private/pool_base.h" />
-		<Unit filename="../../private/priority_queue_base.h" />
-		<Unit filename="../../private/queue_base.h" />
-		<Unit filename="../../private/set_base.h" />
-		<Unit filename="../../private/stack_base.h" />
-		<Unit filename="../../private/unordered_map_base.h" />
-		<Unit filename="../../private/vector_base.h" />
-		<Unit filename="../../queue.h" />
-		<Unit filename="../../queue_base.h" />
-		<Unit filename="../../set.h" />
-		<Unit filename="../../set_base.h" />
-		<Unit filename="../../smallest.h" />
-		<Unit filename="../../stack.h" />
-		<Unit filename="../../stack_base.h" />
-		<Unit filename="../../static_assert.h" />
-		<Unit filename="../../type_traits.h" />
-		<Unit filename="../../unordered_map.h" />
-		<Unit filename="../../variant.h" />
-		<Unit filename="../../vector.h" />
-		<Unit filename="../../vector_base.h" />
-		<Unit filename="../../visitor.h" />
+		<Unit filename="../../src/algorithm.h" />
+		<Unit filename="../../src/alignment.h" />
+		<Unit filename="../../src/array.h" />
+		<Unit filename="../../src/binary.h" />
+		<Unit filename="../../src/bitset.h" />
+		<Unit filename="../../src/bloom_filter.h" />
+		<Unit filename="../../src/char_traits.h" />
+		<Unit filename="../../src/checksum.h" />
+		<Unit filename="../../src/container.h" />
+		<Unit filename="../../src/crc16.cpp" />
+		<Unit filename="../../src/crc16.h" />
+		<Unit filename="../../src/crc16_ccitt.cpp" />
+		<Unit filename="../../src/crc16_ccitt.h" />
+		<Unit filename="../../src/crc16_kermit.cpp" />
+		<Unit filename="../../src/crc16_kermit.h" />
+		<Unit filename="../../src/crc32.cpp" />
+		<Unit filename="../../src/crc32.h" />
+		<Unit filename="../../src/crc64_ecma.cpp" />
+		<Unit filename="../../src/crc64_ecma.h" />
+		<Unit filename="../../src/crc8_ccitt.cpp" />
+		<Unit filename="../../src/crc8_ccitt.h" />
+		<Unit filename="../../src/cyclic_hash.h" />
+		<Unit filename="../../src/cyclic_value.h" />
+		<Unit filename="../../src/deque.h" />
+		<Unit filename="../../src/endian.h" />
+		<Unit filename="../../src/enum_type.h" />
+		<Unit filename="../../src/error_handler.cpp" />
+		<Unit filename="../../src/error_handler.h" />
+		<Unit filename="../../src/etl_arduino.h" />
+		<Unit filename="../../src/exception.h" />
+		<Unit filename="../../src/factorial.h" />
+		<Unit filename="../../src/fibonacci.h" />
+		<Unit filename="../../src/fixed_iterator.h" />
+		<Unit filename="../../src/flat_map.h" />
+		<Unit filename="../../src/flat_multimap.h" />
+		<Unit filename="../../src/flat_multiset.h" />
+		<Unit filename="../../src/flat_set.h" />
+		<Unit filename="../../src/fnv_1.h" />
+		<Unit filename="../../src/forward_list.h" />
+		<Unit filename="../../src/frame_check_sequence.h" />
+		<Unit filename="../../src/function.h" />
+		<Unit filename="../../src/functional.h" />
+		<Unit filename="../../src/hash.h" />
+		<Unit filename="../../src/ibitset.h" />
+		<Unit filename="../../src/ideque.h" />
+		<Unit filename="../../src/iflat_map.h" />
+		<Unit filename="../../src/iflat_multimap.h" />
+		<Unit filename="../../src/iflat_multiset.h" />
+		<Unit filename="../../src/iflat_set.h" />
+		<Unit filename="../../src/iforward_list.h" />
+		<Unit filename="../../src/ihash.h" />
+		<Unit filename="../../src/ilist.h" />
+		<Unit filename="../../src/imap.h" />
+		<Unit filename="../../src/imultimap.h" />
+		<Unit filename="../../src/imultiset.h" />
+		<Unit filename="../../src/instance_count.h" />
+		<Unit filename="../../src/integral_limits.h" />
+		<Unit filename="../../src/intrusive_forward_list.h" />
+		<Unit filename="../../src/intrusive_forward_list_link.h" />
+		<Unit filename="../../src/intrusive_links.h" />
+		<Unit filename="../../src/intrusive_list.h" />
+		<Unit filename="../../src/io_port.h" />
+		<Unit filename="../../src/ipool.h" />
+		<Unit filename="../../src/ipriority_queue.h" />
+		<Unit filename="../../src/iqueue.h" />
+		<Unit filename="../../src/iset.h" />
+		<Unit filename="../../src/istack.h" />
+		<Unit filename="../../src/iunordered_map.h" />
+		<Unit filename="../../src/iunordered_multimap.h" />
+		<Unit filename="../../src/iunordered_multiset.h" />
+		<Unit filename="../../src/iunordered_set.h" />
+		<Unit filename="../../src/ivector.h" />
+		<Unit filename="../../src/jenkins.h" />
+		<Unit filename="../../src/largest.h" />
+		<Unit filename="../../src/list.h" />
+		<Unit filename="../../src/log.h" />
+		<Unit filename="../../src/map.h" />
+		<Unit filename="../../src/multimap.h" />
+		<Unit filename="../../src/multiset.h" />
+		<Unit filename="../../src/murmur3.h" />
+		<Unit filename="../../src/nullptr.h" />
+		<Unit filename="../../src/numeric.h" />
+		<Unit filename="../../src/observer.h" />
+		<Unit filename="../../src/optional.h" />
+		<Unit filename="../../src/parameter_type.h" />
+		<Unit filename="../../src/pearson.cpp" />
+		<Unit filename="../../src/pearson.h" />
+		<Unit filename="../../src/pool.h" />
+		<Unit filename="../../src/power.h" />
+		<Unit filename="../../src/priority_queue.h" />
+		<Unit filename="../../src/queue.h" />
+		<Unit filename="../../src/radix.h" />
+		<Unit filename="../../src/set.h" />
+		<Unit filename="../../src/smallest.h" />
+		<Unit filename="../../src/stack.h" />
+		<Unit filename="../../src/static_assert.h" />
+		<Unit filename="../../src/string.h" />
+		<Unit filename="../../src/type_traits.h" />
+		<Unit filename="../../src/unordered_map.h" />
+		<Unit filename="../../src/unordered_multimap.h" />
+		<Unit filename="../../src/unordered_multiset.h" />
+		<Unit filename="../../src/unordered_set.h" />
+		<Unit filename="../../src/variant.h" />
+		<Unit filename="../../src/vector.h" />
+		<Unit filename="../../src/visitor.h" />
 		<Unit filename="../ExtraCheckMacros.h" />
 		<Unit filename="../main.cpp" />
 		<Unit filename="../test_algorithm.cpp" />
diff --git a/test/codeblocks/ETL.depend b/test/codeblocks/ETL.depend
index 1288b643..341eb761 100644
--- a/test/codeblocks/ETL.depend
+++ b/test/codeblocks/ETL.depend
@@ -2803,7 +2803,7 @@
 	"Posix/TimeHelpers.h"
 	"Win32/TimeHelpers.h"
 
-1414845610 d:\users\john\documents\programming\github\unittest-cpp\unittest++\win32\timehelpers.h
+1456667834 d:\users\john\documents\programming\github\unittest-cpp\unittest++\win32\timehelpers.h
 	"../Config.h"
 	"../HelperMacros.h"
 
@@ -2898,10 +2898,10 @@
 	"CurrentTest.h"
 	"ReportAssertImpl.h"
 
-1452338450 source:d:\users\john\documents\programming\github\etl\test\test_algorithm.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_algorithm.cpp
 	<UnitTest++/UnitTest++.h>
-	"../algorithm.h"
-	"../container.h"
+	"../src/algorithm.h"
+	"../src/container.h"
 	<vector>
 	<algorithm>
 	<functional>
@@ -2923,10 +2923,10 @@
 	<stddef.h>
 	<iterator>
 
-1452796556 source:d:\users\john\documents\programming\github\etl\test\test_alignment.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_alignment.cpp
 	<UnitTest++/UnitTest++.h>
-	"../alignment.h"
-	"../type_traits.h"
+	"../src/alignment.h"
+	"../src/type_traits.h"
 	<type_traits>
 	<utility>
 	<string>
@@ -2939,13 +2939,13 @@
 
 1450265856 d:\users\john\documents\programming\github\etl\static_assert.h
 
-1452338450 source:d:\users\john\documents\programming\github\etl\test\test_array.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_array.cpp
 	<UnitTest++/UnitTest++.h>
-	"../array.h"
+	"../src/array.h"
 	<array>
 	<algorithm>
 	<iterator>
-	"../integral_limits.h"
+	"../src/integral_limits.h"
 
 1450265856 d:\users\john\documents\programming\github\etl\array.h
 	<iterator>
@@ -2966,14 +2966,14 @@
 	<stddef.h>
 	"type_traits.h"
 
-1452796556 source:d:\users\john\documents\programming\github\etl\test\test_binary.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_binary.cpp
 	<UnitTest++/UnitTest++.h>
 	<cstdint>
 	<type_traits>
-	"../binary.h"
-	"../bitset.h"
-	"../fnv_1.h"
-	"../integral_limits.h"
+	"../src/binary.h"
+	"../src/bitset.h"
+	"../src/fnv_1.h"
+	"../src/integral_limits.h"
 
 1450265856 d:\users\john\documents\programming\github\etl\binary.h
 	"type_traits.h"
@@ -3029,22 +3029,22 @@
 	"exception.h"
 	"error_handler.h"
 
-1452796556 source:d:\users\john\documents\programming\github\etl\test\test_bitset.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_bitset.cpp
 	<UnitTest++/UnitTest++.h>
 	<limits>
 	<type_traits>
 	<bitset>
-	"../bitset.h"
+	"../src/bitset.h"
 
-1452796556 source:d:\users\john\documents\programming\github\etl\test\test_bloom_filter.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_bloom_filter.cpp
 	<UnitTest++/UnitTest++.h>
 	<stdlib.h>
 	<vector>
-	"../bloom_filter.h"
-	"../fnv_1.h"
-	"../crc16.h"
-	"../crc16_ccitt.h"
-	"../crc32.h"
+	"../src/bloom_filter.h"
+	"../src/fnv_1.h"
+	"../src/crc16.h"
+	"../src/crc16_ccitt.h"
+	"../src/crc32.h"
 
 1450265856 d:\users\john\documents\programming\github\etl\bloom_filter.h
 	"parameter_type.h"
@@ -3073,14 +3073,14 @@
 	<iterator>
 	"static_assert.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_checksum.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_checksum.cpp
 	<UnitTest++/UnitTest++.h>
 	<iterator>
 	<string>
 	<vector>
 	<stdint.h>
-	"../checksum.h"
-	"../endian.h"
+	"../src/checksum.h"
+	"../src/endian.h"
 
 1450265856 d:\users\john\documents\programming\github\etl\checksum.h
 	<stdint.h>
@@ -3088,23 +3088,23 @@
 	"type_traits.h"
 	"ihash.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_container.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_container.cpp
 	<UnitTest++/UnitTest++.h>
-	"../container.h"
+	"../src/container.h"
 	<list>
 
-1452796556 source:d:\users\john\documents\programming\github\etl\test\test_crc.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_crc.cpp
 	<UnitTest++/UnitTest++.h>
 	<iterator>
 	<string>
 	<vector>
 	<stdint.h>
-	"../crc8_ccitt.h"
-	"../crc16.h"
-	"../crc16_ccitt.h"
-	"../crc16_kermit.h"
-	"../crc32.h"
-	"../crc64_ecma.h"
+	"../src/crc8_ccitt.h"
+	"../src/crc16.h"
+	"../src/crc16_ccitt.h"
+	"../src/crc16_kermit.h"
+	"../src/crc32.h"
+	"../src/crc64_ecma.h"
 
 1450265856 d:\users\john\documents\programming\github\etl\crc8_ccitt.h
 	<stdint.h>
@@ -3121,9 +3121,9 @@
 	"static_assert.h"
 	"type_traits.h"
 
-1452796556 source:d:\users\john\documents\programming\github\etl\test\test_cyclic_value.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_cyclic_value.cpp
 	<UnitTest++/UnitTest++.h>
-	"../cyclic_value.h"
+	"../src/cyclic_value.h"
 
 1452794793 d:\users\john\documents\programming\github\etl\cyclic_value.h
 	<stddef.h>
@@ -3131,10 +3131,10 @@
 	"static_assert.h"
 	"exception.h"
 
-1452878867 source:d:\users\john\documents\programming\github\etl\test\test_deque.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_deque.cpp
 	<UnitTest++/UnitTest++.h>
 	"ExtraCheckMacros.h"
-	"../deque.h"
+	"../src/deque.h"
 	"data.h"
 	<vector>
 	<deque>
@@ -3175,33 +3175,33 @@
 	<stddef.h>
 	"exception.h"
 
-1450265856 d:\users\john\documents\programming\github\etl\test\data.h
+1456432601 d:\users\john\documents\programming\github\etl\test\data.h
 	<ostream>
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_endian.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_endian.cpp
 	<UnitTest++/UnitTest++.h>
 	<string>
-	"../endian.h"
+	"../src/endian.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_enum_type.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_enum_type.cpp
 	<UnitTest++/UnitTest++.h>
 	<string>
-	"../enum_type.h"
+	"../src/enum_type.h"
 
-1453406068 source:d:\users\john\documents\programming\github\etl\test\test_error_handler.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_error_handler.cpp
 	<UnitTest++/UnitTest++.h>
 	<Windows.h>
 	<sstream>
 	<string>
-	"../error_handler.h"
-	"../exception.h"
+	"../src/error_handler.h"
+	"../src/exception.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_exception.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_exception.cpp
 	<UnitTest++/UnitTest++.h>
 	<string>
-	"../exception.h"
+	"../src/exception.h"
 
-1452796556 source:d:\users\john\documents\programming\github\etl\test\test_flat_map.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_flat_map.cpp
 	<UnitTest++/UnitTest++.h>
 	<map>
 	<array>
@@ -3211,7 +3211,7 @@
 	<string>
 	<vector>
 	"data.h"
-	"../flat_map.h"
+	"../src/flat_map.h"
 
 1452796556 d:\users\john\documents\programming\github\etl\flat_map.h
 	<stddef.h>
@@ -3263,7 +3263,7 @@
 	"alignment.h"
 	"array.h"
 
-1452796556 source:d:\users\john\documents\programming\github\etl\test\test_flat_set.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_flat_set.cpp
 	<UnitTest++/UnitTest++.h>
 	<set>
 	<array>
@@ -3273,7 +3273,7 @@
 	<string>
 	<vector>
 	"data.h"
-	"../flat_set.h"
+	"../src/flat_set.h"
 
 1452796556 d:\users\john\documents\programming\github\etl\flat_set.h
 	<stddef.h>
@@ -3300,19 +3300,19 @@
 	"ivector.h"
 	"error_handler.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_fnv_1.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_fnv_1.cpp
 	<UnitTest++/UnitTest++.h>
 	<iterator>
 	<string>
 	<vector>
 	<stdint.h>
-	"../fnv_1.h"
+	"../src/fnv_1.h"
 
-1453063876 source:d:\users\john\documents\programming\github\etl\test\test_forward_list.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_forward_list.cpp
 	<UnitTest++/UnitTest++.h>
 	"ExtraCheckMacros.h"
 	"data.h"
-	"../forward_list.h"
+	"../src/forward_list.h"
 	<algorithm>
 	<array>
 	<forward_list>
@@ -3359,51 +3359,51 @@
 	<stddef.h>
 	"exception.h"
 
-1451003290 source:d:\users\john\documents\programming\github\etl\test\test_function.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_function.cpp
 	<UnitTest++/UnitTest++.h>
-	"../function.h"
+	"../src/function.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_functional.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_functional.cpp
 	<UnitTest++/UnitTest++.h>
-	"../functional.h"
+	"../src/functional.h"
 	<list>
 	<vector>
 	<numeric>
 
 1450265856 d:\users\john\documents\programming\github\etl\functional.h
 
-1452796556 source:d:\users\john\documents\programming\github\etl\test\test_hash.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_hash.cpp
 	<UnitTest++/UnitTest++.h>
 	<iterator>
 	<string>
 	<vector>
 	<stdint.h>
-	"../hash.h"
+	"../src/hash.h"
 
 1450265856 d:\users\john\documents\programming\github\etl\hash.h
 	<stdint.h>
 	"fnv_1.h"
 	"type_traits.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_instance_count.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_instance_count.cpp
 	<UnitTest++/UnitTest++.h>
-	"../instance_count.h"
+	"../src/instance_count.h"
 	<list>
 	<vector>
 	<numeric>
 
 1450265856 d:\users\john\documents\programming\github\etl\instance_count.h
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_integral_limits.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_integral_limits.cpp
 	<UnitTest++/UnitTest++.h>
 	<limits>
 	<type_traits>
 	<bitset>
-	"../integral_limits.h"
+	"../src/integral_limits.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_io_port.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_io_port.cpp
 	<UnitTest++/UnitTest++.h>
-	"../io_port.h"
+	"../src/io_port.h"
 	<stdint.h>
 
 1450265856 d:\users\john\documents\programming\github\etl\io_port.h
@@ -3411,18 +3411,18 @@
 	"nullptr.h"
 	"parameter_type.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_largest.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_largest.cpp
 	<UnitTest++/UnitTest++.h>
-	"../largest.h"
+	"../src/largest.h"
 	<type_traits>
 
 1450265856 d:\users\john\documents\programming\github\etl\largest.h
 	"type_traits.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_list.cpp
+1456964521 source:d:\users\john\documents\programming\github\etl\test\test_list.cpp
 	<UnitTest++/UnitTest++.h>
 	"ExtraCheckMacros.h"
-	"../list.h"
+	"../src/list.h"
 	"data.h"
 	<algorithm>
 	<array>
@@ -3450,12 +3450,12 @@
 	<stddef.h>
 	"exception.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_maths.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_maths.cpp
 	<UnitTest++/UnitTest++.h>
-	"../log.h"
-	"../power.h"
-	"../fibonacci.h"
-	"../factorial.h"
+	"../src/log.h"
+	"../src/power.h"
+	"../src/fibonacci.h"
+	"../src/factorial.h"
 
 1450265856 d:\users\john\documents\programming\github\etl\fibonacci.h
 	<stddef.h>
@@ -3463,17 +3463,17 @@
 1450265856 d:\users\john\documents\programming\github\etl\factorial.h
 	<stddef.h>
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_numeric.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_numeric.cpp
 	<UnitTest++/UnitTest++.h>
-	"../numeric.h"
+	"../src/numeric.h"
 	<algorithm>
 	<numeric>
 
 1450265856 d:\users\john\documents\programming\github\etl\numeric.h
 
-1450468191 source:d:\users\john\documents\programming\github\etl\test\test_observer.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_observer.cpp
 	<UnitTest++/UnitTest++.h>
-	"../observer.h"
+	"../src/observer.h"
 
 1450959449 d:\users\john\documents\programming\github\etl\observer.h
 	<algorithm>
@@ -3481,10 +3481,10 @@
 	"exception.h"
 	"error_handler.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_queue.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_queue.cpp
 	<UnitTest++/UnitTest++.h>
 	<queue>
-	"../queue.h"
+	"../src/queue.h"
 
 1450265856 d:\users\john\documents\programming\github\etl\queue.h
 	<stddef.h>
@@ -3505,16 +3505,16 @@
 	<stddef.h>
 	"exception.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_smallest.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_smallest.cpp
 	<UnitTest++/UnitTest++.h>
-	"../smallest.h"
+	"../src/smallest.h"
 	<type_traits>
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_stack.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_stack.cpp
 	<UnitTest++/UnitTest++.h>
 	<stack>
 	"data.h"
-	"../stack.h"
+	"../src/stack.h"
 
 1450265856 d:\users\john\documents\programming\github\etl\stack.h
 	<stddef.h>
@@ -3536,24 +3536,24 @@
 	<stddef.h>
 	"exception.h"
 
-1452338102 source:d:\users\john\documents\programming\github\etl\test\test_vector.cpp
+1456953182 source:d:\users\john\documents\programming\github\etl\test\test_vector.cpp
 	<UnitTest++/UnitTest++.h>
 	<vector>
 	<array>
 	<algorithm>
-	"../vector.h"
+	"../src/vector.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_visitor.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_visitor.cpp
 	<UnitTest++/UnitTest++.h>
-	"../visitor.h"
+	"../src/visitor.h"
 
 1450265856 d:\users\john\documents\programming\github\etl\visitor.h
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_fixed_iterator.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_fixed_iterator.cpp
 	<UnitTest++/UnitTest++.h>
 	<vector>
 	<ostream>
-	"../fixed_iterator.h"
+	"../src/fixed_iterator.h"
 
 1450265856 d:\users\john\documents\programming\github\etl\fixed_iterator.h
 	<iterator>
@@ -3600,7 +3600,7 @@
 	"../exception.h"
 	"../error_handler.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_map.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_map.cpp
 	<UnitTest++/UnitTest++.h>
 	<map>
 	<array>
@@ -3609,7 +3609,7 @@
 	<iterator>
 	<string>
 	<vector>
-	"../map.h"
+	"../src/map.h"
 
 1452337350 d:\users\john\documents\programming\github\etl\map.h
 	<stddef.h>
@@ -3635,12 +3635,12 @@
 	"../exception.h"
 	"../error_handler.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_optional.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_optional.cpp
 	<UnitTest++/UnitTest++.h>
 	<string>
 	<ostream>
-	"../optional.h"
-	"../vector.h"
+	"../src/optional.h"
+	"../src/vector.h"
 	"data.h"
 
 1452796556 d:\users\john\documents\programming\github\etl\optional.h
@@ -3649,20 +3649,20 @@
 	"exception.h"
 	"error_handler.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_pool.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_pool.cpp
 	<UnitTest++/UnitTest++.h>
 	"ExtraCheckMacros.h"
 	"data.h"
 	<set>
 	<vector>
-	"../pool.h"
+	"../src/pool.h"
 
 1450265856 d:\users\john\documents\programming\github\etl\private\queue_base.h
 	<stddef.h>
 	"../exception.h"
 	"../error_handler.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_set.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_set.cpp
 	<UnitTest++/UnitTest++.h>
 	<set>
 	<array>
@@ -3671,7 +3671,7 @@
 	<iterator>
 	<string>
 	<vector>
-	"../set.h"
+	"../src/set.h"
 
 1452337350 d:\users\john\documents\programming\github\etl\set.h
 	<stddef.h>
@@ -3702,15 +3702,15 @@
 	"../exception.h"
 	"../error_handler.h"
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_type_traits.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_type_traits.cpp
 	<UnitTest++/UnitTest++.h>
-	"../type_traits.h"
+	"../src/type_traits.h"
 	<type_traits>
 
-1450265856 source:d:\users\john\documents\programming\github\etl\test\test_variant.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_variant.cpp
 	<UnitTest++/UnitTest++.h>
 	"ExtraCheckMacros.h"
-	"../variant.h"
+	"../src/variant.h"
 	<array>
 	<vector>
 	<algorithm>
@@ -4784,11 +4784,11 @@
 
 1452516033 /home/jwellbelove/Programming/etl/visitor.h
 
-1453405766 source:d:\users\john\documents\programming\github\etl\test\test_intrusive_forward_list.cpp
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_intrusive_forward_list.cpp
 	<UnitTest++/UnitTest++.h>
 	"ExtraCheckMacros.h"
 	"data.h"
-	"../intrusive_forward_list.h"
+	"../src/intrusive_forward_list.h"
 	<algorithm>
 	<array>
 	<forward_list>
@@ -4809,3 +4809,561 @@
 	"error_handler.h"
 	"array.h"
 
+1456669289 source:d:\users\john\documents\programming\github\etl\src\crc16.cpp
+	<stdint.h>
+
+1456669289 source:d:\users\john\documents\programming\github\etl\src\crc16_ccitt.cpp
+	<stdint.h>
+
+1456669289 source:d:\users\john\documents\programming\github\etl\src\crc16_kermit.cpp
+	<stdint.h>
+
+1456669289 source:d:\users\john\documents\programming\github\etl\src\crc32.cpp
+	<stdint.h>
+
+1456669289 source:d:\users\john\documents\programming\github\etl\src\crc64_ecma.cpp
+	<stdint.h>
+
+1456669289 source:d:\users\john\documents\programming\github\etl\src\crc8_ccitt.cpp
+	<stdint.h>
+
+1456669289 source:d:\users\john\documents\programming\github\etl\src\error_handler.cpp
+	"error_handler.h"
+	"nullptr.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\error_handler.h
+	<assert.h>
+	"exception.h"
+	"function.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\exception.h
+
+1456669289 d:\users\john\documents\programming\github\etl\src\function.h
+
+1456669289 d:\users\john\documents\programming\github\etl\src\nullptr.h
+
+1456669289 source:d:\users\john\documents\programming\github\etl\src\pearson.cpp
+	<stdint.h>
+
+1456669289 d:\users\john\documents\programming\github\etl\src\algorithm.h
+	<algorithm>
+	<iterator>
+	<utility>
+	<functional>
+	<stdint.h>
+	"type_traits.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\type_traits.h
+	<stddef.h>
+	"nullptr.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\container.h
+	<stddef.h>
+	<iterator>
+
+1456669289 d:\users\john\documents\programming\github\etl\src\alignment.h
+	<stdint.h>
+	"type_traits.h"
+	"static_assert.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\static_assert.h
+
+1456669289 d:\users\john\documents\programming\github\etl\src\array.h
+	<iterator>
+	<functional>
+	<algorithm>
+	<stddef.h>
+	"exception.h"
+	"type_traits.h"
+	"parameter_type.h"
+	"static_assert.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\parameter_type.h
+	"type_traits.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\integral_limits.h
+	<climits>
+	<stddef.h>
+	"type_traits.h"
+
+1456953182 d:\users\john\documents\programming\github\etl\src\binary.h
+	<limits>
+	<assert.h>
+	"type_traits.h"
+	"integral_limits.h"
+	"static_assert.h"
+	"log.h"
+	"power.h"
+	"smallest.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\log.h
+	<stddef.h>
+
+1456669289 d:\users\john\documents\programming\github\etl\src\power.h
+	<stddef.h>
+	"log.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\smallest.h
+	<stdint.h>
+	"integral_limits.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\bitset.h
+	<algorithm>
+	<iterator>
+	<string.h>
+	<stddef.h>
+	"integral_limits.h"
+	"algorithm.h"
+	"nullptr.h"
+	"log.h"
+	"ibitset.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\ibitset.h
+	<algorithm>
+	<stdint.h>
+	<string.h>
+	"exception.h"
+	"integral_limits.h"
+	"binary.h"
+	"algorithm.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\fnv_1.h
+	<stdint.h>
+	"static_assert.h"
+	"type_traits.h"
+	"ihash.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\ihash.h
+	<stdint.h>
+	<utility>
+	"exception.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\bloom_filter.h
+	"parameter_type.h"
+	"bitset.h"
+	"type_traits.h"
+	"binary.h"
+	"log.h"
+	"power.h"
+
+1456953131 d:\users\john\documents\programming\github\etl\src\crc16.h
+	<stdint.h>
+	<iterator>
+	"frame_check_sequence.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\frame_check_sequence.h
+	<stdint.h>
+	"static_assert.h"
+	"type_traits.h"
+	"binary.h"
+
+1456953131 d:\users\john\documents\programming\github\etl\src\crc16_ccitt.h
+	<stdint.h>
+	<iterator>
+	"frame_check_sequence.h"
+
+1456953131 d:\users\john\documents\programming\github\etl\src\crc32.h
+	<stdint.h>
+	<iterator>
+	"frame_check_sequence.h"
+
+1456953131 d:\users\john\documents\programming\github\etl\src\checksum.h
+	<stdint.h>
+	"binary.h"
+	"frame_check_sequence.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\endian.h
+	<stdint.h>
+	"enum_type.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\enum_type.h
+
+1456953131 d:\users\john\documents\programming\github\etl\src\crc8_ccitt.h
+	<stdint.h>
+	<iterator>
+	"frame_check_sequence.h"
+
+1456953131 d:\users\john\documents\programming\github\etl\src\crc16_kermit.h
+	<stdint.h>
+	<iterator>
+	"frame_check_sequence.h"
+
+1456953131 d:\users\john\documents\programming\github\etl\src\crc64_ecma.h
+	<stdint.h>
+	<iterator>
+	"frame_check_sequence.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\cyclic_value.h
+	<stddef.h>
+	<algorithm>
+	"static_assert.h"
+	"exception.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\deque.h
+	<stddef.h>
+	<stdint.h>
+	<iterator>
+	<algorithm>
+	"ideque.h"
+	"container.h"
+	"alignment.h"
+	"array.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\ideque.h
+	<stddef.h>
+	<iterator>
+	"algorithm.h"
+	"type_traits.h"
+	"private/deque_base.h"
+	"parameter_type.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\private\deque_base.h
+	<stddef.h>
+	"../exception.h"
+	"../error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\fixed_iterator.h
+	<iterator>
+
+1456669289 d:\users\john\documents\programming\github\etl\src\flat_map.h
+	<stddef.h>
+	<iterator>
+	<functional>
+	"iflat_map.h"
+	"vector.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\iflat_map.h
+	<iterator>
+	<algorithm>
+	<functional>
+	<utility>
+	<stddef.h>
+	"private/flat_map_base.h"
+	"type_traits.h"
+	"parameter_type.h"
+	"ivector.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\private\flat_map_base.h
+	<stddef.h>
+	"../exception.h"
+	"../ivector.h"
+	"../error_handler.h"
+
+1456953131 d:\users\john\documents\programming\github\etl\src\ivector.h
+	<iterator>
+	<algorithm>
+	<functional>
+	<stddef.h>
+	"algorithm.h"
+	"private/vector_base.h"
+	"type_traits.h"
+	"parameter_type.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\private\vector_base.h
+	<stddef.h>
+	"../exception.h"
+	"../error_handler.h"
+
+1456953131 d:\users\john\documents\programming\github\etl\src\vector.h
+	<stddef.h>
+	<stdint.h>
+	<iterator>
+	"ivector.h"
+	"container.h"
+	"alignment.h"
+	"array.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\flat_set.h
+	<stddef.h>
+	<iterator>
+	<functional>
+	"iflat_set.h"
+	"vector.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\iflat_set.h
+	<iterator>
+	<algorithm>
+	<functional>
+	<utility>
+	<stddef.h>
+	"private/flat_set_base.h"
+	"type_traits.h"
+	"parameter_type.h"
+	"ivector.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\private\flat_set_base.h
+	<stddef.h>
+	"../exception.h"
+	"../ivector.h"
+	"../error_handler.h"
+
+1456953131 d:\users\john\documents\programming\github\etl\src\forward_list.h
+	<stddef.h>
+	"pool.h"
+	"iforward_list.h"
+	"container.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\pool.h
+	"alignment.h"
+	"array.h"
+	"bitset.h"
+	"ipool.h"
+	<iterator>
+
+1456669289 d:\users\john\documents\programming\github\etl\src\ipool.h
+	<iterator>
+	"private/pool_base.h"
+	"nullptr.h"
+	"ibitset.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\private\pool_base.h
+	<stddef.h>
+	"../exception.h"
+	"../error_handler.h"
+	"../error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\iforward_list.h
+	<iterator>
+	<algorithm>
+	<functional>
+	<stddef.h>
+	"pool.h"
+	"nullptr.h"
+	"private/forward_list_base.h"
+	"type_traits.h"
+	"parameter_type.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\private\forward_list_base.h
+	<stddef.h>
+	"../exception.h"
+	"../error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\functional.h
+
+1456669289 d:\users\john\documents\programming\github\etl\src\hash.h
+	<stdint.h>
+	"fnv_1.h"
+	"type_traits.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\instance_count.h
+
+1456953131 d:\users\john\documents\programming\github\etl\src\intrusive_forward_list.h
+	<iterator>
+	<algorithm>
+	<functional>
+	<stddef.h>
+	"nullptr.h"
+	"type_traits.h"
+	"exception.h"
+	"error_handler.h"
+	"intrusive_links.h"
+	"algorithm.h"
+
+1456953131 d:\users\john\documents\programming\github\etl\src\intrusive_links.h
+	<assert.h>
+	"nullptr.h"
+	"type_traits.h"
+	"exception.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\io_port.h
+	<stdint.h>
+	"nullptr.h"
+	"parameter_type.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\largest.h
+	"type_traits.h"
+
+1456953131 d:\users\john\documents\programming\github\etl\src\list.h
+	<stddef.h>
+	"ilist.h"
+	"container.h"
+	"pool.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\ilist.h
+	<iterator>
+	<algorithm>
+	<functional>
+	<stddef.h>
+	"nullptr.h"
+	"private/list_base.h"
+	"type_traits.h"
+	"parameter_type.h"
+	"pool.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\private\list_base.h
+	<stddef.h>
+	"../exception.h"
+	"../error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\map.h
+	<stddef.h>
+	<iterator>
+	<functional>
+	"imap.h"
+	"container.h"
+	"pool.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\imap.h
+	<iterator>
+	<algorithm>
+	<functional>
+	<stddef.h>
+	"nullptr.h"
+	"private/map_base.h"
+	"type_traits.h"
+	"parameter_type.h"
+	"pool.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\private\map_base.h
+	<stddef.h>
+	"../exception.h"
+	"../error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\fibonacci.h
+	<stddef.h>
+
+1456669289 d:\users\john\documents\programming\github\etl\src\factorial.h
+	<stddef.h>
+
+1456669289 d:\users\john\documents\programming\github\etl\src\numeric.h
+
+1456669289 d:\users\john\documents\programming\github\etl\src\observer.h
+	<algorithm>
+	"vector.h"
+	"exception.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\optional.h
+	"alignment.h"
+	"type_traits.h"
+	"exception.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\queue.h
+	<stddef.h>
+	<stdint.h>
+	"iqueue.h"
+	"container.h"
+	"alignment.h"
+	"array.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\iqueue.h
+	<stddef.h>
+	"private/queue_base.h"
+	"type_traits.h"
+	"parameter_type.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\private\queue_base.h
+	<stddef.h>
+	"../exception.h"
+	"../error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\set.h
+	<stddef.h>
+	<iterator>
+	<functional>
+	"iset.h"
+	"container.h"
+	"pool.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\iset.h
+	<iterator>
+	<algorithm>
+	<functional>
+	<stddef.h>
+	"nullptr.h"
+	"private/set_base.h"
+	"type_traits.h"
+	"parameter_type.h"
+	"pool.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\private\set_base.h
+	<stddef.h>
+	"../exception.h"
+	"../error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\stack.h
+	<stddef.h>
+	<stdint.h>
+	<algorithm>
+	"istack.h"
+	"container.h"
+	"alignment.h"
+	"array.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\istack.h
+	<stddef.h>
+	"private/stack_base.h"
+	"type_traits.h"
+	"parameter_type.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\private\stack_base.h
+	<stddef.h>
+	"../exception.h"
+	"../error_handler.h"
+
+1456669289 source:d:\users\john\documents\programming\github\etl\test\test_unordered_map.cpp
+	<UnitTest++/UnitTest++.h>
+	<map>
+	<array>
+	<algorithm>
+	<utility>
+	<iterator>
+	<string>
+	<vector>
+	<numeric>
+	"data.h"
+	"../src/unordered_map.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\unordered_map.h
+	<stddef.h>
+	<iterator>
+	<functional>
+	"iunordered_map.h"
+	"container.h"
+	"pool.h"
+	"vector.h"
+	"intrusive_forward_list.h"
+	"hash.h"
+
+1456953131 d:\users\john\documents\programming\github\etl\src\iunordered_map.h
+	<iterator>
+	<algorithm>
+	<functional>
+	<utility>
+	<stddef.h>
+	"type_traits.h"
+	"parameter_type.h"
+	"hash.h"
+	"nullptr.h"
+	"ipool.h"
+	"ivector.h"
+	"error_handler.h"
+	"intrusive_forward_list.h"
+	"exception.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\variant.h
+	<stdint.h>
+	"array.h"
+	"largest.h"
+	"exception.h"
+	"type_traits.h"
+	"integral_limits.h"
+	"static_assert.h"
+	"alignment.h"
+	"error_handler.h"
+
+1456669289 d:\users\john\documents\programming\github\etl\src\visitor.h
+
diff --git a/test/codeblocks/ETL.layout b/test/codeblocks/ETL.layout
index 8a4a301d..4a8973c4 100644
--- a/test/codeblocks/ETL.layout
+++ b/test/codeblocks/ETL.layout
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="Windows" />
-	<File name="..\..\pool.h" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\iqueue.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="2334" topLine="35" />
+			<Cursor1 position="5008" topLine="60" />
 		</Cursor>
 	</File>
 	<File name="..\test_map.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -11,199 +11,14 @@
 			<Cursor1 position="4405" topLine="112" />
 		</Cursor>
 	</File>
-	<File name="..\test_hash.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_optional.cpp" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="4733" topLine="114" />
+			<Cursor1 position="3050" topLine="59" />
 		</Cursor>
 	</File>
-	<File name="..\..\private\flat_map_base.h" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\observer.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="1579" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\ExecuteTest.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1247" topLine="2" />
-		</Cursor>
-	</File>
-	<File name="..\..\imap.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="50514" topLine="1440" />
-		</Cursor>
-	</File>
-	<File name="..\test_array.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1346" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\TestRunner.h" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="692" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\map.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5955" topLine="137" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\Checks.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="469" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\array.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1998" topLine="258" />
-		</Cursor>
-	</File>
-	<File name="..\test_alignment.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1554" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\lookup.h" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3734" topLine="55" />
-		</Cursor>
-	</File>
-	<File name="..\..\nullptr.h" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="560" topLine="9" />
-		</Cursor>
-	</File>
-	<File name="..\..\private\vector_base.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1551" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\iset.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="48031" topLine="1364" />
-		</Cursor>
-	</File>
-	<File name="..\test_variant.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="11763" topLine="384" />
-		</Cursor>
-	</File>
-	<File name="..\test_deque.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="21475" topLine="641" />
-		</Cursor>
-	</File>
-	<File name="..\..\private\set_base.h" open="0" top="0" tabpos="29" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5234" topLine="132" />
-		</Cursor>
-	</File>
-	<File name="..\..\container.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2523" topLine="42" />
-		</Cursor>
-	</File>
-	<File name="..\test_cyclic_value.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1365" topLine="12" />
-		</Cursor>
-	</File>
-	<File name="..\..\error_handler.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4037" topLine="53" />
-		</Cursor>
-	</File>
-	<File name="..\..\stack.h" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3203" topLine="57" />
-		</Cursor>
-	</File>
-	<File name="..\..\endian.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2235" topLine="37" />
-		</Cursor>
-	</File>
-	<File name="..\..\alignment.h" open="0" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="5607" topLine="134" />
-		</Cursor>
-	</File>
-	<File name="..\..\static_assert.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1356" topLine="10" />
-		</Cursor>
-	</File>
-	<File name="..\test_queue.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1603" topLine="28" />
-		</Cursor>
-	</File>
-	<File name="..\..\private\flat_multimap_base.h" open="0" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1604" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\test_binary.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1534" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\test_forward_list.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3881" topLine="77" />
-		</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">
-		<Cursor>
-			<Cursor1 position="1865" topLine="28" />
-		</Cursor>
-	</File>
-	<File name="..\test_error_handler.cpp" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2501" topLine="42" />
-		</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="1524" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\deque.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4670" topLine="110" />
-		</Cursor>
-	</File>
-	<File name="..\..\private\deque_base.h" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="0" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\ideque.h" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="29778" topLine="887" />
-		</Cursor>
-	</File>
-	<File name="..\..\integral_limits.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2272" topLine="36" />
-		</Cursor>
-	</File>
-	<File name="..\..\queue.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2984" topLine="48" />
-		</Cursor>
-	</File>
-	<File name="..\..\list.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4072" topLine="77" />
-		</Cursor>
-	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\Test.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="662" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="..\..\io_port.h" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2314" topLine="48" />
+			<Cursor1 position="4997" topLine="66" />
 		</Cursor>
 	</File>
 	<File name="..\test_integral_limits.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -211,39 +26,29 @@
 			<Cursor1 position="1416" topLine="13" />
 		</Cursor>
 	</File>
-	<File name="..\..\..\unittest-cpp\UnitTest++\Config.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<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">
 		<Cursor>
-			<Cursor1 position="773" topLine="0" />
+			<Cursor1 position="257" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\..\type_traits.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\ipool.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="11681" topLine="241" />
+			<Cursor1 position="12290" topLine="320" />
 		</Cursor>
 	</File>
-	<File name="..\test_exception.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_cyclic_value.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="2419" topLine="15" />
+			<Cursor1 position="1365" topLine="12" />
 		</Cursor>
 	</File>
-	<File name="..\..\binary.h" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_intrusive_forward_list.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="18374" topLine="466" />
+			<Cursor1 position="1679" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\..\optional.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\ivector.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="2746" topLine="58" />
-		</Cursor>
-	</File>
-	<File name="..\..\Doxyfile" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="56760" topLine="1251" />
-		</Cursor>
-	</File>
-	<File name="..\test_bitset.cpp" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1601" topLine="0" />
+			<Cursor1 position="10520" topLine="236" />
 		</Cursor>
 	</File>
 	<File name="..\test_type_traits.cpp" open="0" top="0" tabpos="30" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -251,44 +56,94 @@
 			<Cursor1 position="30352" topLine="372" />
 		</Cursor>
 	</File>
-	<File name="..\..\vector.h" open="0" top="0" tabpos="31" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\..\unittest-cpp\UnitTest++\TestRunner.h" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="4075" topLine="67" />
+			<Cursor1 position="692" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\..\function.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_error_handler.cpp" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="3693" topLine="67" />
+			<Cursor1 position="2501" topLine="42" />
 		</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">
+	<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="257" topLine="0" />
+			<Cursor1 position="773" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\test_io_port.cpp" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_variant.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="2724" topLine="58" />
+			<Cursor1 position="11763" topLine="384" />
 		</Cursor>
 	</File>
-	<File name="..\test_bloom_filter.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\..\unittest-cpp\UnitTest++\Test.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="6486" topLine="208" />
+			<Cursor1 position="662" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\test_set.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_bitset.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="5885" topLine="199" />
+			<Cursor1 position="1601" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="..\test_list.cpp" open="1" top="1" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_hash.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="29671" topLine="878" />
+			<Cursor1 position="4733" topLine="114" />
 		</Cursor>
 	</File>
-	<File name="..\..\ilist.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_alignment.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="17660" topLine="539" />
+			<Cursor1 position="1554" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\vector.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3110" topLine="24" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\crc32.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3389" topLine="44" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\crc64_ecma.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3458" topLine="44" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\crc8_ccitt.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2436" topLine="15" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\ilist.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="16337" topLine="489" />
+		</Cursor>
+	</File>
+	<File name="..\test_vector.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="9922" topLine="306" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\imap.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="22839" topLine="636" />
+		</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">
+		<Cursor>
+			<Cursor1 position="1865" topLine="28" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\intrusive_links.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="20132" topLine="663" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\intrusive_forward_list.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="16457" topLine="442" />
 		</Cursor>
 	</File>
 	<File name="..\..\..\unittest-cpp\UnitTest++\TestRunner.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -296,19 +151,129 @@
 			<Cursor1 position="2020" topLine="25" />
 		</Cursor>
 	</File>
-	<File name="..\..\private\multiset_base.h" open="0" top="0" tabpos="27" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_list.cpp" open="1" top="1" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="5342" topLine="125" />
+			<Cursor1 position="40851" topLine="1166" />
 		</Cursor>
 	</File>
-	<File name="..\..\cyclic_value.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\src\istack.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="3578" topLine="85" />
+			<Cursor1 position="2266" topLine="38" />
 		</Cursor>
 	</File>
-	<File name="..\test_optional.cpp" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\test_forward_list.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="3050" topLine="59" />
+			<Cursor1 position="3941" topLine="77" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\bloom_filter.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3800" topLine="75" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\iunordered_map.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="25812" topLine="704" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\Checks.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="469" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_array.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1346" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\optional.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="8753" topLine="220" />
+		</Cursor>
+	</File>
+	<File name="..\test_io_port.cpp" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2724" topLine="58" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\frame_check_sequence.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="76" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\crc16_ccitt.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3464" topLine="44" />
+		</Cursor>
+	</File>
+	<File name="..\test_deque.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="21475" topLine="641" />
+		</Cursor>
+	</File>
+	<File name="..\test_exception.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2419" topLine="15" />
+		</Cursor>
+	</File>
+	<File name="..\test_set.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="5885" topLine="199" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\checksum.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="6114" topLine="139" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\variant.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="36593" topLine="842" />
+		</Cursor>
+	</File>
+	<File name="..\..\..\unittest-cpp\UnitTest++\ExecuteTest.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1247" topLine="2" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\crc16_kermit.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3458" topLine="44" />
+		</Cursor>
+	</File>
+	<File name="..\test_binary.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1534" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\test_bloom_filter.cpp" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="6486" topLine="208" />
+		</Cursor>
+	</File>
+	<File name="..\test_queue.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1603" topLine="28" />
+		</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="1524" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\binary.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="19509" topLine="464" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\iset.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="20665" topLine="581" />
+		</Cursor>
+	</File>
+	<File name="..\..\src\crc16.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="3363" topLine="44" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>
diff --git a/test/test_list.cpp b/test/test_list.cpp
index 05d186ac..dd944b62 100644
--- a/test/test_list.cpp
+++ b/test/test_list.cpp
@@ -924,7 +924,7 @@ namespace
 
       are_equal = std::equal(data2.begin(), data2.end(), compare_data2.begin());
       CHECK(are_equal);
-      
+
       // Move to the end.
       compare_data.assign(unsorted_data.begin(), unsorted_data.end());
       compare_data2.assign(unsorted_data.begin(), unsorted_data.end());
@@ -1173,48 +1173,6 @@ namespace
       are_equal = std::equal(data2.begin(), data2.end(), compare_data2.begin());
       CHECK(are_equal);
     }
-    
-    //*************************************************************************
-    TEST_FIXTURE(SetupFixture, test_splice_list_same)
-    {
-      CompareData compare_data(unsorted_data.begin(), unsorted_data.end());
-      DataNDC data(unsorted_data.begin(), unsorted_data.end());
-
-      CompareData::iterator compare_to;
-      DataNDC::iterator to;
-
-      // Move to the beginning.
-      compare_to = compare_data.begin();
-      compare_data.splice(compare_to, compare_data);
-
-      to = data.begin();
-      data.splice(to, data);
-
-      are_equal = std::equal(data.begin(), data.end(), compare_data.begin());
-      CHECK(are_equal);
-
-      // Move to the end.
-      compare_to = compare_data.end();
-      compare_data.splice(compare_to, compare_data);
-
-      to = data.end();
-      data.splice(to, data);
-
-      are_equal = std::equal(data.begin(), data.end(), compare_data.begin());
-      CHECK(are_equal);
-
-      // Move nearby.
-      compare_to = compare_data.begin();
-      std::advance(compare_to, 7);
-      compare_data.splice(compare_to, compare_data);
-
-      to = data.begin();
-      std::advance(to, 7);
-      data.splice(to, data);
-
-      are_equal = std::equal(data.begin(), data.end(), compare_data.begin());
-      CHECK(are_equal);
-    }
 
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_splice_list_different)
@@ -1240,7 +1198,7 @@ namespace
 
       are_equal = std::equal(data2.begin(), data2.end(), compare_data2.begin());
       CHECK(are_equal);
-      
+
       // Move to the end.
       compare_data.assign(unsorted_data.begin(), unsorted_data.end());
       compare_data2.assign(unsorted_data.begin(), unsorted_data.end());