diff --git a/boxedcpp/bootstrap.hpp b/boxedcpp/bootstrap.hpp
new file mode 100644
index 00000000..ebd0d793
--- /dev/null
+++ b/boxedcpp/bootstrap.hpp
@@ -0,0 +1,85 @@
+#ifndef __bootstrap_hpp
+#define __bootstrap_hpp__
+
+#include "boxedcpp.hpp"
+
+template<typename Ret, typename P1, typename P2>
+Ret add(P1 p1, P2 p2)
+{
+  return p1 + p2;
+}
+
+template<typename Ret, typename P1, typename P2>
+Ret subtract(P1 p1, P2 p2)
+{
+  return p1 - p2;
+}
+
+template<typename Ret, typename P1, typename P2>
+Ret divide(P1 p1, P2 p2)
+{
+  return p1 - p2;
+}
+
+
+template<typename Ret, typename P1, typename P2>
+Ret multiply(P1 p1, P2 p2)
+{
+  return p1 * p2;
+}
+
+template<typename P1, typename P2>
+P1 &timesequal(P1 &p1, P2 p2)
+{
+  return (p1 *= p2);
+}
+
+template<typename Input>
+std::string to_string(Input i)
+{
+  return boost::lexical_cast<std::string>(i);
+}
+
+void bootstrap(BoxedCPP_System &s)
+{
+  s.register_type<void>("void");
+  s.register_type<double>("double");
+  s.register_type<int>("int");
+  s.register_type<char>("char");
+  s.register_type<std::string>("string");
+
+  s.register_function(boost::function<std::string (const std::string &, const std::string&)>(&add<std::string, const std::string &, const std::string &>), "+");
+
+  s.register_function(boost::function<int (int, int)>(&add<int, int, int>), "+");
+  s.register_function(boost::function<double (int, double)>(&add<double, int, double>), "+");
+  s.register_function(boost::function<double (double, int)>(&add<double, double, int>), "+");
+  s.register_function(boost::function<double (double, double)>(&add<double, double, double>), "+");
+
+  s.register_function(boost::function<int (int, int)>(&subtract<int, int, int>), "-");
+  s.register_function(boost::function<double (int, double)>(&subtract<double, int, double>), "-");
+  s.register_function(boost::function<double (double, int)>(&subtract<double, double, int>), "-");
+  s.register_function(boost::function<double (double, double)>(&subtract<double, double, double>), "-");
+
+  s.register_function(boost::function<int (int, int)>(&divide<int, int, int>), "/");
+  s.register_function(boost::function<double (int, double)>(&divide<double, int, double>), "/");
+  s.register_function(boost::function<double (double, int)>(&divide<double, double, int>), "/");
+  s.register_function(boost::function<double (double, double)>(&divide<double, double, double>), "/");
+
+  s.register_function(boost::function<int (int, int)>(&multiply<int, int, int>), "*");
+  s.register_function(boost::function<double (int, double)>(&multiply<double, int, double>), "*");
+  s.register_function(boost::function<double (double, int)>(&multiply<double, double, int>), "*");
+  s.register_function(boost::function<double (double, double)>(&multiply<double, double, double>), "*");
+
+  s.register_function(boost::function<std::string (int)>(&to_string<int>), "to_string");
+  s.register_function(boost::function<std::string (const std::string &)>(&to_string<const std::string &>), "to_string");
+  s.register_function(boost::function<std::string (char)>(&to_string<char>), "to_string");
+  s.register_function(boost::function<std::string (double)>(&to_string<double>), "to_string");
+
+  s.register_function(boost::function<int &(int&, int)>(&timesequal<int, int>), "*=");
+  s.register_function(boost::function<double &(double&, int)>(&timesequal<double, int>), "*=");
+  s.register_function(boost::function<double &(double&, double)>(&timesequal<double, double>), "*=");
+  s.register_function(boost::function<int &(int&, double)>(&timesequal<int, double>), "*=");
+
+}
+
+#endif
diff --git a/boxedcpp/boxedcpp.hpp b/boxedcpp/boxedcpp.hpp
index 48297ebc..facd578a 100644
--- a/boxedcpp/boxedcpp.hpp
+++ b/boxedcpp/boxedcpp.hpp
@@ -130,88 +130,6 @@ void dump_system(const BoxedCPP_System &s)
   std::cout << std::endl;
 }
 
