diff --git a/.travis.yml b/.travis.yml
index c168ae3..ea18019 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,6 +95,7 @@ matrix:
       env:
         - TOOLSET=clang++-3.9
         - CPP_EXTRA_FEATURES="cxx_relaxed_constexpr"
+	- LIBCXX=On
 
     - os: osx
       compiler: clang
diff --git a/src/kvasir/mpl/algorithm/group.hpp b/src/kvasir/mpl/algorithm/group.hpp
index 8ac4fa3..4ed0836 100644
--- a/src/kvasir/mpl/algorithm/group.hpp
+++ b/src/kvasir/mpl/algorithm/group.hpp
@@ -13,8 +13,8 @@
 #include "../sequence/take.hpp"
 #include "../types/int.hpp"
 #include "../types/list.hpp"
+#include "../types/traits.hpp"
 #include "../utility/conditional.hpp"
-#include "../utility/is_same.hpp"
 
 namespace kvasir {
 	namespace mpl {
diff --git a/src/kvasir/mpl/algorithm/index_if.hpp b/src/kvasir/mpl/algorithm/index_if.hpp
new file mode 100644
index 0000000..66d492f
--- /dev/null
+++ b/src/kvasir/mpl/algorithm/index_if.hpp
@@ -0,0 +1,26 @@
+//          Copyright Odin Holmes 2016.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE.md or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+#pragma once
+#include <tuple>
+#include "make_sequence.hpp"
+#include "zip_with.hpp"
+#include "../functional/bind.hpp"
+#include "../functional/flow.hpp"
+#include "../sequence/at.hpp"
+#include "../sequence/join.hpp"
+
+namespace kvasir {
+	namespace mpl {
+		namespace detail {
+			template <typename F, typename C = listify>
+			struct index_if {
+				template <typename... Ts>
+				using f = typename zip_fixed<if_<at<uint_<1>, F>, front<cfe<list>>, always<list<>>>,
+				                             call<make_int_sequence<>, uint_<sizeof...(Ts)>>,
+				                             join<C>>::template f<Ts...>;
+			};
+		} // namespace detail
+	} // namespace mpl
+} // namespace kvasir
diff --git a/src/kvasir/mpl/algorithm/transform.hpp b/src/kvasir/mpl/algorithm/transform.hpp
index 12b44c7..373dc32 100644
--- a/src/kvasir/mpl/algorithm/transform.hpp
+++ b/src/kvasir/mpl/algorithm/transform.hpp
@@ -13,7 +13,7 @@ namespace kvasir {
 	namespace mpl {
 		/// \brief executes the continuation `F` on every element in the input pack passing the
 		/// results to the continuation `C`
-		template <typename F=identity, typename C = listify>
+		template <typename F = identity, typename C = listify>
 		struct transform {
 			template <typename... Ts>
 			using f = typename dcall<C, sizeof...(Ts)>::template f<typename F::template f<Ts>...>;
diff --git a/src/kvasir/mpl/algorithm/zip_with.hpp b/src/kvasir/mpl/algorithm/zip_with.hpp
index 9488c39..3006b81 100644
--- a/src/kvasir/mpl/algorithm/zip_with.hpp
+++ b/src/kvasir/mpl/algorithm/zip_with.hpp
@@ -11,10 +11,14 @@
 #include "../types/nothing.hpp"
 #include "../utility/always.hpp"
 
+#include "../sequence/drop.hpp"
 #include "../sequence/pop_front.hpp"
 #include "../sequence/push_front.hpp"
 #include "../sequence/size.hpp"
 
+#include "../algorithm/make_sequence.hpp"
+#include "../algorithm/rotate.hpp"
+
 namespace kvasir {
 	namespace mpl {
 		namespace detail {
@@ -89,7 +93,45 @@ namespace kvasir {
 			template <typename... Ts>
 			using f = typename detail::zip_with_unpack<F, C, Ts...>::f;
 		};
+		namespace detail {
+			/// \brief n-ary version of transform with all but one of the sequences as fixed
+			/// parameters
+			template <typename F, typename... Ls>
+			struct zip_fixed {
+			private:
+				using fixed_size = uint_<(sizeof...(Ls) - 1)>;
+				using C          = typename drop<fixed_size>::template f<Ls...>;
 
+			public:
+				template <typename... Ts>
+				using f =
+				        typename rotate<uint_<sizeof...(Ls)>,
+				                        pop_front<zip_with<F, C>>>::template f<Ls..., list<Ts...>>;
+			};
+			/// \exclude
+			template <typename F, template <typename...> class L, typename... Ls, typename C>
+			struct zip_fixed<F, L<Ls...>, C> {
+				template <typename... Ts>
+				using f = typename dcall<C, sizeof...(Ts)>::template f<
+				        typename dcall<F, sizeof...(Ts)>::template f<Ls, Ts>...>;
+			};
+			/// \exclude
+			template <typename F, template <typename...> class L1, template <typename...> class L2,
+			          typename... L1s, typename... L2s, typename C>
+			struct zip_fixed<F, L1<L1s...>, L2<L2s...>, C> {
+				template <typename... Ts>
+				using f = typename dcall<C, sizeof...(Ts)>::template f<
+				        typename dcall<F, sizeof...(Ts)>::template f<L1s, L2s, Ts>...>;
+			};
+
+			/// \brief binary transform of an index sequence and the dynamic input sequence
+			template <typename F, typename C>
+			struct zip_with_index {
+				template <typename... Ts>
+				using f = typename zip_fixed<F, call<make_int_sequence<>, uint_<sizeof...(Ts)>>,
+				                             C>::template f<Ts...>;
+			};
+		} // namespace detail
 		namespace eager {
 			template <template <typename...> class Func, typename... Lists>
 			using zip_with = call<zip_with<cfe<Func>>, Lists...>;
diff --git a/src/kvasir/mpl/functional/bind.hpp b/src/kvasir/mpl/functional/bind.hpp
index 34a5ae8..f368aba 100644
--- a/src/kvasir/mpl/functional/bind.hpp
+++ b/src/kvasir/mpl/functional/bind.hpp
@@ -50,5 +50,47 @@ namespace kvasir {
 			template <typename... Ts>
 			using f = typename dcallf<bool(sizeof...(Ts) > 0)>::template f1<F, Ts...>;
 		};
+		/// \brief makes a continuation from an eager metafunction /
+		/// wraps a template template parameter in such a way that it can be used as a
+		/// continuation capable meta closure.
+		/// \requires fixed parameters: a template template parameter (the eager metafunction)
+		/// dynamic parameters: one type parameter
+		/// \effects the result will be whatever the eager metafunction maps to when passed the
+		/// dynamic parameters
+		/// \notes when passed an alias the result is the same as a traditional call to the at
+		/// metafunction/ \notes it is perfectly valid to pass a template such as tuple or pair as a
+		/// 'metafunction'
+		template <template <typename...> class F, typename C = identity>
+		struct cfe1 {
+			template <typename T>
+			using f = typename C::template f<F<T>>;
+		};
+		/// \exclude
+		template <template <typename...> class F>
+		struct cfe1<F, identity> {
+			template <typename T>
+			using f = F<T>;
+		};
+		/// \brief makes a continuation from an eager metafunction /
+		/// wraps a template template parameter in such a way that it can be used as a
+		/// continuation capable meta closure.
+		/// \requires fixed parameters: a template template parameter (the eager metafunction)
+		/// dynamic parameters: two type parameters
+		/// \effects the result will be whatever the eager metafunction maps to when passed the
+		/// dynamic parameters
+		/// \notes when passed an alias the result is the same as a traditional call to the at
+		/// metafunction/ \notes it is perfectly valid to pass a template such as tuple or pair as a
+		/// 'metafunction'
+		template <template <typename...> class F, typename C = identity>
+		struct cfe2 {
+			template <typename T, typename U>
+			using f = typename C::template f<F<T,U>>;
+		};
+		/// \exclude
+		template <template <typename...> class F>
+		struct cfe2<F, identity> {
+			template <typename T, typename U>
+			using f = F<T, U>;
+		};
 	} // namespace mpl
 } // namespace kvasir
diff --git a/src/kvasir/mpl/mpl.hpp b/src/kvasir/mpl/mpl.hpp
index 31e80ad..414218e 100644
--- a/src/kvasir/mpl/mpl.hpp
+++ b/src/kvasir/mpl/mpl.hpp
@@ -13,6 +13,7 @@
 #include "algorithm/fold_left.hpp"
 #include "algorithm/fold_right.hpp"
 #include "algorithm/group.hpp"
+#include "algorithm/index_if.hpp"
 #include "algorithm/make_sequence.hpp"
 #include "algorithm/partition.hpp"
 #include "algorithm/product.hpp"
@@ -82,6 +83,7 @@
 #include "types/list.hpp"
 #include "types/nothing.hpp"
 #include "types/traits.hpp"
+#include "types/type.hpp"
 
 #include "utility/always.hpp"
 #include "utility/conditional.hpp"
diff --git a/src/kvasir/mpl/sequence/join.hpp b/src/kvasir/mpl/sequence/join.hpp
index 38218d2..ce772bd 100644
--- a/src/kvasir/mpl/sequence/join.hpp
+++ b/src/kvasir/mpl/sequence/join.hpp
@@ -1272,264 +1272,153 @@ namespace kvasir {
 			};
 			template <>
 			struct join_select<5> { // more than 1024
-				template <
-				        template <typename...> class, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename, typename,
-				        typename, typename, typename...>
+				template <template <typename...> class, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename, typename,
+				          typename, typename, typename, typename, typename, typename...>
 				struct f;
 				template <
 				        template <typename...> class C, typename... T0s, typename... T1s,
@@ -2043,152 +1932,182 @@ namespace kvasir {
 				         list<T1016s...>, list<T1017s...>, list<T1018s...>, list<T1019s...>,
 				         list<T1020s...>, list<T1021s...>, list<T1022s...>, list<T1023s...>,
 				         Ls...> {
-					using type = typename join_select<select_join_size(sizeof...(Ls)+1)>::template f<C, list<
-					        T0s..., T1s..., T2s..., T3s..., T4s..., T5s..., T6s..., T7s..., T8s...,
-					        T9s..., T10s..., T11s..., T12s..., T13s..., T14s..., T15s..., T16s...,
-					        T17s..., T18s..., T19s..., T20s..., T21s..., T22s..., T23s..., T24s...,
-					        T25s..., T26s..., T27s..., T28s..., T29s..., T30s..., T31s..., T32s...,
-					        T33s..., T34s..., T35s..., T36s..., T37s..., T38s..., T39s..., T40s...,
-					        T41s..., T42s..., T43s..., T44s..., T45s..., T46s..., T47s..., T48s...,
-					        T49s..., T50s..., T51s..., T52s..., T53s..., T54s..., T55s..., T56s...,
-					        T57s..., T58s..., T59s..., T60s..., T61s..., T62s..., T63s..., T64s...,
-					        T65s..., T66s..., T67s..., T68s..., T69s..., T70s..., T71s..., T72s...,
-					        T73s..., T74s..., T75s..., T76s..., T77s..., T78s..., T79s..., T80s...,
-					        T81s..., T82s..., T83s..., T84s..., T85s..., T86s..., T87s..., T88s...,
-					        T89s..., T90s..., T91s..., T92s..., T93s..., T94s..., T95s..., T96s...,
-					        T97s..., T98s..., T99s..., T100s..., T101s..., T102s..., T103s...,
-					        T104s..., T105s..., T106s..., T107s..., T108s..., T109s..., T110s...,
-					        T111s..., T112s..., T113s..., T114s..., T115s..., T116s..., T117s...,
-					        T118s..., T119s..., T120s..., T121s..., T122s..., T123s..., T124s...,
-					        T125s..., T126s..., T127s..., T128s..., T129s..., T130s..., T131s...,
-					        T132s..., T133s..., T134s..., T135s..., T136s..., T137s..., T138s...,
-					        T139s..., T140s..., T141s..., T142s..., T143s..., T144s..., T145s...,
-					        T146s..., T147s..., T148s..., T149s..., T150s..., T151s..., T152s...,
-					        T153s..., T154s..., T155s..., T156s..., T157s..., T158s..., T159s...,
-					        T160s..., T161s..., T162s..., T163s..., T164s..., T165s..., T166s...,
-					        T167s..., T168s..., T169s..., T170s..., T171s..., T172s..., T173s...,
-					        T174s..., T175s..., T176s..., T177s..., T178s..., T179s..., T180s...,
-					        T181s..., T182s..., T183s..., T184s..., T185s..., T186s..., T187s...,
-					        T188s..., T189s..., T190s..., T191s..., T192s..., T193s..., T194s...,
-					        T195s..., T196s..., T197s..., T198s..., T199s..., T200s..., T201s...,
-					        T202s..., T203s..., T204s..., T205s..., T206s..., T207s..., T208s...,
-					        T209s..., T210s..., T211s..., T212s..., T213s..., T214s..., T215s...,
-					        T216s..., T217s..., T218s..., T219s..., T220s..., T221s..., T222s...,
-					        T223s..., T224s..., T225s..., T226s..., T227s..., T228s..., T229s...,
-					        T230s..., T231s..., T232s..., T233s..., T234s..., T235s..., T236s...,
-					        T237s..., T238s..., T239s..., T240s..., T241s..., T242s..., T243s...,
-					        T244s..., T245s..., T246s..., T247s..., T248s..., T249s..., T250s...,
-					        T251s..., T252s..., T253s..., T254s..., T255s..., T256s..., T257s...,
-					        T258s..., T259s..., T260s..., T261s..., T262s..., T263s..., T264s...,
-					        T265s..., T266s..., T267s..., T268s..., T269s..., T270s..., T271s...,
-					        T272s..., T273s..., T274s..., T275s..., T276s..., T277s..., T278s...,
-					        T279s..., T280s..., T281s..., T282s..., T283s..., T284s..., T285s...,
-					        T286s..., T287s..., T288s..., T289s..., T290s..., T291s..., T292s...,
-					        T293s..., T294s..., T295s..., T296s..., T297s..., T298s..., T299s...,
-					        T300s..., T301s..., T302s..., T303s..., T304s..., T305s..., T306s...,
-					        T307s..., T308s..., T309s..., T310s..., T311s..., T312s..., T313s...,
-					        T314s..., T315s..., T316s..., T317s..., T318s..., T319s..., T320s...,
-					        T321s..., T322s..., T323s..., T324s..., T325s..., T326s..., T327s...,
-					        T328s..., T329s..., T330s..., T331s..., T332s..., T333s..., T334s...,
-					        T335s..., T336s..., T337s..., T338s..., T339s..., T340s..., T341s...,
-					        T342s..., T343s..., T344s..., T345s..., T346s..., T347s..., T348s...,
-					        T349s..., T350s..., T351s..., T352s..., T353s..., T354s..., T355s...,
-					        T356s..., T357s..., T358s..., T359s..., T360s..., T361s..., T362s...,
-					        T363s..., T364s..., T365s..., T366s..., T367s..., T368s..., T369s...,
-					        T370s..., T371s..., T372s..., T373s..., T374s..., T375s..., T376s...,
-					        T377s..., T378s..., T379s..., T380s..., T381s..., T382s..., T383s...,
-					        T384s..., T385s..., T386s..., T387s..., T388s..., T389s..., T390s...,
-					        T391s..., T392s..., T393s..., T394s..., T395s..., T396s..., T397s...,
-					        T398s..., T399s..., T400s..., T401s..., T402s..., T403s..., T404s...,
-					        T405s..., T406s..., T407s..., T408s..., T409s..., T410s..., T411s...,
-					        T412s..., T413s..., T414s..., T415s..., T416s..., T417s..., T418s...,
-					        T419s..., T420s..., T421s..., T422s..., T423s..., T424s..., T425s...,
-					        T426s..., T427s..., T428s..., T429s..., T430s..., T431s..., T432s...,
-					        T433s..., T434s..., T435s..., T436s..., T437s..., T438s..., T439s...,
-					        T440s..., T441s..., T442s..., T443s..., T444s..., T445s..., T446s...,
-					        T447s..., T448s..., T449s..., T450s..., T451s..., T452s..., T453s...,
-					        T454s..., T455s..., T456s..., T457s..., T458s..., T459s..., T460s...,
-					        T461s..., T462s..., T463s..., T464s..., T465s..., T466s..., T467s...,
-					        T468s..., T469s..., T470s..., T471s..., T472s..., T473s..., T474s...,
-					        T475s..., T476s..., T477s..., T478s..., T479s..., T480s..., T481s...,
-					        T482s..., T483s..., T484s..., T485s..., T486s..., T487s..., T488s...,
-					        T489s..., T490s..., T491s..., T492s..., T493s..., T494s..., T495s...,
-					        T496s..., T497s..., T498s..., T499s..., T500s..., T501s..., T502s...,
-					        T503s..., T504s..., T505s..., T506s..., T507s..., T508s..., T509s...,
-					        T510s..., T511s..., T512s..., T513s..., T514s..., T515s..., T516s...,
-					        T517s..., T518s..., T519s..., T520s..., T521s..., T522s..., T523s...,
-					        T524s..., T525s..., T526s..., T527s..., T528s..., T529s..., T530s...,
-					        T531s..., T532s..., T533s..., T534s..., T535s..., T536s..., T537s...,
-					        T538s..., T539s..., T540s..., T541s..., T542s..., T543s..., T544s...,
-					        T545s..., T546s..., T547s..., T548s..., T549s..., T550s..., T551s...,
-					        T552s..., T553s..., T554s..., T555s..., T556s..., T557s..., T558s...,
-					        T559s..., T560s..., T561s..., T562s..., T563s..., T564s..., T565s...,
-					        T566s..., T567s..., T568s..., T569s..., T570s..., T571s..., T572s...,
-					        T573s..., T574s..., T575s..., T576s..., T577s..., T578s..., T579s...,
-					        T580s..., T581s..., T582s..., T583s..., T584s..., T585s..., T586s...,
-					        T587s..., T588s..., T589s..., T590s..., T591s..., T592s..., T593s...,
-					        T594s..., T595s..., T596s..., T597s..., T598s..., T599s..., T600s...,
-					        T601s..., T602s..., T603s..., T604s..., T605s..., T606s..., T607s...,
-					        T608s..., T609s..., T610s..., T611s..., T612s..., T613s..., T614s...,
-					        T615s..., T616s..., T617s..., T618s..., T619s..., T620s..., T621s...,
-					        T622s..., T623s..., T624s..., T625s..., T626s..., T627s..., T628s...,
-					        T629s..., T630s..., T631s..., T632s..., T633s..., T634s..., T635s...,
-					        T636s..., T637s..., T638s..., T639s..., T640s..., T641s..., T642s...,
-					        T643s..., T644s..., T645s..., T646s..., T647s..., T648s..., T649s...,
-					        T650s..., T651s..., T652s..., T653s..., T654s..., T655s..., T656s...,
-					        T657s..., T658s..., T659s..., T660s..., T661s..., T662s..., T663s...,
-					        T664s..., T665s..., T666s..., T667s..., T668s..., T669s..., T670s...,
-					        T671s..., T672s..., T673s..., T674s..., T675s..., T676s..., T677s...,
-					        T678s..., T679s..., T680s..., T681s..., T682s..., T683s..., T684s...,
-					        T685s..., T686s..., T687s..., T688s..., T689s..., T690s..., T691s...,
-					        T692s..., T693s..., T694s..., T695s..., T696s..., T697s..., T698s...,
-					        T699s..., T700s..., T701s..., T702s..., T703s..., T704s..., T705s...,
-					        T706s..., T707s..., T708s..., T709s..., T710s..., T711s..., T712s...,
-					        T713s..., T714s..., T715s..., T716s..., T717s..., T718s..., T719s...,
-					        T720s..., T721s..., T722s..., T723s..., T724s..., T725s..., T726s...,
-					        T727s..., T728s..., T729s..., T730s..., T731s..., T732s..., T733s...,
-					        T734s..., T735s..., T736s..., T737s..., T738s..., T739s..., T740s...,
-					        T741s..., T742s..., T743s..., T744s..., T745s..., T746s..., T747s...,
-					        T748s..., T749s..., T750s..., T751s..., T752s..., T753s..., T754s...,
-					        T755s..., T756s..., T757s..., T758s..., T759s..., T760s..., T761s...,
-					        T762s..., T763s..., T764s..., T765s..., T766s..., T767s..., T768s...,
-					        T769s..., T770s..., T771s..., T772s..., T773s..., T774s..., T775s...,
-					        T776s..., T777s..., T778s..., T779s..., T780s..., T781s..., T782s...,
-					        T783s..., T784s..., T785s..., T786s..., T787s..., T788s..., T789s...,
-					        T790s..., T791s..., T792s..., T793s..., T794s..., T795s..., T796s...,
-					        T797s..., T798s..., T799s..., T800s..., T801s..., T802s..., T803s...,
-					        T804s..., T805s..., T806s..., T807s..., T808s..., T809s..., T810s...,
-					        T811s..., T812s..., T813s..., T814s..., T815s..., T816s..., T817s...,
-					        T818s..., T819s..., T820s..., T821s..., T822s..., T823s..., T824s...,
-					        T825s..., T826s..., T827s..., T828s..., T829s..., T830s..., T831s...,
-					        T832s..., T833s..., T834s..., T835s..., T836s..., T837s..., T838s...,
-					        T839s..., T840s..., T841s..., T842s..., T843s..., T844s..., T845s...,
-					        T846s..., T847s..., T848s..., T849s..., T850s..., T851s..., T852s...,
-					        T853s..., T854s..., T855s..., T856s..., T857s..., T858s..., T859s...,
-					        T860s..., T861s..., T862s..., T863s..., T864s..., T865s..., T866s...,
-					        T867s..., T868s..., T869s..., T870s..., T871s..., T872s..., T873s...,
-					        T874s..., T875s..., T876s..., T877s..., T878s..., T879s..., T880s...,
-					        T881s..., T882s..., T883s..., T884s..., T885s..., T886s..., T887s...,
-					        T888s..., T889s..., T890s..., T891s..., T892s..., T893s..., T894s...,
-					        T895s..., T896s..., T897s..., T898s..., T899s..., T900s..., T901s...,
-					        T902s..., T903s..., T904s..., T905s..., T906s..., T907s..., T908s...,
-					        T909s..., T910s..., T911s..., T912s..., T913s..., T914s..., T915s...,
-					        T916s..., T917s..., T918s..., T919s..., T920s..., T921s..., T922s...,
-					        T923s..., T924s..., T925s..., T926s..., T927s..., T928s..., T929s...,
-					        T930s..., T931s..., T932s..., T933s..., T934s..., T935s..., T936s...,
-					        T937s..., T938s..., T939s..., T940s..., T941s..., T942s..., T943s...,
-					        T944s..., T945s..., T946s..., T947s..., T948s..., T949s..., T950s...,
-					        T951s..., T952s..., T953s..., T954s..., T955s..., T956s..., T957s...,
-					        T958s..., T959s..., T960s..., T961s..., T962s..., T963s..., T964s...,
-					        T965s..., T966s..., T967s..., T968s..., T969s..., T970s..., T971s...,
-					        T972s..., T973s..., T974s..., T975s..., T976s..., T977s..., T978s...,
-					        T979s..., T980s..., T981s..., T982s..., T983s..., T984s..., T985s...,
-					        T986s..., T987s..., T988s..., T989s..., T990s..., T991s..., T992s...,
-					        T993s..., T994s..., T995s..., T996s..., T997s..., T998s..., T999s...,
-					        T1000s..., T1001s..., T1002s..., T1003s..., T1004s..., T1005s...,
-					        T1006s..., T1007s..., T1008s..., T1009s..., T1010s..., T1011s...,
-					        T1012s..., T1013s..., T1014s..., T1015s..., T1016s..., T1017s...,
-					        T1018s..., T1019s..., T1020s..., T1021s..., T1022s..., T1023s...>, Ls...>::type;
+					using type =
+					        typename join_select<select_join_size(sizeof...(Ls) + 1)>::template f<
+					                C,
+					                list<T0s..., T1s..., T2s..., T3s..., T4s..., T5s..., T6s...,
+					                     T7s..., T8s..., T9s..., T10s..., T11s..., T12s..., T13s...,
+					                     T14s..., T15s..., T16s..., T17s..., T18s..., T19s...,
+					                     T20s..., T21s..., T22s..., T23s..., T24s..., T25s...,
+					                     T26s..., T27s..., T28s..., T29s..., T30s..., T31s...,
+					                     T32s..., T33s..., T34s..., T35s..., T36s..., T37s...,
+					                     T38s..., T39s..., T40s..., T41s..., T42s..., T43s...,
+					                     T44s..., T45s..., T46s..., T47s..., T48s..., T49s...,
+					                     T50s..., T51s..., T52s..., T53s..., T54s..., T55s...,
+					                     T56s..., T57s..., T58s..., T59s..., T60s..., T61s...,
+					                     T62s..., T63s..., T64s..., T65s..., T66s..., T67s...,
+					                     T68s..., T69s..., T70s..., T71s..., T72s..., T73s...,
+					                     T74s..., T75s..., T76s..., T77s..., T78s..., T79s...,
+					                     T80s..., T81s..., T82s..., T83s..., T84s..., T85s...,
+					                     T86s..., T87s..., T88s..., T89s..., T90s..., T91s...,
+					                     T92s..., T93s..., T94s..., T95s..., T96s..., T97s...,
+					                     T98s..., T99s..., T100s..., T101s..., T102s..., T103s...,
+					                     T104s..., T105s..., T106s..., T107s..., T108s..., T109s...,
+					                     T110s..., T111s..., T112s..., T113s..., T114s..., T115s...,
+					                     T116s..., T117s..., T118s..., T119s..., T120s..., T121s...,
+					                     T122s..., T123s..., T124s..., T125s..., T126s..., T127s...,
+					                     T128s..., T129s..., T130s..., T131s..., T132s..., T133s...,
+					                     T134s..., T135s..., T136s..., T137s..., T138s..., T139s...,
+					                     T140s..., T141s..., T142s..., T143s..., T144s..., T145s...,
+					                     T146s..., T147s..., T148s..., T149s..., T150s..., T151s...,
+					                     T152s..., T153s..., T154s..., T155s..., T156s..., T157s...,
+					                     T158s..., T159s..., T160s..., T161s..., T162s..., T163s...,
+					                     T164s..., T165s..., T166s..., T167s..., T168s..., T169s...,
+					                     T170s..., T171s..., T172s..., T173s..., T174s..., T175s...,
+					                     T176s..., T177s..., T178s..., T179s..., T180s..., T181s...,
+					                     T182s..., T183s..., T184s..., T185s..., T186s..., T187s...,
+					                     T188s..., T189s..., T190s..., T191s..., T192s..., T193s...,
+					                     T194s..., T195s..., T196s..., T197s..., T198s..., T199s...,
+					                     T200s..., T201s..., T202s..., T203s..., T204s..., T205s...,
+					                     T206s..., T207s..., T208s..., T209s..., T210s..., T211s...,
+					                     T212s..., T213s..., T214s..., T215s..., T216s..., T217s...,
+					                     T218s..., T219s..., T220s..., T221s..., T222s..., T223s...,
+					                     T224s..., T225s..., T226s..., T227s..., T228s..., T229s...,
+					                     T230s..., T231s..., T232s..., T233s..., T234s..., T235s...,
+					                     T236s..., T237s..., T238s..., T239s..., T240s..., T241s...,
+					                     T242s..., T243s..., T244s..., T245s..., T246s..., T247s...,
+					                     T248s..., T249s..., T250s..., T251s..., T252s..., T253s...,
+					                     T254s..., T255s..., T256s..., T257s..., T258s..., T259s...,
+					                     T260s..., T261s..., T262s..., T263s..., T264s..., T265s...,
+					                     T266s..., T267s..., T268s..., T269s..., T270s..., T271s...,
+					                     T272s..., T273s..., T274s..., T275s..., T276s..., T277s...,
+					                     T278s..., T279s..., T280s..., T281s..., T282s..., T283s...,
+					                     T284s..., T285s..., T286s..., T287s..., T288s..., T289s...,
+					                     T290s..., T291s..., T292s..., T293s..., T294s..., T295s...,
+					                     T296s..., T297s..., T298s..., T299s..., T300s..., T301s...,
+					                     T302s..., T303s..., T304s..., T305s..., T306s..., T307s...,
+					                     T308s..., T309s..., T310s..., T311s..., T312s..., T313s...,
+					                     T314s..., T315s..., T316s..., T317s..., T318s..., T319s...,
+					                     T320s..., T321s..., T322s..., T323s..., T324s..., T325s...,
+					                     T326s..., T327s..., T328s..., T329s..., T330s..., T331s...,
+					                     T332s..., T333s..., T334s..., T335s..., T336s..., T337s...,
+					                     T338s..., T339s..., T340s..., T341s..., T342s..., T343s...,
+					                     T344s..., T345s..., T346s..., T347s..., T348s..., T349s...,
+					                     T350s..., T351s..., T352s..., T353s..., T354s..., T355s...,
+					                     T356s..., T357s..., T358s..., T359s..., T360s..., T361s...,
+					                     T362s..., T363s..., T364s..., T365s..., T366s..., T367s...,
+					                     T368s..., T369s..., T370s..., T371s..., T372s..., T373s...,
+					                     T374s..., T375s..., T376s..., T377s..., T378s..., T379s...,
+					                     T380s..., T381s..., T382s..., T383s..., T384s..., T385s...,
+					                     T386s..., T387s..., T388s..., T389s..., T390s..., T391s...,
+					                     T392s..., T393s..., T394s..., T395s..., T396s..., T397s...,
+					                     T398s..., T399s..., T400s..., T401s..., T402s..., T403s...,
+					                     T404s..., T405s..., T406s..., T407s..., T408s..., T409s...,
+					                     T410s..., T411s..., T412s..., T413s..., T414s..., T415s...,
+					                     T416s..., T417s..., T418s..., T419s..., T420s..., T421s...,
+					                     T422s..., T423s..., T424s..., T425s..., T426s..., T427s...,
+					                     T428s..., T429s..., T430s..., T431s..., T432s..., T433s...,
+					                     T434s..., T435s..., T436s..., T437s..., T438s..., T439s...,
+					                     T440s..., T441s..., T442s..., T443s..., T444s..., T445s...,
+					                     T446s..., T447s..., T448s..., T449s..., T450s..., T451s...,
+					                     T452s..., T453s..., T454s..., T455s..., T456s..., T457s...,
+					                     T458s..., T459s..., T460s..., T461s..., T462s..., T463s...,
+					                     T464s..., T465s..., T466s..., T467s..., T468s..., T469s...,
+					                     T470s..., T471s..., T472s..., T473s..., T474s..., T475s...,
+					                     T476s..., T477s..., T478s..., T479s..., T480s..., T481s...,
+					                     T482s..., T483s..., T484s..., T485s..., T486s..., T487s...,
+					                     T488s..., T489s..., T490s..., T491s..., T492s..., T493s...,
+					                     T494s..., T495s..., T496s..., T497s..., T498s..., T499s...,
+					                     T500s..., T501s..., T502s..., T503s..., T504s..., T505s...,
+					                     T506s..., T507s..., T508s..., T509s..., T510s..., T511s...,
+					                     T512s..., T513s..., T514s..., T515s..., T516s..., T517s...,
+					                     T518s..., T519s..., T520s..., T521s..., T522s..., T523s...,
+					                     T524s..., T525s..., T526s..., T527s..., T528s..., T529s...,
+					                     T530s..., T531s..., T532s..., T533s..., T534s..., T535s...,
+					                     T536s..., T537s..., T538s..., T539s..., T540s..., T541s...,
+					                     T542s..., T543s..., T544s..., T545s..., T546s..., T547s...,
+					                     T548s..., T549s..., T550s..., T551s..., T552s..., T553s...,
+					                     T554s..., T555s..., T556s..., T557s..., T558s..., T559s...,
+					                     T560s..., T561s..., T562s..., T563s..., T564s..., T565s...,
+					                     T566s..., T567s..., T568s..., T569s..., T570s..., T571s...,
+					                     T572s..., T573s..., T574s..., T575s..., T576s..., T577s...,
+					                     T578s..., T579s..., T580s..., T581s..., T582s..., T583s...,
+					                     T584s..., T585s..., T586s..., T587s..., T588s..., T589s...,
+					                     T590s..., T591s..., T592s..., T593s..., T594s..., T595s...,
+					                     T596s..., T597s..., T598s..., T599s..., T600s..., T601s...,
+					                     T602s..., T603s..., T604s..., T605s..., T606s..., T607s...,
+					                     T608s..., T609s..., T610s..., T611s..., T612s..., T613s...,
+					                     T614s..., T615s..., T616s..., T617s..., T618s..., T619s...,
+					                     T620s..., T621s..., T622s..., T623s..., T624s..., T625s...,
+					                     T626s..., T627s..., T628s..., T629s..., T630s..., T631s...,
+					                     T632s..., T633s..., T634s..., T635s..., T636s..., T637s...,
+					                     T638s..., T639s..., T640s..., T641s..., T642s..., T643s...,
+					                     T644s..., T645s..., T646s..., T647s..., T648s..., T649s...,
+					                     T650s..., T651s..., T652s..., T653s..., T654s..., T655s...,
+					                     T656s..., T657s..., T658s..., T659s..., T660s..., T661s...,
+					                     T662s..., T663s..., T664s..., T665s..., T666s..., T667s...,
+					                     T668s..., T669s..., T670s..., T671s..., T672s..., T673s...,
+					                     T674s..., T675s..., T676s..., T677s..., T678s..., T679s...,
+					                     T680s..., T681s..., T682s..., T683s..., T684s..., T685s...,
+					                     T686s..., T687s..., T688s..., T689s..., T690s..., T691s...,
+					                     T692s..., T693s..., T694s..., T695s..., T696s..., T697s...,
+					                     T698s..., T699s..., T700s..., T701s..., T702s..., T703s...,
+					                     T704s..., T705s..., T706s..., T707s..., T708s..., T709s...,
+					                     T710s..., T711s..., T712s..., T713s..., T714s..., T715s...,
+					                     T716s..., T717s..., T718s..., T719s..., T720s..., T721s...,
+					                     T722s..., T723s..., T724s..., T725s..., T726s..., T727s...,
+					                     T728s..., T729s..., T730s..., T731s..., T732s..., T733s...,
+					                     T734s..., T735s..., T736s..., T737s..., T738s..., T739s...,
+					                     T740s..., T741s..., T742s..., T743s..., T744s..., T745s...,
+					                     T746s..., T747s..., T748s..., T749s..., T750s..., T751s...,
+					                     T752s..., T753s..., T754s..., T755s..., T756s..., T757s...,
+					                     T758s..., T759s..., T760s..., T761s..., T762s..., T763s...,
+					                     T764s..., T765s..., T766s..., T767s..., T768s..., T769s...,
+					                     T770s..., T771s..., T772s..., T773s..., T774s..., T775s...,
+					                     T776s..., T777s..., T778s..., T779s..., T780s..., T781s...,
+					                     T782s..., T783s..., T784s..., T785s..., T786s..., T787s...,
+					                     T788s..., T789s..., T790s..., T791s..., T792s..., T793s...,
+					                     T794s..., T795s..., T796s..., T797s..., T798s..., T799s...,
+					                     T800s..., T801s..., T802s..., T803s..., T804s..., T805s...,
+					                     T806s..., T807s..., T808s..., T809s..., T810s..., T811s...,
+					                     T812s..., T813s..., T814s..., T815s..., T816s..., T817s...,
+					                     T818s..., T819s..., T820s..., T821s..., T822s..., T823s...,
+					                     T824s..., T825s..., T826s..., T827s..., T828s..., T829s...,
+					                     T830s..., T831s..., T832s..., T833s..., T834s..., T835s...,
+					                     T836s..., T837s..., T838s..., T839s..., T840s..., T841s...,
+					                     T842s..., T843s..., T844s..., T845s..., T846s..., T847s...,
+					                     T848s..., T849s..., T850s..., T851s..., T852s..., T853s...,
+					                     T854s..., T855s..., T856s..., T857s..., T858s..., T859s...,
+					                     T860s..., T861s..., T862s..., T863s..., T864s..., T865s...,
+					                     T866s..., T867s..., T868s..., T869s..., T870s..., T871s...,
+					                     T872s..., T873s..., T874s..., T875s..., T876s..., T877s...,
+					                     T878s..., T879s..., T880s..., T881s..., T882s..., T883s...,
+					                     T884s..., T885s..., T886s..., T887s..., T888s..., T889s...,
+					                     T890s..., T891s..., T892s..., T893s..., T894s..., T895s...,
+					                     T896s..., T897s..., T898s..., T899s..., T900s..., T901s...,
+					                     T902s..., T903s..., T904s..., T905s..., T906s..., T907s...,
+					                     T908s..., T909s..., T910s..., T911s..., T912s..., T913s...,
+					                     T914s..., T915s..., T916s..., T917s..., T918s..., T919s...,
+					                     T920s..., T921s..., T922s..., T923s..., T924s..., T925s...,
+					                     T926s..., T927s..., T928s..., T929s..., T930s..., T931s...,
+					                     T932s..., T933s..., T934s..., T935s..., T936s..., T937s...,
+					                     T938s..., T939s..., T940s..., T941s..., T942s..., T943s...,
+					                     T944s..., T945s..., T946s..., T947s..., T948s..., T949s...,
+					                     T950s..., T951s..., T952s..., T953s..., T954s..., T955s...,
+					                     T956s..., T957s..., T958s..., T959s..., T960s..., T961s...,
+					                     T962s..., T963s..., T964s..., T965s..., T966s..., T967s...,
+					                     T968s..., T969s..., T970s..., T971s..., T972s..., T973s...,
+					                     T974s..., T975s..., T976s..., T977s..., T978s..., T979s...,
+					                     T980s..., T981s..., T982s..., T983s..., T984s..., T985s...,
+					                     T986s..., T987s..., T988s..., T989s..., T990s..., T991s...,
+					                     T992s..., T993s..., T994s..., T995s..., T996s..., T997s...,
+					                     T998s..., T999s..., T1000s..., T1001s..., T1002s...,
+					                     T1003s..., T1004s..., T1005s..., T1006s..., T1007s...,
+					                     T1008s..., T1009s..., T1010s..., T1011s..., T1012s...,
+					                     T1013s..., T1014s..., T1015s..., T1016s..., T1017s...,
+					                     T1018s..., T1019s..., T1020s..., T1021s..., T1022s...,
+					                     T1023s...>,
+					                Ls...>::type;
 				};
 			};
 
diff --git a/src/kvasir/mpl/types/nothing.hpp b/src/kvasir/mpl/types/nothing.hpp
index 239af62..4d120c8 100644
--- a/src/kvasir/mpl/types/nothing.hpp
+++ b/src/kvasir/mpl/types/nothing.hpp
@@ -6,7 +6,8 @@
 
 namespace kvasir {
 	namespace mpl {
-		/// class used when a function errors, as in the haskell nothing
+		/// \brief class used when a function errors/
+		/// as in the haskell nothing
 		/// all functions that take nothing as a parameter should return nothing
 		struct nothing {};
 	} // namespace mpl
diff --git a/src/kvasir/mpl/types/traits.hpp b/src/kvasir/mpl/types/traits.hpp
index 06a0199..bbcb657 100644
--- a/src/kvasir/mpl/types/traits.hpp
+++ b/src/kvasir/mpl/types/traits.hpp
@@ -4,12 +4,72 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 #include <type_traits>
+#include <utility> //for std::swap
 #include "bool.hpp"
+#include "int.hpp"
 #include "../compatability/compatability.hpp"
 #include "../functional/identity.hpp"
 
 namespace kvasir {
 	namespace mpl {
+		namespace detail {
+			namespace swap_test {
+				using std::swap;
+				template <typename, typename, bool>
+				false_ test(...);
+
+				template <typename T, typename U,
+				          bool SwappableOnly> // if SwappableOnly we return true_ as long as we do
+				                              // not SFINAE
+				bool_<((noexcept(swap(std::declval<T &>(), std::declval<U &>())) &&
+				        noexcept(swap(std::declval<U &>(), std::declval<T &>()))) ||
+				       SwappableOnly)>
+				test(int);
+			} // namespace swap_test
+		} // namespace detail
+		  /// \brief tests if a type is swappable with another type /
+		  /// \effects results in true_ if dynamic input types are swappable with each other
+		  /// \requires fixed parameters: optional continuation, dynamic parameters: two types to be
+		  /// tested \notes this is the same as std::is_swappable_with except the return is true_ or
+		  /// false_ and may be faster/
+		template <typename C = identity>
+		struct is_swappable_with {
+			template <typename T, typename U>
+			using f = typename C::template f<decltype(detail::swap_test::test<T, U, true>(0))>;
+		};
+
+		/// \brief tests if a type is swappable
+		/// \effects results in true_ if dynamic input is a swappable type
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_swappable except the return is true_ or false_
+		/// and may be faster/
+		template <typename C = identity>
+		struct is_swappable {
+			template <typename T>
+			using f = typename C::template f<decltype(detail::swap_test::test<T, T, true>(0))>;
+		};
+
+		/// \brief tests if two types are nothrow swappable
+		/// \effects results in true_ if dynamic input types are nothrow swappable
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the types to be
+		/// tested \notes this is the same as std::is_swappable_with except the return is true_ or
+		/// false_ and may be faster/
+		template <typename C = identity>
+		struct is_nothrow_swappable_with {
+			template <typename T, typename U>
+			using f = typename C::template f<decltype(detail::swap_test::test<T, U, false>(0))>;
+		};
+
+		/// \brief tests if a type is nothrow swappable
+		/// \effects results in true_ if dynamic input is nothrow spwappable
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_nothrow_swappable except the return is true_
+		/// or false_ and may be faster/
+		template <typename C = identity>
+		struct is_nothrow_swappable {
+			template <typename T>
+			using f = typename C::template f<decltype(detail::swap_test::test<T, T, false>(0))>;
+		};
 		/// \brief tests if a type is void
 		/// \effects results in true_ if dynamic input is void
 		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
@@ -120,56 +180,122 @@ namespace kvasir {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_rvalue_reference<T>::value>>;
 		};
+		/// \brief tests if a type is a member object pointer
+		/// \effects results in true_ if dynamic input is a member object pointer
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_member_object_pointer except the return is
+		/// `true_` or `false_` and may be faster/
+
 		template <typename C = identity>
 		struct is_member_object_pointer {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_member_object_pointer<T>::value>>;
 		};
+		/// \brief tests if a type is a member function pointer
+		/// \effects results in true_ if dynamic input is a member function pointer
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_member_function_pointer except the return is
+		/// `true_` or `false_` and may be faster/
+
 		template <typename C = identity>
 		struct is_member_function_pointer {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_member_function_pointer<T>::value>>;
 		};
+		/// \brief tests if a type is functional
+		/// \effects results in true_ if dynamic input is functional
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_functional except the return is `true_` or
+		/// `false_` and may be faster/
+
 		template <typename C = identity>
 		struct is_fundamental {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_fundamental<T>::value>>;
 		};
+		/// \brief tests if a type is an arithmatic type
+		/// \effects results in true_ if dynamic input is an arithmatic type
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_arithmatic except the return is true_ or
+		/// false_ and may be faster/
+
 		template <typename C = identity>
 		struct is_arithmetic {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_arithmetic<T>::value>>;
 		};
+		/// \brief tests if a type is a scalar
+		/// \effects results in true_ if dynamic input is a scalar
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_scalar except the return is true_ or false_
+		/// and may be faster/
+
 		template <typename C = identity>
 		struct is_scalar {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_scalar<T>::value>>;
 		};
+		/// \brief tests if a type is an object
+		/// \effects results in true_ if dynamic input is an object
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_object except the return is true_ or false_
+		/// and may be faster/
+
 		template <typename C = identity>
 		struct is_object {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_object<T>::value>>;
 		};
+		/// \brief tests if a type is compound
+		/// \effects results in true_ if dynamic input is compound
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_compound except the return is true_ or false_
+		/// and may be faster/
+
 		template <typename C = identity>
 		struct is_compound {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_compound<T>::value>>;
 		};
+		/// \brief tests if a type is a reference
+		/// \effects results in true_ if dynamic input is a reference
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_reference except the return is true_ or false_
+		/// and may be faster/
+
 		template <typename C = identity>
 		struct is_reference {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_reference<T>::value>>;
 		};
+		/// \brief tests if a type is a member pointer
+		/// \effects results in true_ if dynamic input is a member pointer
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_member_pointer except the return is true_ or
+		/// false_ and may be faster/
+
 		template <typename C = identity>
 		struct is_member_pointer {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_member_pointer<T>::value>>;
 		};
+		/// \brief tests if a type is volatile
+		/// \effects results in true_ if dynamic input is volatile
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_volatile except the return is true_ or false_
+		/// and may be faster/
+
 		template <typename C = identity>
 		struct is_volatile {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_const<T>::value>>;
 		};
+		/// \brief tests if a type is trivial
+		/// \effects results in true_ if dynamic input is trivial
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_trivial except the return is true_ or false_
+		/// and may be faster/
+
 		template <typename C = identity>
 		struct is_trivial {
 			template <typename T>
@@ -177,52 +303,108 @@ namespace kvasir {
 		};
 #if (__has_feature(is_trivially_copyable) && defined(_LIBCPP_VERSION)) || \
         (defined(__GNUC__) && __GNUC__ >= 5)
+		/// \brief tests if a type is trivially copyable
+		/// \effects results in true_ if dynamic input is trivially copyable
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_trivially_copyable except the return is true_
+		/// or false_ and may be faster/
+
 		template <typename C = identity>
 		struct is_trivially_copyable {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_trivially_copyable<T>::value>>;
 		};
 #endif
+		/// \brief tests if a type is standard layout
+		/// \effects results in true_ if dynamic input is standard layout
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_standard_layout except the return is true_ or
+		/// false_ and may be faster/
+
 		template <typename C = identity>
 		struct is_standard_layout {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_standard_layout<T>::value>>;
 		};
+		/// \brief tests if a type is a pod
+		/// \effects results in true_ if dynamic input is a pod
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_pod except the return is true_ or false_ and
+		/// may be faster/
+
 		template <typename C = identity>
 		struct is_pod {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_pod<T>::value>>;
 		};
+		/// \brief tests if a type is a literal type
+		/// \effects results in true_ if dynamic input is a literal type
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_literal_type except the return is true_ or
+		/// false_ and may be faster/
+
 		template <typename C = identity>
 		struct is_literal_type {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_literal_type<T>::value>>;
 		};
+		/// \brief tests if a type is empty
+		/// \effects results in true_ if dynamic input is empty
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_empty except the return is true_ or false_ and
+		/// may be faster/
+
 		template <typename C = identity>
 		struct is_empty {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_empty<T>::value>>;
 		};
+		/// \brief tests if a type is polymorphic
+		/// \effects results in `true_` if dynamic input is polymorphic
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_polymorphic except the return is `true_` or
+		/// `false_` and may be faster/
+
 		template <typename C = identity>
 		struct is_polymorphic {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_polymorphic<T>::value>>;
 		};
+		/// \brief tests if a type is abstract
+		/// \effects results in `true_` if dynamic input is abstract
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_abstract except the return is `true_` or
+		/// `false_` and may be faster/
 		template <typename C = identity>
 		struct is_abstract {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_abstract<T>::value>>;
 		};
+		/// \brief tests if a type is signed
+		/// \effects results in `true_` if dynamic input is signed
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_signed except the return is `true_` or
+		/// `false_` and may be faster/
 		template <typename C = identity>
 		struct is_signed {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_signed<T>::value>>;
 		};
+		/// \brief tests if a type is unsigned
+		/// \effects results in `true_` if dynamic input is unsigned
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_unsigned except the return is `true_` or
+		/// `false_` and may be faster/
 		template <typename C = identity>
 		struct is_unsigned {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_unsigned<T>::value>>;
 		};
+		/// \brief tests if a type is constructible
+		/// \effects results in `true_` if dynamic input is constructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_constructible except the return is `true_` or
+		/// `false_` and may be faster/
 		template <typename C = identity>
 		struct is_constructible {
 			template <typename T>
@@ -230,17 +412,32 @@ namespace kvasir {
 		};
 #if (__has_feature(is_trivially_constructible) && defined(_LIBCPP_VERSION)) || \
         (defined(__GNUC__) && __GNUC__ >= 5)
+		/// \brief tests if a type is trivially constructible
+		/// \effects results in `true_` if dynamic input is trivially constructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_trivially_constructible except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_trivially_constructible {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_trivially_constructible<T>::value>>;
 		};
 #endif
+		/// \brief tests if a type is nothrow constructible
+		/// \effects results in `true_` if dynamic input is nothrow constructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_nothrow_constructible except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_nothrow_constructible {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_nothrow_constructible<T>::value>>;
 		};
+		/// \brief tests if a type is default constructible
+		/// \effects results in `true_` if dynamic input is default constructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_default_constructible except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_default_constructible {
 			template <typename T>
@@ -248,6 +445,11 @@ namespace kvasir {
 		};
 #if (__has_feature(is_trivially_default_constructible) && defined(_LIBCPP_VERSION)) || \
         (defined(__GNUC__) && __GNUC__ >= 5)
+		/// \brief tests if a type is trivially default constructible
+		/// \effects results in `true_` if dynamic input is trivially default constructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_trivially_default_constructible except the
+		/// return is `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_trivially_default_constructible {
 			template <typename T>
@@ -255,12 +457,22 @@ namespace kvasir {
 			        bool_<std::is_trivially_default_constructible<T>::value>>;
 		};
 #endif
+		/// \brief tests if a type is nothrow default constructible
+		/// \effects results in `true_` if dynamic input is nothrow default constructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_nothrow_default_constructible except the
+		/// return is `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_nothrow_default_constructible {
 			template <typename T>
 			using f =
 			        typename C::template f<bool_<std::is_nothrow_default_constructible<T>::value>>;
 		};
+		/// \brief tests if a type is copy constructible
+		/// \effects results in `true_` if dynamic input is copy constructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_copy_constructible except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_copy_constructible {
 			template <typename T>
@@ -268,17 +480,32 @@ namespace kvasir {
 		};
 #if (__has_feature(is_trivially_copy_constructible) && defined(_LIBCPP_VERSION)) || \
         (defined(__GNUC__) && __GNUC__ >= 5)
+		/// \brief tests if a type is trivially copy constructible
+		/// \effects results in `true_` if dynamic input is trivially copy constructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_trivially_copy_constructible except the return
+		/// is `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_trivially_copy_constructible {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_trivially_copy_constructible<T>::value>>;
 		};
 #endif
+		/// \brief tests if a type is nothrow copy constructible
+		/// \effects results in `true_` if dynamic input is nothrow copy constructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_nothrow_copy_constructible except the return
+		/// is `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_nothrow_copy_constructible {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_nothrow_copy_constructible<T>::value>>;
 		};
+		/// \brief tests if a type is move constructible
+		/// \effects results in `true_` if dynamic input is move constructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_move_constructible except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_move_constructible {
 			template <typename T>
@@ -286,17 +513,32 @@ namespace kvasir {
 		};
 #if (__has_feature(is_trivially_move_constructible) && defined(_LIBCPP_VERSION)) || \
         (defined(__GNUC__) && __GNUC__ >= 5)
+		/// \brief tests if a type is trivially move constructible
+		/// \effects results in `true_` if dynamic input is trivially move constructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_trivially_move_constructible except the return
+		/// is `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_trivially_move_constructible {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_trivially_move_constructible<T>::value>>;
 		};
 #endif
+		/// \brief tests if a type is nothrow move constructible
+		/// \effects results in `true_` if dynamic input is nothrow move constructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_nothrow_move_constructible except the return
+		/// is `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_nothrow_move_constructible {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_nothrow_move_constructible<T>::value>>;
 		};
+		/// \brief tests if a type is assignable
+		/// \effects results in `true_` if dynamic input is assignable
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_assignable except the return is `true_` or
+		/// `false_` and may be faster/
 		template <typename C = identity>
 		struct is_assignable {
 			template <typename T, typename U>
@@ -304,17 +546,32 @@ namespace kvasir {
 		};
 #if (__has_feature(is_trivially_assignable) && defined(_LIBCPP_VERSION)) || \
         (defined(__GNUC__) && __GNUC__ >= 5)
+		/// \brief tests if a type is trivially assignable
+		/// \effects results in `true_` if dynamic input is trivially assignable
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_trivially_assignable except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_trivially_assignable {
 			template <typename T, typename U>
 			using f = typename C::template f<bool_<std::is_trivially_assignable<T, U>::value>>;
 		};
 #endif
+		/// \brief tests if a type is nothrow assignable
+		/// \effects results in `true_` if dynamic input is nothrow assignable
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_nothrow_assignable except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_nothrow_assignable {
 			template <typename T, typename U>
 			using f = typename C::template f<bool_<std::is_nothrow_assignable<T, U>::value>>;
 		};
+		/// \brief tests if a type is copy assignable
+		/// \effects results in `true_` if dynamic input copy assignable
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_copy_assignable except the return is `true_`
+		/// or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_copy_assignable {
 			template <typename T>
@@ -322,17 +579,32 @@ namespace kvasir {
 		};
 #if (__has_feature(is_trivially_copy_assignable) && defined(_LIBCPP_VERSION)) || \
         (defined(__GNUC__) && __GNUC__ >= 5)
+		/// \brief tests if a type is trivally copy assignable
+		/// \effects results in `true_` if dynamic input is trivially copy assignable
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_trivially_copy_assignable except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_trivially_copy_assignable {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_trivially_copy_assignable<T>::value>>;
 		};
 #endif
+		/// \brief tests if a type is nothrow copy assignable
+		/// \effects results in `true_` if dynamic input is nothrow copy assignable
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_nothrow_copy_assignable except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_nothrow_copy_assignable {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_nothrow_copy_assignable<T>::value>>;
 		};
+		/// \brief tests if a type is move assignable
+		/// \effects results in `true_` if dynamic input is move assignable
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_move_assignable except the return is `true_`
+		/// or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_move_assignable {
 			template <typename T>
@@ -340,108 +612,209 @@ namespace kvasir {
 		};
 #if (__has_feature(is_trivially_move_assignable) && defined(_LIBCPP_VERSION)) || \
         (defined(__GNUC__) && __GNUC__ >= 5)
+		/// \brief tests if a type is trivially move assignable
+		/// \effects results in `true_` if dynamic input is trivally move assignable
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_trivially_move_assignable except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_trivially_move_assignable {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_trivially_move_assignable<T>::value>>;
 		};
 #endif
+		/// \brief tests if a type is nothrow move assignable
+		/// \effects results in `true_` if dynamic input is nothrow move assignable
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_nothrow_move_assignable except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_nothrow_move_assignable {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_nothrow_move_assignable<T>::value>>;
 		};
+		/// \brief tests if a type is destructible
+		/// \effects results in `true_` if dynamic input is destructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_destructible except the return is `true_` or
+		/// `false_` and may be faster/
 		template <typename C = identity>
 		struct is_destructible {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_destructible<T>::value>>;
 		};
+		/// \brief tests if a type is trivially destructible
+		/// \effects results in `true_` if dynamic input is trivially destructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_trivially_destructible except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_trivially_destructible {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_trivially_destructible<T>::value>>;
 		};
+		/// \brief tests if a type is nothrow destructible
+		/// \effects results in `true_` if dynamic input is nothrow destructible
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_nothrow_destructible except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct is_nothrow_destructible {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_nothrow_destructible<T>::value>>;
 		};
+		/// \brief tests if a type has a virtual destructor
+		/// \effects results in `true_` if dynamic input has a virtual destructor
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::has_virtual_destructor except the return is
+		/// `true_` or `false_` and may be faster/
 		template <typename C = identity>
 		struct has_virtual_destructor {
 			template <typename T>
 			using f = typename C::template f<bool_<std::has_virtual_destructor<T>::value>>;
 		};
 
-		// template<typename C = identity>struct is_same {
-		//	template<typename T, typename U>
-		//	using f = typename C::template f<bool_<std::is_same<T, U>::value>>;
-		//};
+		/// \brief tests if a type is the same as another type
+		/// \effects results in `true_` if dynamic input is the same as another type
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_same except the return is `true_` or `false_`
+		/// and may be faster/
+		template <typename C = identity>
+		struct is_same {
+			template <typename T, typename U>
+			using f = typename C::template f<bool_<std::is_same<T, U>::value>>;
+		};
+		/// \brief tests if a type is the base class of another type
+		/// \effects results in `true_` if dynamic input is the base class of another type
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_base_of except the return is `true_` or
+		/// `false_` and may be faster/
 		template <typename C = identity>
 		struct is_base_of {
 			template <typename T, typename U>
 			using f = typename C::template f<bool_<std::is_base_of<T, U>::value>>;
 		};
+		/// \brief tests if a type is convertible to another type
+		/// \effects results in `true_` if dynamic input is convertible to another type
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// tested \notes this is the same as std::is_convertible except the return is `true_` or
+		/// `false_` and may be faster/
 		template <typename C = identity>
 		struct is_convertible {
 			template <typename T, typename U>
 			using f = typename C::template f<bool_<std::is_convertible<T, U>::value>>;
 		};
 
+		/// \brief returns the allignment of a type
+		/// \effects results in `uint_<N>` for a type with allignment of N
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// quirried \notes this is the same as std::allignment_of except the return is `uint_<N>`
+		/// and may be faster/
 		template <typename C = identity>
 		struct alignment_of {
 			template <typename T>
 			using f = typename C::template f<typename std::alignment_of<T>::type>;
 		};
+		/// \brief returns the rank of a type
+		/// \effects results in `uint_<N>` for a type with rank of N
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// quirried \notes this is the same as std::rank except the return is `uint_<N>` and
+		/// may be faster/
 		template <typename C = identity>
 		struct rank {
 			template <typename T>
-			using f = typename C::template f<typename std::rank<T>::type>;
+			using f = typename C::template f<uint_<std::rank<T>::value>>;
 		};
+		/// \brief returns the extent of a type
+		/// \effects results in `uint_<N>` for a type with extent of N
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// quirried \notes this is the same as std::extent except the return is `uint_<N>` and
+		/// may be faster/
 		template <typename C = identity>
 		struct extent {
 			template <typename T>
-			using f = typename C::template f<typename std::extent<T>::type>;
+			using f = typename C::template f<uint_<std::extent<T>::value>>;
 		};
+		/// \brief returns the input type with const and volatile qualifiers stripped
+		/// \effects results in the input type with const and volatile qualifiers stripped
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// modified \notes this is the same as std::remove_cv except it
+		/// may be faster/
 		template <typename C = identity>
 		struct remove_cv {
 			template <typename T>
 			using f = typename C::template f<typename std::remove_cv<T>::type>;
 		};
+		/// \brief returns the input type with const qualifiers stripped
+		/// \effects results in the input type with const qualifiers stripped
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// modified \notes this is the same as std::remove_const except it
+		/// may be faster/
 		template <typename C = identity>
 		struct remove_const {
 			template <typename T>
 			using f = typename C::template f<typename std::remove_const<T>::type>;
 		};
+		/// \brief returns the input type with volatile qualifiers stripped
+		/// \effects results in the input type with volatile qualifiers stripped
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// modified \notes this is the same as std::remove_volatile except it
+		/// may be faster/
 		template <typename C = identity>
 		struct remove_volatile {
 			template <typename T>
 			using f = typename C::template f<typename std::remove_volatile<T>::type>;
 		};
+		/// \brief returns the input type with const and volatile qualifiers added
+		/// \effects results in the input type with const and volatile qualifiers added
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// modified \notes this is the same as std::add_cv except it
+		/// may be faster/
 		template <typename C = identity>
 		struct add_cv {
 			template <typename T>
-			using f = typename C::template f<typename std::add_cv<T>::type>;
+			using f = typename C::template f<const volatile T>;
 		};
+		/// \brief returns the input type with const qualifiers added
+		/// \effects results in the input type with const qualifiers added
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// modified \notes this is the same as std::add_comst except it
+		/// may be faster/
 		template <typename C = identity>
 		struct add_const {
 			template <typename T>
-			using f = typename C::template f<typename std::add_const<T>::type>;
+			using f = typename C::template f<const T>;
 		};
+		/// \brief returns the input type with volatile qualifiers added
+		/// \effects results in the input type with const qualifiers added
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// modified \notes this is the same as std::add_volatile except it
+		/// may be faster/
 		template <typename C = identity>
 		struct add_volatile {
 			template <typename T>
-			using f = typename C::template f<typename std::add_volatile<T>::type>;
+			using f = typename C::template f<volatile T>;
 		};
 		template <typename C = identity>
 		struct remove_reference {
 			template <typename T>
 			using f = typename C::template f<typename std::remove_reference<T>::type>;
 		};
+		/// \brief returns the input type as an lvalue reference
+		/// \effects results in the input type as an lvalue reference
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// modified \notes this is the same as std::add_lvalue_reference except it
+		/// may be faster/
 		template <typename C = identity>
 		struct add_lvalue_reference {
 			template <typename T>
 			using f = typename C::template f<typename std::add_lvalue_reference<T>::type>;
 		};
+		/// \brief returns the input type as an rvalue reference
+		/// \effects results in the input type as an rvalue reference
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// modified \notes this is the same as std::add_volatile except it
+		/// may be faster/
 		template <typename C = identity>
 		struct add_rvalue_reference {
 			template <typename T>
@@ -452,6 +825,11 @@ namespace kvasir {
 			template <typename T>
 			using f = typename C::template f<typename std::remove_pointer<T>::type>;
 		};
+		/// \brief returns the input type with a pointer added
+		/// \effects results in the input type with a pointer added
+		/// \requires fixed parameters: optional continuation, dynamic parameters: the type to be
+		/// modified \notes this is the same as std::add_pointer except it
+		/// may be faster/
 		template <typename C = identity>
 		struct add_pointer {
 			template <typename T>
@@ -485,12 +863,12 @@ namespace kvasir {
 		template <typename C = identity>
 		struct common_type {
 			template <typename T>
-			using f = typename C::template f<typename std::alignment_of<T>::type>;
+			using f = typename C::template f<typename std::common_type<T>::type>;
 		};
 		template <typename C = identity>
 		struct underlying_type {
 			template <typename T>
-			using f = typename C::template f<typename std::alignment_of<T>::type>;
+			using f = typename C::template f<typename std::underlying_type<T>::type>;
 		};
 #if __cplusplus >= 201402L
 #ifdef __cpp_lib_is_null_pointer
@@ -499,6 +877,7 @@ namespace kvasir {
 			template <typename T>
 			using f = typename C::template f<bool_<std::is_null_pointer<T>::value>>;
 		};
+		/// \exclude
 		template <>
 		struct is_null_pointer<identity> {
 			template <typename T>
diff --git a/src/kvasir/mpl/types/type.hpp b/src/kvasir/mpl/types/type.hpp
new file mode 100644
index 0000000..a2c9682
--- /dev/null
+++ b/src/kvasir/mpl/types/type.hpp
@@ -0,0 +1,16 @@
+//          Copyright Odin Holmes 2017.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE.md or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+#pragma once
+#include "nothing.hpp"
+namespace kvasir {
+	namespace mpl {
+		/// \brief type wrapper for types/
+		template <typename T>
+		struct type_ {
+			using type = T;
+		};
+
+	} // namespace mpl
+} // namespace kvasir
diff --git a/src/kvasir/mpl/utility/is_same.hpp b/src/kvasir/mpl/utility/is_same.hpp
index 07009d1..de2f7a9 100644
--- a/src/kvasir/mpl/utility/is_same.hpp
+++ b/src/kvasir/mpl/utility/is_same.hpp
@@ -7,16 +7,16 @@
 #include "../functional/identity.hpp"
 namespace kvasir {
 	namespace mpl {
-		template <typename C = identity>
-		struct is_same {
-			template <typename T, typename U>
-			using f = typename C::template f<std::is_same<T, U>>;
-		};
-		template <>
-		struct is_same<identity> {
-			template <typename T, typename U>
-			using f = std::is_same<T, U>;
-		};
+		/*		template <typename C = identity>
+		        struct is_same {
+		            template <typename T, typename U>
+		            using f = typename C::template f<std::is_same<T, U>>;
+		        };
+		        template <>
+		        struct is_same<identity> {
+		            template <typename T, typename U>
+		            using f = std::is_same<T, U>;
+		        };*/
 		template <typename M, typename C = identity>
 		struct same_as {
 			template <typename T>
diff --git a/test/algorithm/all.hpp b/test/algorithm/all.hpp
index 0d2366b..509f3ba 100644
--- a/test/algorithm/all.hpp
+++ b/test/algorithm/all.hpp
@@ -20,13 +20,13 @@ namespace {
 			using namespace kvasir;
 			using namespace mpl;
 
-			call<all<cfe<comp>>, int, int, int, int>{} = true_{};
+			call<all<cfe<comp>>, int, int, int, int>{}  = true_{};
 			call<all<cfe<comp>>, int, int, bool, int>{} = false_{};
 
-			call<all<cfe<comp>>, int, int, int, int>{} = true_{};
+			call<all<cfe<comp>>, int, int, int, int>{}  = true_{};
 			call<all<cfe<comp>>, int, int, bool, int>{} = false_{};
-
 		}
 	};
 
-}
+} // namespace
+
diff --git a/test/algorithm/any.hpp b/test/algorithm/any.hpp
index 1b4a52b..d5c7950 100644
--- a/test/algorithm/any.hpp
+++ b/test/algorithm/any.hpp
@@ -16,10 +16,11 @@ namespace {
 		using comp = std::is_same<int, T>;
 
 		any_test() {
-			using namespace kvasir::mpl;	
-			call<any<cfe<comp>>, void, char, int, float>{} = true_{};
+			using namespace kvasir::mpl;
+			call<any<cfe<comp>>, void, char, int, float>{}  = true_{};
 			call<any<cfe<comp>>, void, char, bool, float>{} = false_{};
-			call<any<cfe<comp>>>{} = false_{};
+			call<any<cfe<comp>>>{}                          = false_{};
 		}
 	};
-}
+} // namespace
+
diff --git a/test/algorithm/count_if.hpp b/test/algorithm/count_if.hpp
index 74495a4..b380306 100644
--- a/test/algorithm/count_if.hpp
+++ b/test/algorithm/count_if.hpp
@@ -13,11 +13,12 @@ namespace {
 		using comp = std::is_same<int, t>;
 
 		count_if_test() {
-			using namespace kvasir::mpl;	
+			using namespace kvasir::mpl;
 			call<count_if<cfe<comp>>, void, char, bool, float>{} = uint_<0>{};
-			call<count_if<cfe<comp>>, void, char, int, float>{} = uint_<1>{};
-			call<count_if<cfe<comp>>, int, char, int, float>{} = uint_<2>{};
-			call<count_if<cfe<comp>>>{} = uint_<0>{};
+			call<count_if<cfe<comp>>, void, char, int, float>{}  = uint_<1>{};
+			call<count_if<cfe<comp>>, int, char, int, float>{}   = uint_<2>{};
+			call<count_if<cfe<comp>>>{}                          = uint_<0>{};
 		}
 	};
-}
+} // namespace
+
diff --git a/test/algorithm/filter.hpp b/test/algorithm/filter.hpp
index ac3a395..d57f1ef 100644
--- a/test/algorithm/filter.hpp
+++ b/test/algorithm/filter.hpp
@@ -4,6 +4,7 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <tuple>
 #include <type_traits>
 #include <tuple>
 
@@ -15,12 +16,15 @@ namespace {
 	using namespace kvasir::mpl;
 	template <typename T>
 	using less_than_5 = bool_<(T::value < 5)>;
-	struct filter_test{
-		filter_test(){
-			call<filter<cfe<less_than_5>>,int_<1>, int_<2>, int_<7>, int_<8>>{} = list<int_<1>, int_<2>>{};
-			call<filter<cfe<less_than_5>>,int_<9>, int_<2>, int_<7>, int_<8>>{} = list<int_<2>>{};
-			call<filter<cfe<less_than_5>>>{} = list<>{};
-			call<filter<cfe<less_than_5>,cfe<std::tuple>>,int_<1>, int_<2>, int_<7>, int_<8>>{} = std::tuple<int_<1>, int_<2>>{};
+	struct filter_test {
+		filter_test() {
+			call<filter<cfe<less_than_5>>, int_<1>, int_<2>, int_<7>, int_<8>>{} =
+			        list<int_<1>, int_<2>>{};
+			call<filter<cfe<less_than_5>>, int_<9>, int_<2>, int_<7>, int_<8>>{} = list<int_<2>>{};
+			call<filter<cfe<less_than_5>>>{}                                     = list<>{};
+			call<filter<cfe<less_than_5>, cfe<std::tuple>>, int_<1>, int_<2>, int_<7>, int_<8>>{} =
+			        std::tuple<int_<1>, int_<2>>{};
 		}
 	};
-}
+} // namespace
+
diff --git a/test/algorithm/find_if.hpp b/test/algorithm/find_if.hpp
index 91ba6a1..4c62b18 100644
--- a/test/algorithm/find_if.hpp
+++ b/test/algorithm/find_if.hpp
@@ -16,4 +16,4 @@ namespace {
 	                                               mpl::same_as<char>::template f>,
 	                           mpl::list<char, short, int>>{},
 	              "");
-}
+} // namespace
diff --git a/test/algorithm/fold_left.hpp b/test/algorithm/fold_left.hpp
index a7d0d36..6dfc2d1 100644
--- a/test/algorithm/fold_left.hpp
+++ b/test/algorithm/fold_left.hpp
@@ -21,4 +21,4 @@ namespace {
 	                                           uint_<0>, add>,
 	                     uint_<10>>::value,
 	        "");
-}
+} // namespace
diff --git a/test/algorithm/fold_right.hpp b/test/algorithm/fold_right.hpp
index f1fb6ca..accb900 100644
--- a/test/algorithm/fold_right.hpp
+++ b/test/algorithm/fold_right.hpp
@@ -77,10 +77,10 @@ namespace {
 	                           mpl::list<void, char, short, int>>::value,
 	              "");
 
-	template<typename T>
+	template <typename T>
 	struct fold_right_cont_test {
 		template <typename... Ts>
 		using f = typename mpl::dcall<mpl::fold_right<mpl::cfe<add>>,
-		                         sizeof...(Ts)>::template f<uint_<1>, Ts...>;
+		                              sizeof...(Ts)>::template f<uint_<1>, Ts...>;
 	};
-}
+} // namespace
diff --git a/test/algorithm/group.hpp b/test/algorithm/group.hpp
index 7075985..9350e22 100644
--- a/test/algorithm/group.hpp
+++ b/test/algorithm/group.hpp
@@ -11,15 +11,16 @@ namespace {
 	struct group_test {
 		group_test() {
 			using namespace kvasir::mpl;
-			call<group<>>{}    = list<>{};
-			call<group<>,int>{} = list<list<int>>{};
-			call<group<>,int, double>{} = list<list<int>, list<double>>{};
-			call<group<>,int, double, float>{} = list<list<int>, list<double>, list<float>>{};
-			call<group<>,int, int, double, double, double, int, int, int, float>{} =
+			call<group<>>{}                     = list<>{};
+			call<group<>, int>{}                = list<list<int>>{};
+			call<group<>, int, double>{}        = list<list<int>, list<double>>{};
+			call<group<>, int, double, float>{} = list<list<int>, list<double>, list<float>>{};
+			call<group<>, int, int, double, double, double, int, int, int, float>{} =
 			        list<list<int, int>, list<double, double, double>, list<int, int, int>,
 			             list<float>>{};
-			using seq           = call<make_int_sequence<>,uint_<5>>;
-			call<unpack<group<>>,seq>{} = call<unpack<transform<cfe<list>>>, seq>{};
+			using seq                    = call<make_int_sequence<>, uint_<5>>;
+			call<unpack<group<>>, seq>{} = call<unpack<transform<cfe<list>>>, seq>{};
 		}
 	};
-}
+} // namespace
+
diff --git a/test/algorithm/index_if.hpp b/test/algorithm/index_if.hpp
new file mode 100644
index 0000000..3235265
--- /dev/null
+++ b/test/algorithm/index_if.hpp
@@ -0,0 +1,30 @@
+//          Copyright Odin Holmes 2017.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE.md or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+#pragma once
+
+#include <tuple>
+#include <string> //because of bug in tuple impl in stl
+#include <type_traits>
+
+#include <kvasir/mpl/algorithm/index_if.hpp>
+#include <kvasir/mpl/types/bool.hpp>
+#include <kvasir/mpl/types/int.hpp>
+
+namespace {
+	using namespace kvasir::mpl;
+	template <typename T>
+	using less_than_5 = bool_<(T::value < 5)>;
+	struct index_if_test {
+		index_if_test() {
+			call<detail::index_if<cfe<less_than_5>>, int_<9>, int_<2>, int_<1>, int_<8>>{} =
+			        list<uint_<1>, uint_<2>>{};
+			call<detail::index_if<cfe<less_than_5>>, int_<9>, int_<2>, int_<7>, int_<8>>{} =
+			        list<uint_<1>>{};
+			call<detail::index_if<cfe<less_than_5>>>{} = list<>{};
+			call<detail::index_if<cfe<less_than_5>, cfe<std::tuple>>, int_<1>, int_<2>, int_<7>,
+			     int_<8>>{}                    = std::tuple<uint_<0>, uint_<1>>{};
+		}
+	};
+} // namespace
diff --git a/test/algorithm/lookup.hpp b/test/algorithm/lookup.hpp
index c910ae3..5b34916 100644
--- a/test/algorithm/lookup.hpp
+++ b/test/algorithm/lookup.hpp
@@ -25,4 +25,4 @@ namespace {
 	static_assert(std::is_same<mpl::eager::lookup<xs15, 15>, x<16>>::value, "");
 	static_assert(std::is_same<mpl::eager::lookup<xs16, 16>, x<17>>::value, "");
 	static_assert(std::is_same<mpl::eager::lookup<xs17, 17>, x<18>>::value, "");
-}
+} // namespace
diff --git a/test/algorithm/make_sequence.hpp b/test/algorithm/make_sequence.hpp
index 4a99cb8..94e0aac 100644
--- a/test/algorithm/make_sequence.hpp
+++ b/test/algorithm/make_sequence.hpp
@@ -19,4 +19,4 @@ namespace {
 	static_assert(std::is_same<a, b>{}, "");
 
 	static_assert(std::is_same<mpl::eager::make_int_sequence<mpl::int_<0>>, mpl::list<>>{}, "");
-}
+} // namespace
diff --git a/test/algorithm/none.hpp b/test/algorithm/none.hpp
index e4296d8..6cd06f3 100644
--- a/test/algorithm/none.hpp
+++ b/test/algorithm/none.hpp
@@ -17,4 +17,4 @@ namespace {
 	using namespace kvasir;
 	static_assert(!mpl::eager::none<mpl::list<void, char, int, float>, comp>::value, "");
 	static_assert(mpl::eager::none<mpl::list<void, char, bool, float>, comp>::value, "");
-}
+} // namespace
diff --git a/test/algorithm/partition.hpp b/test/algorithm/partition.hpp
index 3bad3cc..91ec8e5 100644
--- a/test/algorithm/partition.hpp
+++ b/test/algorithm/partition.hpp
@@ -18,4 +18,4 @@ namespace partition_test {
 	using p           = eager::partition<l, less_than_5>;
 	static_assert(std::is_same<p, list<list<int_<7>, int_<8>>, list<int_<1>, int_<2>>>>::value,
 	              "partition error");
-}
+} // namespace partition_test
diff --git a/test/algorithm/product.hpp b/test/algorithm/product.hpp
index 5dd22d7..16db92e 100644
--- a/test/algorithm/product.hpp
+++ b/test/algorithm/product.hpp
@@ -32,4 +32,4 @@ namespace {
 	                           bar_list<foo_list<void, void>, foo_list<void, char>,
 	                                    foo_list<char, void>, foo_list<char, char>>>::value,
 	              "");
