3 files changed, 31 insertions, 1 deletions
diff --git a/src/list/operation/contains.h b/src/list/operation/contains.h
new file mode 100644
index 0000000..9e752ed
--- /dev/null
+++ b/src/list/operation/contains.h
@@ -0,0 +1,26 @@
+#ifndef TYPEASVALUE_SRC_LIST_OPERATION_CONTAINS_H_
+#define TYPEASVALUE_SRC_LIST_OPERATION_CONTAINS_H_
+
+#include "higher/query.h"
+
+namespace tav {
+
+template <
+	typename Element,
+	typename List
+>
+class Contains {
+	private:
+		template <typename Current>
+		struct comparator {
+			typedef std::is_same<Current, Element> type;
+		};
+
+	public:
+		typedef typename Any<comparator, List>::type type;
+
+};
+
+}
+
+#endif  // TYPEASVALUE_SRC_LIST_OPERATION_CONTAINS_H_
diff --git a/src/list/operation/higher/misc.h b/src/list/operation/higher/misc.h
index 1eacaaa..feec7de 100644
--- a/src/list/operation/higher/misc.h
+++ b/src/list/operation/higher/misc.h
@@ -17,7 +17,10 @@ class Map {
 			typename Previous
 		>
 		struct function_wrapper {
-			typedef Cons<Function<Current>, Previous> type;
+			typedef Cons<
+				typename Function<Current>::type,
+				Previous
+			> type;
 		};
 
 	public:
diff --git a/src/list/operation/higher/query.h b/src/list/operation/higher/query.h
index 34d05cb..29f65dc 100644
--- a/src/list/operation/higher/query.h
+++ b/src/list/operation/higher/query.h
@@ -2,6 +2,7 @@
 #define TYPEASVALUE_SRC_LIST_OPERATION_HIGHER_QUERY_H_
 
 #include "fold.h"
+#include "misc.h"
 #include "operation/logic.h"
 
 namespace tav {