diff --git a/Fake.cpp b/Fake.cpp
deleted file mode 100644
index 84d6e2a..0000000
--- a/Fake.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "elfspy/Fake.h"
-
-std::vector<spy::FakeI *> spy::fake_list;
diff --git a/Hook.cpp b/Hook.cpp
new file mode 100644
index 0000000..af4c128
--- /dev/null
+++ b/Hook.cpp
@@ -0,0 +1,13 @@
+#include <elfspy/Hook.h>
+
+std::vector<spy::IHook *> spy::hook_list;
+
+void spy::delete_mocks (void) {
+	while (spy::hook_list.size () != 0) {
+		auto index = spy::hook_list.size () - 1;
+		auto element = spy::hook_list[index];
+
+		spy::hook_list.erase (spy::hook_list.begin() + index);
+		delete element;
+	}
+}
diff --git a/elfspy/Fake.h b/elfspy/Fake.h
index d98ed8a..f748cf0 100644
--- a/elfspy/Fake.h
+++ b/elfspy/Fake.h
@@ -5,6 +5,7 @@
 
 #include <memory>
 #include <vector>
+#include <iostream>
 
 namespace spy
 {
@@ -18,20 +19,9 @@ namespace spy
  * destructor uninstalls it
  */
 
-class FakeI {
-};
-extern std::vector<FakeI *> fake_list;
-void delete_mocks (void) {
-	while (fake_list.size () != 0) {
-		auto index = fake_list.size () - 1;
-		auto element = fake_list[index];
 
-		fake_list.erase (fake_list.begin() + index);
-		delete element;
-	}
-}
 template <typename H, typename ReturnType, typename... ArgTypes>
-class Fake : FakeI
+class Fake
 {
 public:
   Fake(H& hook, ReturnType (*func)(ArgTypes...));
@@ -43,27 +33,30 @@ private:
 };
 
 template <typename H, typename ReturnType, typename... ArgTypes>
-inline Fake<H, ReturnType, ArgTypes...>::
+Fake<H, ReturnType, ArgTypes...>::
 Fake(H& hook, ReturnType (*func)(ArgTypes...))
   :hook_(hook)
 {
   func_ = hook_.patch(func);
 }
 
+/*
 template <typename H, typename ReturnType, typename... ArgTypes>
-inline Fake<H, ReturnType, ArgTypes...>::~Fake()
+Fake<H, ReturnType, ArgTypes...>::~Fake()
 {
+  std::cout << "Fake" << std::endl;
   hook_.patch(func_);
 }
 
 template <typename H, typename ReturnType, typename... ArgTypes>
-inline auto new_fake(H& hook, ReturnType (*patch)(ArgTypes...))
-  -> Fake<H, ReturnType, ArgTypes...>*
+Fake<H, ReturnType, ArgTypes...>* new_fake(H& hook, ReturnType (*patch)(ArgTypes...))
 {
-  auto instance = std::make_shared<Fake<H, ReturnType, ArgTypes...>>(hook, patch);
+  std::cout << "hola" << std::endl;
+  auto instance = new Fake<H, ReturnType, ArgTypes...>(hook, patch);
   fake_list.push_back (instance);
   return instance;
 }
+*/
 
 } // namespace elfspy
 
diff --git a/elfspy/Hook.h b/elfspy/Hook.h
index 368383d..8f4b3de 100644
--- a/elfspy/Hook.h
+++ b/elfspy/Hook.h
@@ -7,6 +7,9 @@
 #include "elfspy/MethodInfo.h"
 #include "elfspy/Thunk.h"
 
+#include <iostream>
+#include <vector>
+
 namespace spy
 {
 
@@ -20,6 +23,19 @@ namespace spy
  * are functions where the first type in Args... is the class type.
  */
 
+
+class IHook {
+public:
+	virtual ~IHook() {
+		std::cout << "HookI" << std::endl;
+	}
+
+};
+
+extern std::vector<IHook *> hook_list;
+
+void delete_mocks (void);
+
 template <typename CRTP, typename ReturnType, typename... ArgTypes>
 class Hook : public HookImpl<CRTP, ReturnType, ArgTypes...>
 {
diff --git a/elfspy/Lambda.h b/elfspy/Lambda.h
index 4299da4..fdd3b41 100644
--- a/elfspy/Lambda.h
+++ b/elfspy/Lambda.h
@@ -1,10 +1,12 @@
 #ifndef ELFSPY_LAMBDA_H
 #define ELFSPY_LAMBDA_H
 
+#include <elfspy/Hook.h>
 #include <utility>
 
 namespace spy
 {
+extern std::vector<IHook *> hook_list;
 
 /**
  * @namespace spy
@@ -16,7 +18,7 @@ namespace spy
  */
 
 template <typename H, typename L, typename ReturnType, typename... ArgTypes>
-class Lambda
+class Lambda : public IHook
 {
 public:
   Lambda(H& hook, L& lambda);
@@ -56,20 +58,15 @@ ReturnType Lambda<H, L, ReturnType, ArgTypes...>::function(ArgTypes... argtypes)
   return instance_->lambda_(std::forward<ArgTypes>(argtypes)...);
 }
 
-template <typename H, typename L>
-inline auto fake(H& hook, L& lambda)
-  -> typename H::template Export<Lambda, H, L, typename H::Result>::Type
-{
-  return { hook, lambda };
-}
-
 template <typename H, typename L>
 inline auto new_fake(H& hook, L& lambda)
   -> typename H::template Export<Lambda, H, L, typename H::Result>::Type*
 {
   using Install =
       typename H::template Export<Lambda, H, L, typename H::Result>::Type;
-  return new Install(hook, lambda);
+  auto instance = new Install(hook, lambda);
+  hook_list.push_back (instance);
+  return instance;
 }
 
 } // namespace elfspy
diff --git a/meson.build b/meson.build
index afe1c52..9211150 100644
--- a/meson.build
+++ b/meson.build
@@ -3,6 +3,7 @@ pkg = import('pkgconfig')
 
 sources = [
     'Call.cpp',
+    'Hook.cpp',
     'Report.cpp',
     'ELFInfo.cpp',
     'SPY.cpp',
@@ -11,7 +12,6 @@ sources = [
     'GOTEntry.cpp',
     'Fail.cpp',
     'MFile.cpp',
-    'Fake.cpp',
 ]
 
 headers = [