-}
+} // namespace
diff --git a/test/algorithm/remove_adjacent.hpp b/test/algorithm/remove_adjacent.hpp
index 08ba6db..85a91b8 100644
--- a/test/algorithm/remove_adjacent.hpp
+++ b/test/algorithm/remove_adjacent.hpp
@@ -34,4 +34,4 @@ namespace {
 	                                                       foo_is_same>,
 	                           mpl::list<void, char, short>>{},
 	              "");
-}
+} // namespace
diff --git a/test/algorithm/remove_if.hpp b/test/algorithm/remove_if.hpp
index e3fbbb5..e5f967b 100644
--- a/test/algorithm/remove_if.hpp
+++ b/test/algorithm/remove_if.hpp
@@ -14,19 +14,18 @@ namespace remove_if_test {
 	using less_than_5 = bool_<(T::value < 5)>;
 
 	struct less_than_5_c {
-		template<typename T>
+		template <typename T>
 		using f = less_than_5<T>;
 	};
 
 	static_assert(
-		std::is_same<eager::remove_if<list<int_<1>, int_<2>, int_<7>, int_<8>>, less_than_5>,
-		list<int_<7>, int_<8>>>::value,
-		"");
+	        std::is_same<eager::remove_if<list<int_<1>, int_<2>, int_<7>, int_<8>>, less_than_5>,
+	                     list<int_<7>, int_<8>>>::value,
+	        "");
 