-template<typename Ret, typename P1, typename P2>
-Ret add(P1 p1, P2 p2)
-{
-  return p1 + p2;
-}
 
-template<typename Ret, typename P1, typename P2>
-Ret subtract(P1 p1, P2 p2)
-{
-  return p1 - p2;
-}
-
-template<typename Ret, typename P1, typename P2>
-Ret divide(P1 p1, P2 p2)
-{
-  return p1 - p2;
-}
-
-
-template<typename Ret, typename P1, typename P2>
-Ret multiply(P1 p1, P2 p2)
-{
-  return p1 * p2;
-}
-
-template<typename P1, typename P2>
-P1 &timesequal(P1 &p1, P2 p2)
-{
-  return (p1 *= p2);
-}
-
-template<typename Input>
-std::string to_string(Input i)
-{
-  return boost::lexical_cast<std::string>(i);
-}
-
-void bootstrap(BoxedCPP_System &s)
-{
-  s.register_type<void>("void");
-  s.register_type<double>("double");
-  s.register_type<int>("int");
-  s.register_type<char>("char");
-  s.register_type<std::string>("string");
-
-  s.register_function(boost::function<std::string (const std::string &, const std::string&)>(&add<std::string, const std::string &, const std::string &>), "+");
-
-  s.register_function(boost::function<int (int, int)>(&add<int, int, int>), "+");
-  s.register_function(boost::function<double (int, double)>(&add<double, int, double>), "+");
-  s.register_function(boost::function<double (double, int)>(&add<double, double, int>), "+");
-  s.register_function(boost::function<double (double, double)>(&add<double, double, double>), "+");
-
-  s.register_function(boost::function<int (int, int)>(&subtract<int, int, int>), "-");
-  s.register_function(boost::function<double (int, double)>(&subtract<double, int, double>), "-");
-  s.register_function(boost::function<double (double, int)>(&subtract<double, double, int>), "-");
-  s.register_function(boost::function<double (double, double)>(&subtract<double, double, double>), "-");
-
-  s.register_function(boost::function<int (int, int)>(&divide<int, int, int>), "/");
-  s.register_function(boost::function<double (int, double)>(&divide<double, int, double>), "/");
-  s.register_function(boost::function<double (double, int)>(&divide<double, double, int>), "/");
-  s.register_function(boost::function<double (double, double)>(&divide<double, double, double>), "/");
-
-  s.register_function(boost::function<int (int, int)>(&multiply<int, int, int>), "*");
-  s.register_function(boost::function<double (int, double)>(&multiply<double, int, double>), "*");
-  s.register_function(boost::function<double (double, int)>(&multiply<double, double, int>), "*");
-  s.register_function(boost::function<double (double, double)>(&multiply<double, double, double>), "*");
-
-  s.register_function(boost::function<std::string (int)>(&to_string<int>), "to_string");
-  s.register_function(boost::function<std::string (const std::string &)>(&to_string<const std::string &>), "to_string");
-  s.register_function(boost::function<std::string (char)>(&to_string<char>), "to_string");
-  s.register_function(boost::function<std::string (double)>(&to_string<double>), "to_string");
-
-  s.register_function(boost::function<int &(int&, int)>(&timesequal<int, int>), "*=");
-  s.register_function(boost::function<double &(double&, int)>(&timesequal<double, int>), "*=");
-  s.register_function(boost::function<double &(double&, double)>(&timesequal<double, double>), "*=");
-  s.register_function(boost::function<int &(int&, double)>(&timesequal<int, double>), "*=");
-
-
-
-
-
-
-}
 
 #endif
diff --git a/boxedcpp/test.cpp b/boxedcpp/test.cpp
index 6ff7217e..4a7cbb06 100644
--- a/boxedcpp/test.cpp
+++ b/boxedcpp/test.cpp
@@ -5,6 +5,7 @@
 #include <boost/function.hpp>
 
 #include "boxedcpp.hpp"
+#include "bootstrap.hpp"
 
 struct Test
 {
diff --git a/boxedcpp/unittest.cpp b/boxedcpp/unittest.cpp
index ec2aafa3..c382206f 100644
--- a/boxedcpp/unittest.cpp
+++ b/boxedcpp/unittest.cpp
@@ -1,4 +1,5 @@
 #include "boxedcpp.hpp"
+#include "bootstrap.hpp"
 
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE boxedcpp_unittests