-	template<typename...Ts>
+	template <typename... Ts>
 	using test = call<remove_if<less_than_5_c>, Ts...>;
 	static_assert(
-		std::is_same<test<int_<1>, int_<2>, int_<7>, int_<8>>,
-		list<int_<7>, int_<8>>>::value,
-		"");
-}
\ No newline at end of file
+	        std::is_same<test<int_<1>, int_<2>, int_<7>, int_<8>>, list<int_<7>, int_<8>>>::value,
+	        "");
+} // namespace remove_if_test
\ No newline at end of file
diff --git a/test/algorithm/rotate.hpp b/test/algorithm/rotate.hpp
index f6b1158..f067c64 100644
--- a/test/algorithm/rotate.hpp
+++ b/test/algorithm/rotate.hpp
@@ -14,10 +14,10 @@ namespace {
 		template <int n>
 		void rotate_test_impl() {
 			using namespace kvasir::mpl;
-			constexpr int len = 522;
-			using seq         = eager::make_int_sequence<int_<len>>;
-			using left_seq    = eager::make_int_sequence<int_<n>>;
-			using right_seq   = eager::drop<seq, n>;
+			constexpr int len                  = 522;
+			using seq                          = eager::make_int_sequence<int_<len>>;
+			using left_seq                     = eager::make_int_sequence<int_<n>>;
+			using right_seq                    = eager::drop<seq, n>;
 			eager::join<right_seq, left_seq>{} = eager::rotate<seq, n>{};
 		}
 
@@ -52,4 +52,4 @@ namespace {
 			rotate_test_impl<513>();
 		}
 	};
-}
+} // namespace
diff --git a/test/algorithm/split_if.hpp b/test/algorithm/split_if.hpp
index 8f67a83..ed105f1 100644
--- a/test/algorithm/split_if.hpp
+++ b/test/algorithm/split_if.hpp
@@ -17,4 +17,4 @@ namespace split_if_test {
 	                          is_99>;
 	using b = list<list<int_<1>, int_<2>>, list<int_<3>, int_<4>>, list<int_<5>>>;
 	static_assert(std::is_same<a, b>{}, "");
-}
\ No newline at end of file
+} // namespace split_if_test
\ No newline at end of file
diff --git a/test/algorithm/stable_sort.hpp b/test/algorithm/stable_sort.hpp
index 85fb096..064db2f 100644
--- a/test/algorithm/stable_sort.hpp
+++ b/test/algorithm/stable_sort.hpp
@@ -26,8 +26,8 @@ namespace {
 
 	using mpl::int_;
 
-	using ss_test_list = mpl::list<int_<3>, int_<0>, int_<7>, int_<2>, int_<1>, int_<3>, int_<4>,
-	                               int_<6>, int_<5>>;
+	using ss_test_list   = mpl::list<int_<3>, int_<0>, int_<7>, int_<2>, int_<1>, int_<3>, int_<4>,
+                                   int_<6>, int_<5>>;
 	using ss_expect_list = mpl::list<int_<0>, int_<1>, int_<2>, int_<3>, int_<3>, int_<4>, int_<5>,
 	                                 int_<6>, int_<7>>;
 
@@ -37,4 +37,4 @@ namespace {
 	              "Stable sort is not sort");
 
 	using empty_ss_test = mpl::eager::stable_sort<mpl::list<>>;
-}
+} // namespace
diff --git a/test/algorithm/transform.hpp b/test/algorithm/transform.hpp
index 7c7561b..6c47293 100644
--- a/test/algorithm/transform.hpp
+++ b/test/algorithm/transform.hpp
@@ -14,4 +14,4 @@ namespace {
 	                           mpl::list<mpl::list<void>, mpl::list<char>, mpl::list<short>,
 	                                     mpl::list<int>>>::value,
 	              "");
-}
+} // namespace
diff --git a/test/algorithm/zip_with.hpp b/test/algorithm/zip_with.hpp
index e216028..bdbacf6 100644
--- a/test/algorithm/zip_with.hpp
+++ b/test/algorithm/zip_with.hpp
@@ -8,14 +8,28 @@
 #include <kvasir/mpl/functional/bind.hpp>
 
 namespace {
-	namespace mpl      = kvasir::mpl;
-	using zip_a        = mpl::list<void, char, short, int>;
-	using zip_b        = mpl::list<int, void, char, short>;
-	using zip_shoud_be = mpl::list<mpl::list<void, int>, mpl::list<char, void>,
-	                               mpl::list<short, char>, mpl::list<int, short>>;
-	static_assert(std::is_same<mpl::eager::zip_with<mpl::list, zip_a, zip_b>, zip_shoud_be>::value,
-	              "");
-	static_assert(std::is_same<mpl::call<mpl::zip_with<mpl::cfe<mpl::list>>, zip_a, zip_b>,
-	                           zip_shoud_be>::value,
-	              "");
-}
+	using namespace kvasir;
+	using namespace mpl;
+
+	struct zip_with_test {
+		zip_with_test() {
+			using zip_a        = mpl::list<void, char, short, int>;
+			using zip_b        = mpl::list<int, void, char, short>;
+			using zip_shoud_be = mpl::list<mpl::list<void, int>, mpl::list<char, void>,
+			                               mpl::list<short, char>, mpl::list<int, short>>;
+			call<zip_with<cfe<mpl::list>>, zip_a, zip_b>{}   = zip_shoud_be{};
+			call<zip_with<cfe<mpl::list>>, list<>, list<>>{} = list<>{};
+		}
+	};
+
+	struct zip_fix_test {
+		zip_fix_test() {
+			using zip_a        = mpl::list<void, char, short, int>;
+			using zip_b        = mpl::list<int, void, char, short>;
+			using zip_shoud_be = mpl::list<mpl::list<void, int>, mpl::list<char, void>,
+			                               mpl::list<short, char>, mpl::list<int, short>>;
+			call<unpack<detail::zip_fixed<cfe<mpl::list>, zip_a, cfe<list>>>, zip_b>{} = zip_shoud_be{};
+			call<detail::zip_fixed<cfe<mpl::list>, list<>, cfe<list>>>{}               = list<>{};
+		}
+	};
+} // namespace
diff --git a/test/functional/bind.hpp b/test/functional/bind.hpp
index 57e96b2..5a26b9e 100644
--- a/test/functional/bind.hpp
+++ b/test/functional/bind.hpp
@@ -4,4 +4,22 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
-#include <kvasir/mpl/functional/bind.hpp>
\ No newline at end of file
+#include <kvasir/mpl/functional/bind.hpp>
+#include <kvasir/mpl/algorithm/transform.hpp>
+#include <kvasir/mpl/types/traits.hpp>
+#include <tuple>
+namespace {
+	struct bind_test {
+		template<typename T>
+		using add_const_t = const T;
+		bind_test() {
+			using namespace kvasir;
+			using namespace mpl;
+
+			call<transform<cfe<add_const_t>>, int, char, bool>{} = list<const int, const char, const bool>{};
+			call<transform<cfe1<add_const_t>>, int, char, bool>{} = list<const int, const char, const bool>{};
+			call<transform<add_volatile<>,cfe2<std::tuple>>, char, int>{} = std::tuple<volatile char, volatile int>{};
+		}
+	};
+
+}
diff --git a/test/functional/flow.hpp b/test/functional/flow.hpp
index f9cc615..c7c32a2 100644
--- a/test/functional/flow.hpp
+++ b/test/functional/flow.hpp
@@ -2,5 +2,5 @@
 namespace {
 	using namespace kvasir;
 	using namespace mpl;
-	static_assert(call<if_<same_as<void>,always<false_>,always<true_>>,int>::value,"");
-}
+	static_assert(call<if_<same_as<void>, always<false_>, always<true_>>, int>::value, "");
+} // namespace
diff --git a/test/functions/bitwise/bitwise_and.hpp b/test/functions/bitwise/bitwise_and.hpp
index 5853cf1..15f619d 100644
--- a/test/functions/bitwise/bitwise_and.hpp
+++ b/test/functions/bitwise/bitwise_and.hpp
@@ -4,9 +4,18 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/bitwise/bitwise_and.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
 
-static_assert(std::is_same<kvasir::mpl::eager::bitwise_and<kvasir::mpl::integral_constant<unsigned, 0>, kvasir::mpl::integral_constant<unsigned, 1>>, kvasir::mpl::integral_constant<unsigned, 0>>::value, "");
-static_assert(std::is_same<kvasir::mpl::bitwise_and<>::template f<kvasir::mpl::integral_constant<unsigned, 0>, kvasir::mpl::integral_constant<unsigned, 1>>, kvasir::mpl::integral_constant<unsigned, 0>>::value, "");
+static_assert(
+        std::is_same<kvasir::mpl::eager::bitwise_and<kvasir::mpl::integral_constant<unsigned, 0>,
+                                                     kvasir::mpl::integral_constant<unsigned, 1>>,
+                     kvasir::mpl::integral_constant<unsigned, 0>>::value,
+        "");
+static_assert(
+        std::is_same<
+                kvasir::mpl::bitwise_and<>::template f<kvasir::mpl::integral_constant<unsigned, 0>,
+                                                       kvasir::mpl::integral_constant<unsigned, 1>>,
+                kvasir::mpl::integral_constant<unsigned, 0>>::value,
+        "");
diff --git a/test/functions/bitwise/bitwise_complement.hpp b/test/functions/bitwise/bitwise_complement.hpp
index 1d99529..aea016a 100644
--- a/test/functions/bitwise/bitwise_complement.hpp
+++ b/test/functions/bitwise/bitwise_complement.hpp
@@ -4,10 +4,16 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/bitwise/bitwise_complement.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
-
 
-static_assert(std::is_same<kvasir::mpl::eager::bitwise_complement<kvasir::mpl::integral_constant<unsigned, 0>>, kvasir::mpl::integral_constant<unsigned, (~0U)>>::value, "");
-static_assert(std::is_same<kvasir::mpl::bitwise_complement<>::template f<kvasir::mpl::integral_constant<unsigned, 0>>, kvasir::mpl::integral_constant<unsigned, (~0U)>>::value, "");
+static_assert(
+        std::is_same<
+                kvasir::mpl::eager::bitwise_complement<kvasir::mpl::integral_constant<unsigned, 0>>,
+                kvasir::mpl::integral_constant<unsigned, (~0U)>>::value,
+        "");
+static_assert(std::is_same<kvasir::mpl::bitwise_complement<>::template f<
+                                   kvasir::mpl::integral_constant<unsigned, 0>>,
+                           kvasir::mpl::integral_constant<unsigned, (~0U)>>::value,
+              "");
diff --git a/test/functions/bitwise/bitwise_or.hpp b/test/functions/bitwise/bitwise_or.hpp
index 02688c7..055a599 100644
--- a/test/functions/bitwise/bitwise_or.hpp
+++ b/test/functions/bitwise/bitwise_or.hpp
@@ -4,10 +4,18 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/bitwise/bitwise_or.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
-
 
-static_assert(std::is_same<kvasir::mpl::eager::bitwise_or<kvasir::mpl::integral_constant<unsigned, 0>, kvasir::mpl::integral_constant<unsigned, 1>>, kvasir::mpl::integral_constant<unsigned, 1>>::value, "");
-static_assert(std::is_same<kvasir::mpl::bitwise_or<>::template f<kvasir::mpl::integral_constant<unsigned, 0>, kvasir::mpl::integral_constant<unsigned, 1>>, kvasir::mpl::integral_constant<unsigned, 1>>::value, "");
+static_assert(
+        std::is_same<kvasir::mpl::eager::bitwise_or<kvasir::mpl::integral_constant<unsigned, 0>,
+                                                    kvasir::mpl::integral_constant<unsigned, 1>>,
+                     kvasir::mpl::integral_constant<unsigned, 1>>::value,
+        "");
+static_assert(
+        std::is_same<
+                kvasir::mpl::bitwise_or<>::template f<kvasir::mpl::integral_constant<unsigned, 0>,
+                                                      kvasir::mpl::integral_constant<unsigned, 1>>,
+                kvasir::mpl::integral_constant<unsigned, 1>>::value,
+        "");
diff --git a/test/functions/bitwise/bitwise_xor.hpp b/test/functions/bitwise/bitwise_xor.hpp
index d58dedb..f8267d7 100644
--- a/test/functions/bitwise/bitwise_xor.hpp
+++ b/test/functions/bitwise/bitwise_xor.hpp
@@ -4,9 +4,18 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/bitwise/bitwise_xor.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
 
-static_assert(std::is_same<kvasir::mpl::eager::bitwise_xor<kvasir::mpl::integral_constant<unsigned, 0>, kvasir::mpl::integral_constant<unsigned, 1>>, kvasir::mpl::integral_constant<unsigned, 1>>::value, "");
-static_assert(std::is_same<kvasir::mpl::bitwise_xor<>::template f<kvasir::mpl::integral_constant<unsigned, 0>, kvasir::mpl::integral_constant<unsigned, 1>>, kvasir::mpl::integral_constant<unsigned, 1>>::value, "");
+static_assert(
+        std::is_same<kvasir::mpl::eager::bitwise_xor<kvasir::mpl::integral_constant<unsigned, 0>,
+                                                     kvasir::mpl::integral_constant<unsigned, 1>>,
+                     kvasir::mpl::integral_constant<unsigned, 1>>::value,
+        "");
+static_assert(
+        std::is_same<
+                kvasir::mpl::bitwise_xor<>::template f<kvasir::mpl::integral_constant<unsigned, 0>,
+                                                       kvasir::mpl::integral_constant<unsigned, 1>>,
+                kvasir::mpl::integral_constant<unsigned, 1>>::value,
+        "");
diff --git a/test/functions/comparison/equal.hpp b/test/functions/comparison/equal.hpp
index 09ee7a6..ccd89ba 100644
--- a/test/functions/comparison/equal.hpp
+++ b/test/functions/comparison/equal.hpp
@@ -4,10 +4,16 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/comparison/equal.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
-
 
-static_assert(std::is_same<kvasir::mpl::eager::equal<kvasir::mpl::integral_constant<unsigned, 0>, kvasir::mpl::integral_constant<unsigned, 1>>, kvasir::mpl::bool_<false>>::value, "");
-static_assert(std::is_same<kvasir::mpl::equal<>::template f<kvasir::mpl::integral_constant<unsigned, 0>, kvasir::mpl::integral_constant<unsigned, 1>>, kvasir::mpl::bool_<false>>::value, "");
+static_assert(std::is_same<kvasir::mpl::eager::equal<kvasir::mpl::integral_constant<unsigned, 0>,
+                                                     kvasir::mpl::integral_constant<unsigned, 1>>,
+                           kvasir::mpl::bool_<false>>::value,
+              "");
+static_assert(
+        std::is_same<kvasir::mpl::equal<>::template f<kvasir::mpl::integral_constant<unsigned, 0>,
+                                                      kvasir::mpl::integral_constant<unsigned, 1>>,
+                     kvasir::mpl::bool_<false>>::value,
+        "");
diff --git a/test/functions/comparison/greater_than.hpp b/test/functions/comparison/greater_than.hpp
index 7f7db64..84c9d31 100644
--- a/test/functions/comparison/greater_than.hpp
+++ b/test/functions/comparison/greater_than.hpp
@@ -4,10 +4,17 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/comparison/greater_than.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
-
 
-static_assert(std::is_same<kvasir::mpl::eager::greater_than<kvasir::mpl::integral_constant<int, 0>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<0>>::value, "");
-static_assert(std::is_same<kvasir::mpl::greater_than<>::template f<kvasir::mpl::integral_constant<int, 0>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<0>>::value, "");
+static_assert(std::is_same<kvasir::mpl::eager::greater_than<kvasir::mpl::integral_constant<int, 0>,
+                                                            kvasir::mpl::integral_constant<int, 1>>,
+                           kvasir::mpl::bool_<0>>::value,
+              "");
+static_assert(
+        std::is_same<
+                kvasir::mpl::greater_than<>::template f<kvasir::mpl::integral_constant<int, 0>,
+                                                        kvasir::mpl::integral_constant<int, 1>>,
+                kvasir::mpl::bool_<0>>::value,
+        "");
diff --git a/test/functions/comparison/greater_than_or_equal.hpp b/test/functions/comparison/greater_than_or_equal.hpp
index e3a92a2..ddc9b65 100644
--- a/test/functions/comparison/greater_than_or_equal.hpp
+++ b/test/functions/comparison/greater_than_or_equal.hpp
@@ -4,10 +4,18 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/comparison/greater_than_or_equal.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
-
 
-static_assert(std::is_same<kvasir::mpl::eager::greater_than_or_equal<kvasir::mpl::integral_constant<int, 1>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<1>>::value, "");
-static_assert(std::is_same<kvasir::mpl::greater_than_or_equal<>::template f<kvasir::mpl::integral_constant<int, 1>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<1>>::value, "");
+static_assert(
+        std::is_same<
+                kvasir::mpl::eager::greater_than_or_equal<kvasir::mpl::integral_constant<int, 1>,
+                                                          kvasir::mpl::integral_constant<int, 1>>,
+                kvasir::mpl::bool_<1>>::value,
+        "");
+static_assert(std::is_same<kvasir::mpl::greater_than_or_equal<>::template f<
+                                   kvasir::mpl::integral_constant<int, 1>,
+                                   kvasir::mpl::integral_constant<int, 1>>,
+                           kvasir::mpl::bool_<1>>::value,
+              "");
diff --git a/test/functions/comparison/less_than.hpp b/test/functions/comparison/less_than.hpp
index 2b1e820..57cca12 100644
--- a/test/functions/comparison/less_than.hpp
+++ b/test/functions/comparison/less_than.hpp
@@ -4,10 +4,16 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/comparison/less_than.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
-
 
-static_assert(std::is_same<kvasir::mpl::eager::less_than<kvasir::mpl::integral_constant<int, 0>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<1>>::value, "");
-static_assert(std::is_same<kvasir::mpl::less_than<>::template f<kvasir::mpl::integral_constant<int, 0>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<1>>::value, "");
+static_assert(std::is_same<kvasir::mpl::eager::less_than<kvasir::mpl::integral_constant<int, 0>,
+                                                         kvasir::mpl::integral_constant<int, 1>>,
+                           kvasir::mpl::bool_<1>>::value,
+              "");
+static_assert(
+        std::is_same<kvasir::mpl::less_than<>::template f<kvasir::mpl::integral_constant<int, 0>,
+                                                          kvasir::mpl::integral_constant<int, 1>>,
+                     kvasir::mpl::bool_<1>>::value,
+        "");
diff --git a/test/functions/comparison/less_than_or_equal.hpp b/test/functions/comparison/less_than_or_equal.hpp
index 495507f..89c2900 100644
--- a/test/functions/comparison/less_than_or_equal.hpp
+++ b/test/functions/comparison/less_than_or_equal.hpp
@@ -4,10 +4,17 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/comparison/less_than_or_equal.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
-
 
-static_assert(std::is_same<kvasir::mpl::eager::less_than_or_equal<kvasir::mpl::integral_constant<int, 0>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<1>>::value, "");
-static_assert(std::is_same<kvasir::mpl::less_than_or_equal<>::template f<kvasir::mpl::integral_constant<int, 0>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<1>>::value, "");
+static_assert(
+        std::is_same<kvasir::mpl::eager::less_than_or_equal<kvasir::mpl::integral_constant<int, 0>,
+                                                            kvasir::mpl::integral_constant<int, 1>>,
+                     kvasir::mpl::bool_<1>>::value,
+        "");
+static_assert(std::is_same<kvasir::mpl::less_than_or_equal<>::template f<
+                                   kvasir::mpl::integral_constant<int, 0>,
+                                   kvasir::mpl::integral_constant<int, 1>>,
+                           kvasir::mpl::bool_<1>>::value,
+              "");
diff --git a/test/functions/comparison/not_equal.hpp b/test/functions/comparison/not_equal.hpp
index 87415de..dec9bc6 100644
--- a/test/functions/comparison/not_equal.hpp
+++ b/test/functions/comparison/not_equal.hpp
@@ -4,10 +4,16 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/comparison/not_equal.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
-
 
-static_assert(std::is_same<kvasir::mpl::eager::not_equal<kvasir::mpl::integral_constant<int, 0>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<1>>::value, "");
-static_assert(std::is_same<kvasir::mpl::not_equal<>::template f<kvasir::mpl::integral_constant<int, 0>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<1>>::value, "");
+static_assert(std::is_same<kvasir::mpl::eager::not_equal<kvasir::mpl::integral_constant<int, 0>,
+                                                         kvasir::mpl::integral_constant<int, 1>>,
+                           kvasir::mpl::bool_<1>>::value,
+              "");
+static_assert(
+        std::is_same<kvasir::mpl::not_equal<>::template f<kvasir::mpl::integral_constant<int, 0>,
+                                                          kvasir::mpl::integral_constant<int, 1>>,
+                     kvasir::mpl::bool_<1>>::value,
+        "");
diff --git a/test/functions/logical/logical_and.hpp b/test/functions/logical/logical_and.hpp
index 0df289f..d849486 100644
--- a/test/functions/logical/logical_and.hpp
+++ b/test/functions/logical/logical_and.hpp
@@ -4,10 +4,16 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/logical/logical_and.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
-
 
-static_assert(std::is_same<kvasir::mpl::eager::logical_and<kvasir::mpl::integral_constant<int, 2>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<1>>::value, "");
-static_assert(std::is_same<kvasir::mpl::logical_and<>::template f<kvasir::mpl::integral_constant<int, 2>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<1>>::value, "");
+static_assert(std::is_same<kvasir::mpl::eager::logical_and<kvasir::mpl::integral_constant<int, 2>,
+                                                           kvasir::mpl::integral_constant<int, 1>>,
+                           kvasir::mpl::bool_<1>>::value,
+              "");
+static_assert(
+        std::is_same<kvasir::mpl::logical_and<>::template f<kvasir::mpl::integral_constant<int, 2>,
+                                                            kvasir::mpl::integral_constant<int, 1>>,
+                     kvasir::mpl::bool_<1>>::value,
+        "");
diff --git a/test/functions/logical/logical_not.hpp b/test/functions/logical/logical_not.hpp
index b1c6a38..a2e08b5 100644
--- a/test/functions/logical/logical_not.hpp
+++ b/test/functions/logical/logical_not.hpp
@@ -4,10 +4,14 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/logical/logical_not.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
-
 
-static_assert(std::is_same<kvasir::mpl::eager::logical_not<kvasir::mpl::integral_constant<int, 0>>, kvasir::mpl::bool_<1>>::value, "");
-static_assert(std::is_same<kvasir::mpl::logical_not<>::template f<kvasir::mpl::integral_constant<int, 0>>, kvasir::mpl::bool_<1>>::value, "");
+static_assert(std::is_same<kvasir::mpl::eager::logical_not<kvasir::mpl::integral_constant<int, 0>>,
+                           kvasir::mpl::bool_<1>>::value,
+              "");
+static_assert(
+        std::is_same<kvasir::mpl::logical_not<>::template f<kvasir::mpl::integral_constant<int, 0>>,
+                     kvasir::mpl::bool_<1>>::value,
+        "");
diff --git a/test/functions/logical/logical_or.hpp b/test/functions/logical/logical_or.hpp
index fde6371..32cb4ac 100644
--- a/test/functions/logical/logical_or.hpp
+++ b/test/functions/logical/logical_or.hpp
@@ -4,12 +4,16 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
+#include <type_traits>
 #include <kvasir/mpl/functions/logical/logical_or.hpp>
 #include <kvasir/mpl/types/integral_constant.hpp>
-#include <type_traits>
-
-
-static_assert(std::is_same<kvasir::mpl::eager::logical_or<kvasir::mpl::integral_constant<int, 0>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<1>>::value, "");
-static_assert(std::is_same<kvasir::mpl::logical_or<>::template f<kvasir::mpl::integral_constant<int, 0>, kvasir::mpl::integral_constant<int, 1>>, kvasir::mpl::bool_<1>>::value, "");
-
 
+static_assert(std::is_same<kvasir::mpl::eager::logical_or<kvasir::mpl::integral_constant<int, 0>,
+                                                          kvasir::mpl::integral_constant<int, 1>>,
+                           kvasir::mpl::bool_<1>>::value,
+              "");
+static_assert(
+        std::is_same<kvasir::mpl::logical_or<>::template f<kvasir::mpl::integral_constant<int, 0>,
+                                                           kvasir::mpl::integral_constant<int, 1>>,
+                     kvasir::mpl::bool_<1>>::value,
+        "");
diff --git a/test/sequence/at.hpp b/test/sequence/at.hpp
index 58a7cdd..ce10ef1 100644
--- a/test/sequence/at.hpp
+++ b/test/sequence/at.hpp
@@ -14,9 +14,28 @@ namespace {
 	namespace mpl = kvasir::mpl;
 
 	static_assert(std::is_same<mpl::eager::at<mpl::list<void, char, short>, 1>, char>::value, "");
-	static_assert(std::is_same<mpl::eager::at<mpl::list<int, int, int, int, int, int, int, void, char, short>, 7>, void>::value, "");
-	static_assert(std::is_same<mpl::eager::at<mpl::list<int, int, int, int, int, int, int, void, char, short>, 8>, char>::value, "");
-	static_assert(std::is_same<mpl::eager::at<mpl::list<int, int, int, int, int, int, int, void, char, short>, 9>, short>::value, "");
-	static_assert(std::is_same<mpl::eager::at<mpl::list<
-		int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int,	void, char, short>, 17>, char>::value, "");
-}
+	static_assert(
+	        std::is_same<
+	                mpl::eager::at<mpl::list<int, int, int, int, int, int, int, void, char, short>,
+	                               7>,
+	                void>::value,
+	        "");
+	static_assert(
+	        std::is_same<
+	                mpl::eager::at<mpl::list<int, int, int, int, int, int, int, void, char, short>,
+	                               8>,
+	                char>::value,
+	        "");
+	static_assert(
+	        std::is_same<
+	                mpl::eager::at<mpl::list<int, int, int, int, int, int, int, void, char, short>,
+	                               9>,
+	                short>::value,
+	        "");
+	static_assert(
+	        std::is_same<mpl::eager::at<mpl::list<int, int, int, int, int, int, int, int, int, int,
+	                                              int, int, int, int, int, int, void, char, short>,
+	                                    17>,
+	                     char>::value,
+	        "");
+} // namespace
diff --git a/test/sequence/join.hpp b/test/sequence/join.hpp
index 78d0152..f0218ed 100644
--- a/test/sequence/join.hpp
+++ b/test/sequence/join.hpp
@@ -51,4 +51,4 @@ namespace {
 			join_test_impl<1025>();
 		}
 	};
-}
+} // namespace
diff --git a/test/sequence/size.hpp b/test/sequence/size.hpp
index 8d141c6..97d96d0 100644
--- a/test/sequence/size.hpp
+++ b/test/sequence/size.hpp
@@ -15,4 +15,4 @@ namespace size_test {
 	static_assert(size<>::template f<int, int, int, int>::value == 4, "size test failed");
 	static_assert(size<>::template f<int, int, int, int, int>::value == 5, "size test failed");
 	static_assert(size<>::template f<int, int, int, int, int, int>::value == 6, "size test failed");
-}
+} // namespace size_test
diff --git a/test/test.cpp b/test/test.cpp
index addc1da..fbb60b4 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -12,6 +12,7 @@
 #include "algorithm/fold_left.hpp"
 #include "algorithm/fold_right.hpp"
 #include "algorithm/group.hpp"
+#include "algorithm/index_if.hpp"
 #include "algorithm/lookup.hpp"
 #include "algorithm/make_sequence.hpp"
 #include "algorithm/none.hpp"
@@ -30,9 +31,9 @@
 #include "functional/bind.hpp"
 #include "functional/call.hpp"
 #include "functional/compose.hpp"
+#include "functional/flow.hpp"
 #include "functional/fork.hpp"
 #include "functional/identity.hpp"
-#include "functional/flow.hpp"
 
 #include "functions/arithmetic/decrement.hpp"
 #include "functions/arithmetic/divide.hpp"
diff --git a/test/utility/always.hpp b/test/utility/always.hpp
index 2761394..ea64bc5 100644
--- a/test/utility/always.hpp
+++ b/test/utility/always.hpp
@@ -18,4 +18,4 @@ namespace {
 		static_assert(mpl::eager::always_false<T>::value,
 		              "always_false should not have been instantiated");
 	};
-}
+} // namespace
diff --git a/test/utility/conditional.hpp b/test/utility/conditional.hpp
index 09cf291..abef611 100644
--- a/test/utility/conditional.hpp
+++ b/test/utility/conditional.hpp
@@ -4,11 +4,13 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 #pragma once
 
-#include <kvasir/mpl/utility/conditional.hpp>
 #include <kvasir/mpl/types/bool.hpp>
+#include <kvasir/mpl/utility/conditional.hpp>
 
 namespace conditional_test {
 	using namespace kvasir::mpl;
-	static_assert(conditional<true>::template f <bool_< true >, bool_<false >> ::value, "conditional test failed");
-	static_assert(conditional<false>::template f <bool_< true >, bool_<false >> ::value == false, "conditional test failed");
-}
\ No newline at end of file
+	static_assert(conditional<true>::template f<bool_<true>, bool_<false>>::value,
+	              "conditional test failed");
+	static_assert(conditional<false>::template f<bool_<true>, bool_<false>>::value == false,
+	              "conditional test failed");
+} // namespace conditional_test
\ No newline at end of file