diff --git a/csrc/Function.h b/csrc/Function.h
new file mode 100644
--- /dev/null
+++ b/csrc/Function.h
@@ -0,0 +1,72 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "cpp_magic.h"
+
+#define VARGS(...) __VA_ARGS__
+
+#define TAIL(x,...) __VA_ARGS__
+
+#define UNPAREN(x) VARGS x
+
+#define FIRSTSECOND(X,Y) X Y
+
+#define GETTYPE(X) FIRST X
+#define GETVAR(X) SECOND X
+#define GETTYPVAR(X) FIRSTSECOND X
+
+
+
+#define GETTYPES(x) MAP(GETTYPE,COMMA,UNPAREN(x))
+#define GETVARS(x) MAP(GETVAR,COMMA,UNPAREN(x))
+#define GETTYPVARS(x) MAP(GETTYPVAR,COMMA,UNPAREN(x))
+
+#define Function_new_decl(NAME,R,ATYPS)                         \
+    void* Function_new_ ## NAME ( R (*fp) ( GETTYPES(ATYPS) ));
+
+#define Function_call_decl(NAME,R,ATYPS)                                \
+    R Function_call_ ## NAME ( REMOVE_TRAILING_COMMAS( void*, GETTYPES(ATYPS) ) );
+
+#define Function_delete_decl(NAME,R,ATYPS)           \
+    void Function_delete_ ## NAME ( void*  );
+
+#define Function_new_inst(NAME,R,ATYPS)                                \
+    inline void* Function_new_ ## NAME ( R (*fp)( GETTYPES(ATYPS) ) )   \
+    {                                                                   \
+        std::function< R ( GETTYPES(ATYPS) )>* p = new std::function< R ( GETTYPES(ATYPS) ) >(fp); \
+        return static_cast<void*>(p);                                   \
+    }                                                                   \
+    auto a_Function_new_ ## NAME = Function_new_ ## NAME;
+
+
+#define Function_call_inst(NAME,R,ATYPS)        \
+    inline R Function_call_ ## NAME ( REMOVE_TRAILING_COMMAS( void* op,  GETTYPVARS(ATYPS) ) ) \
+    {                                                                   \
+        std::function< R ( GETTYPES(ATYPS) )>* p = static_cast< std::function< R ( GETTYPES(ATYPS) )>* >(op); \
+        return (*p) ( GETVARS(ATYPS) );                              \
+    }                                                                   \
+    auto a_Function_call_ ## NAME = Function_call_ ## NAME;
+
+#define Function_delete_inst(NAME,R,ATYPS)             \
+    inline void Function_delete_ ## NAME ( void* op )   \
+    {                                                                   \
+        std::function< R ( GETTYPES(ATYPS) ) >* p = static_cast< std::function< R ( GETTYPES(ATYPS) ) >* >(op); \
+        delete p;                                                       \
+    }                                                                   \
+    auto a_Function_delete_ ## NAME = Function_delete_ ## NAME;
+
+
+#define Function(NAME,R,ATYPS) \
+    extern "C" { \
+        Function_new_decl(NAME,R,ATYPS)         \
+        Function_call_decl(NAME,R,ATYPS)        \
+        Function_delete_decl(NAME,R,ATYPS)      \
+    }                                           \
+    Function_new_inst(NAME,R,ATYPS)             \
+    Function_call_inst(NAME,R,ATYPS)            \
+    Function_delete_inst(NAME,R,ATYPS)
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/csrc/cpp_magic.h b/csrc/cpp_magic.h
new file mode 100644
--- /dev/null
+++ b/csrc/cpp_magic.h
@@ -0,0 +1,446 @@
+/**
+ * This header file contains a library of advanced C Pre-Processor (CPP) macros
+ * which implement various useful functions, such as iteration, in the
+ * pre-processor.
+ *
+ * Though the file name (quite validly) labels this as magic, there should be
+ * enough documentation in the comments for a reader only casually familiar
+ * with the CPP to be able to understand how everything works.
+ *
+ * The majority of the magic tricks used in this file are based on those
+ * described by pfultz2 in his "Cloak" library:
+ *
+ *    https://github.com/pfultz2/Cloak/wiki/C-Preprocessor-tricks,-tips,-and-idioms
+ *
+ * Major differences are a greater level of detailed explanation in this
+ * implementation and also a refusal to include any macros which require a O(N)
+ * macro definitions to handle O(N) arguments (with the exception of DEFERn).
+ */
+
+#ifndef CPP_MAGIC_H
+#define CPP_MAGIC_H
+
+/**
+ * Force the pre-processor to expand the macro a large number of times. Usage:
+ *
+ *   EVAL(expression)
+ *
+ * This is useful when you have a macro which evaluates to a valid macro
+ * expression which is not subsequently expanded in the same pass. A contrived,
+ * but easy to understand, example of such a macro follows. Note that though
+ * this example is contrived, this behaviour is abused to implement bounded
+ * recursion in macros such as FOR.
+ *
+ *   #define A(x) x+1
+ *   #define EMPTY
+ *   #define NOT_QUITE_RIGHT(x) A EMPTY (x)
+ *   NOT_QUITE_RIGHT(999)
+ *
+ * Here's what happens inside the C preprocessor:
+ *
+ * 1. It sees a macro "NOT_QUITE_RIGHT" and performs a single macro expansion
+ *    pass on its arguments. Since the argument is "999" and this isn't a macro,
+ *    this is a boring step resulting in no change.
+ * 2. The NOT_QUITE_RIGHT macro is substituted for its definition giving "A
+ *    EMPTY() (x)".
+ * 3. The expander moves from left-to-right trying to expand the macro:
+ *    The first token, A, cannot be expanded since there are no brackets
+ *    immediately following it. The second token EMPTY(), however, can be
+ *    expanded (recursively in this manner) and is replaced with "".
+ * 4. Expansion continues from the start of the substituted test (which in this
+ *    case is just empty), and sees "(999)" but since no macro name is present,
+ *    nothing is done. This results in a final expansion of "A (999)".
+ *
+ * Unfortunately, this doesn't quite meet expectations since you may expect that
+ * "A (999)" would have been expanded into "999+1". Unfortunately this requires
+ * a second expansion pass but luckily we can force the macro processor to make
+ * more passes by abusing the first step of macro expansion: the preprocessor
+ * expands arguments in their own pass. If we define a macro which does nothing
+ * except produce its arguments e.g.:
+ *
+ *   #define PASS_THROUGH(...) __VA_ARGS__
+ *
+ * We can now do "PASS_THROUGH(NOT_QUITE_RIGHT(999))" causing "NOT_QUITE_RIGHT" to be
+ * expanded to "A (999)", as described above, when the arguments are expanded.
+ * Now when the body of PASS_THROUGH is expanded, "A (999)" gets expanded to
+ * "999+1".
+ *
+ * The EVAL defined below is essentially equivalent to a large nesting of
+ * "PASS_THROUGH(PASS_THROUGH(PASS_THROUGH(..." which results in the
+ * preprocessor making a large number of expansion passes over the given
+ * expression.
+ */
+#define EVAL(...) EVAL1024(__VA_ARGS__)
+#define EVAL1024(...) EVAL512(EVAL512(__VA_ARGS__))
+#define EVAL512(...) EVAL256(EVAL256(__VA_ARGS__))
+#define EVAL256(...) EVAL128(EVAL128(__VA_ARGS__))
+#define EVAL128(...) EVAL64(EVAL64(__VA_ARGS__))
+#define EVAL64(...) EVAL32(EVAL32(__VA_ARGS__))
+#define EVAL32(...) EVAL16(EVAL16(__VA_ARGS__))
+#define EVAL16(...) EVAL8(EVAL8(__VA_ARGS__))
+#define EVAL8(...) EVAL4(EVAL4(__VA_ARGS__))
+#define EVAL4(...) EVAL2(EVAL2(__VA_ARGS__))
+#define EVAL2(...) EVAL1(EVAL1(__VA_ARGS__))
+#define EVAL1(...) __VA_ARGS__
+
+
+/**
+ * Macros which expand to common values
+ */
+#define PASS(...) __VA_ARGS__
+#define EMPTY()
+#define COMMA() ,
+#define PLUS() +
+#define ZERO() 0
+#define ONE() 1
+
+/**
+ * Causes a function-style macro to require an additional pass to be expanded.
+ *
+ * This is useful, for example, when trying to implement recursion since the
+ * recursive step must not be expanded in a single pass as the pre-processor
+ * will catch it and prevent it.
+ *
+ * Usage:
+ *
+ *   DEFER1(IN_NEXT_PASS)(args, to, the, macro)
+ *
+ * How it works:
+ *
+ * 1. When DEFER1 is expanded, first its arguments are expanded which are
+ *    simply IN_NEXT_PASS. Since this is a function-style macro and it has no
+ *    arguments, nothing will happen.
+ * 2. The body of DEFER1 will now be expanded resulting in EMPTY() being
+ *    deleted. This results in "IN_NEXT_PASS (args, to, the macro)". Note that
+ *    since the macro expander has already passed IN_NEXT_PASS by the time it
+ *    expands EMPTY() and so it won't spot that the brackets which remain can be
+ *    applied to IN_NEXT_PASS.
+ * 3. At this point the macro expansion completes. If one more pass is made,
+ *    IN_NEXT_PASS(args, to, the, macro) will be expanded as desired.
+ */
+#define DEFER1(id) id EMPTY()
+
+/**
+ * As with DEFER1 except here n additional passes are required for DEFERn.
+ *
+ * The mechanism is analogous.
+ *
+ * Note that there doesn't appear to be a way of combining DEFERn macros in
+ * order to achieve exponentially increasing defers e.g. as is done by EVAL.
+ */
+#define DEFER2(id) id EMPTY EMPTY()()
+#define DEFER3(id) id EMPTY EMPTY EMPTY()()()
+#define DEFER4(id) id EMPTY EMPTY EMPTY EMPTY()()()()
+#define DEFER5(id) id EMPTY EMPTY EMPTY EMPTY EMPTY()()()()()
+#define DEFER6(id) id EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY()()()()()()
+#define DEFER7(id) id EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY()()()()()()()
+#define DEFER8(id) id EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY()()()()()()()()
+
+
+/**
+ * Indirection around the standard ## concatenation operator. This simply
+ * ensures that the arguments are expanded (once) before concatenation.
+ */
+#define CAT(a, ...) a ## __VA_ARGS__
+#define CAT3(a, b, ...) a ## b ## __VA_ARGS__
+
+
+/**
+ * Get the first argument and ignore the rest.
+ */
+#define FIRST(a, ...) a
+
+/**
+ * Get the second argument and ignore the rest.
+ */
+#define SECOND(a, b, ...) b
+
+/**
+ * Expects a single input (not containing commas). Returns 1 if the input is
+ * PROBE() and otherwise returns 0.
+ *
+ * This can be useful as the basis of a NOT function.
+ *
+ * This macro abuses the fact that PROBE() contains a comma while other valid
+ * inputs must not.
+ */
+#define IS_PROBE(...) SECOND(__VA_ARGS__, 0)
+#define PROBE() ~, 1
+
+
+/**
+ * Logical negation. 0 is defined as false and everything else as true.
+ *
+ * When 0, _NOT_0 will be found which evaluates to the PROBE. When 1 (or any other
+ * value) is given, an appropriately named macro won't be found and the
+ * concatenated string will be produced. IS_PROBE then simply checks to see if
+ * the PROBE was returned, cleanly converting the argument into a 1 or 0.
+ */
+#define NOT(x) IS_PROBE(CAT(_NOT_, x))
+#define _NOT_0 PROBE()
+
+/**
+ * Macro version of C's famous "cast to bool" operator (i.e. !!) which takes
+ * anything and casts it to 0 if it is 0 and 1 otherwise.
+ */
+#define BOOL(x) NOT(NOT(x))
+
+/**
+ * Logical OR. Simply performs a lookup.
+ */
+#define OR(a,b) CAT3(_OR_, a, b)
+#define _OR_00 0
+#define _OR_01 1
+#define _OR_10 1
+#define _OR_11 1
+
+/**
+ * Logical AND. Simply performs a lookup.
+ */
+#define AND(a,b) CAT3(_AND_, a, b)
+#define _AND_00 0
+#define _AND_01 0
+#define _AND_10 0
+#define _AND_11 1
+
+
+/**
+ * Macro if statement. Usage:
+ *
+ *   IF(c)(expansion when true)
+ *
+ * Here's how:
+ *
+ * 1. The preprocessor expands the arguments to _IF casting the condition to '0'
+ *    or '1'.
+ * 2. The casted condition is concatencated with _IF_ giving _IF_0 or _IF_1.
+ * 3. The _IF_0 and _IF_1 macros either returns the argument or doesn't (e.g.
+ *    they implement the "choice selection" part of the macro).
+ * 4. Note that the "true" clause is in the extra set of brackets; thus these
+ *    become the arguments to _IF_0 or _IF_1 and thus a selection is made!
+ */
+#define IF(c) _IF(BOOL(c))
+#define _IF(c) CAT(_IF_,c)
+#define _IF_0(...)
+#define _IF_1(...) __VA_ARGS__
+
+/**
+ * Macro if/else statement. Usage:
+ *
+ *   IF_ELSE(c)( \
+ *     expansion when true, \
+ *     expansion when false \
+ *   )
+ *
+ * The mechanism is analogous to IF.
+ */
+#define IF_ELSE(c) _IF_ELSE(BOOL(c))
+#define _IF_ELSE(c) CAT(_IF_ELSE_,c)
+#define _IF_ELSE_0(t,f) f
+#define _IF_ELSE_1(t,f) t
+
+
+/**
+ * Macro which checks if it has any arguments. Returns '0' if there are no
+ * arguments, '1' otherwise.
+ *
+ * Limitation: HAS_ARGS(,1,2,3) returns 0 -- this check essentially only checks
+ * that the first argument exists.
+ *
+ * This macro works as follows:
+ *
+ * 1. _END_OF_ARGUMENTS_ is concatenated with the first argument.
+ * 2. If the first argument is not present then only "_END_OF_ARGUMENTS_" will
+ *    remain, otherwise "_END_OF_ARGUMENTS something_here" will remain. This
+ *    remaining argument can start with parentheses.
+ * 3. In the former case, the _END_OF_ARGUMENTS_(0) macro expands to a
+ *    0 when it is expanded. In the latter, a non-zero result remains. If the
+ *    first argument started with parentheses these will mostly not contain
+ *    only a single 0, but e.g a C cast or some arithmetic operation that will
+ *    cause the BOOL in _END_OF_ARGUMENTS_ to be one.
+ * 4. BOOL is used to force non-zero results into 1 giving the clean 0 or 1
+ *    output required.
+ */
+#define HAS_ARGS(...) BOOL(FIRST(_END_OF_ARGUMENTS_ __VA_ARGS__)(0))
+#define _END_OF_ARGUMENTS_(...) BOOL(FIRST(__VA_ARGS__))
+
+
+/**
+ * Macro map/list comprehension. Usage:
+ *
+ *   MAP(op, sep, ...)
+ *
+ * Produces a 'sep()'-separated list of the result of op(arg) for each arg.
+ *
+ * Example Usage:
+ *
+ *   #define MAKE_HAPPY(x) happy_##x
+ *   #define COMMA() ,
+ *   MAP(MAKE_HAPPY, COMMA, 1,2,3)
+ *
+ * Which expands to:
+ *
+ *    happy_1 , happy_2 , happy_3
+ *
+ * How it works:
+ *
+ * 1. The MAP macro simply maps the inner MAP_INNER function in an EVAL which
+ *    forces it to be expanded a large number of times, thus enabling many steps
+ *    of iteration (see step 6).
+ * 2. The MAP_INNER macro is substituted for its body.
+ * 3. In the body, op(cur_val) is substituted giving the value for this
+ *    iteration.
+ * 4. The IF macro expands according to whether further iterations are required.
+ *    This expansion either produces _IF_0 or _IF_1.
+ * 5. Since the IF is followed by a set of brackets containing the "if true"
+ *    clause, these become the argument to _IF_0 or _IF_1. At this point, the
+ *    macro in the brackets will be expanded giving the separator followed by
+ *    _MAP_INNER EMPTY()()(op, sep, __VA_ARGS__).
+ * 5. If the IF was not taken, the above will simply be discarded and everything
+ *    stops. If the IF is taken, The expression is then processed a second time
+ *    yielding "_MAP_INNER()(op, sep, __VA_ARGS__)". Note that this call looks
+ *    very similar to the  essentially the same as the original call except the
+ *    first argument has been dropped.
+ * 6. At this point expansion of MAP_INNER will terminate. However, since we can
+ *    force more rounds of expansion using EVAL1. In the argument-expansion pass
+ *    of the EVAL1, _MAP_INNER() is expanded to MAP_INNER which is then expanded
+ *    using the arguments which follow it as in step 2-5. This is followed by a
+ *    second expansion pass as the substitution of EVAL1() is expanded executing
+ *    2-5 a second time. This results in up to two iterations occurring. Using
+ *    many nested EVAL1 macros, i.e. the very-deeply-nested EVAL macro, will in
+ *    this manner produce further iterations, hence the outer MAP macro doing
+ *    this for us.
+ *
+ * Important tricks used:
+ *
+ * * If we directly produce "MAP_INNER" in an expansion of MAP_INNER, a special
+ *   case in the preprocessor will prevent it being expanded in the future, even
+ *   if we EVAL.  As a result, the MAP_INNER macro carefully only expands to
+ *   something containing "_MAP_INNER()" which requires a further expansion step
+ *   to invoke MAP_INNER and thus implementing the recursion.
+ * * To prevent _MAP_INNER being expanded within the macro we must first defer its
+ *   expansion during its initial pass as an argument to _IF_0 or _IF_1. We must
+ *   then defer its expansion a second time as part of the body of the _IF_0. As
+ *   a result hence the DEFER2.
+ * * _MAP_INNER seemingly gets away with producing itself because it actually only
+ *   produces MAP_INNER. It just happens that when _MAP_INNER() is expanded in
+ *   this case it is followed by some arguments which get consumed by MAP_INNER
+ *   and produce a _MAP_INNER.  As such, the macro expander never marks
+ *   _MAP_INNER as expanding to itself and thus it will still be expanded in
+ *   future productions of itself.
+ */
+#define MAP(...) \
+   IF(HAS_ARGS(__VA_ARGS__))(EVAL(MAP_INNER(__VA_ARGS__)))
+#define MAP_INNER(op,sep,cur_val, ...) \
+  op(cur_val) \
+  IF(HAS_ARGS(__VA_ARGS__))( \
+    sep() DEFER2(_MAP_INNER)()(op, sep, ##__VA_ARGS__) \
+  )
+#define _MAP_INNER() MAP_INNER
+
+
+/**
+ * This is a variant of the MAP macro which also includes as an argument to the
+ * operation a valid C variable name which is different for each iteration.
+ *
+ * Usage:
+ *   MAP_WITH_ID(op, sep, ...)
+ *
+ * Where op is a macro op(val, id) which takes a list value and an ID. This ID
+ * will simply be a unary number using the digit "I", that is, I, II, III, IIII,
+ * and so on.
+ *
+ * Example:
+ *
+ *   #define MAKE_STATIC_VAR(type, name) static type name;
+ *   MAP_WITH_ID(MAKE_STATIC_VAR, EMPTY, int, int, int, bool, char)
+ *
+ * Which expands to:
+ *
+ *   static int I; static int II; static int III; static bool IIII; static char IIIII;
+ *
+ * The mechanism is analogous to the MAP macro.
+ */
+#define MAP_WITH_ID(op,sep,...) \
+  IF(HAS_ARGS(__VA_ARGS__))(EVAL(MAP_WITH_ID_INNER(op,sep,I, ##__VA_ARGS__)))
+#define MAP_WITH_ID_INNER(op,sep,id,cur_val, ...) \
+  op(cur_val,id) \
+  IF(HAS_ARGS(__VA_ARGS__))( \
+    sep() DEFER2(_MAP_WITH_ID_INNER)()(op, sep, CAT(id,I), ##__VA_ARGS__) \
+  )
+#define _MAP_WITH_ID_INNER() MAP_WITH_ID_INNER
+
+
+/**
+ * This is a variant of the MAP macro which iterates over pairs rather than
+ * singletons.
+ *
+ * Usage:
+ *   MAP_PAIRS(op, sep, ...)
+ *
+ * Where op is a macro op(val_1, val_2) which takes two list values.
+ *
+ * Example:
+ *
+ *   #define MAKE_STATIC_VAR(type, name) static type name;
+ *   MAP_PAIRS(MAKE_STATIC_VAR, EMPTY, char, my_char, int, my_int)
+ *
+ * Which expands to:
+ *
+ *   static char my_char; static int my_int;
+ *
+ * The mechanism is analogous to the MAP macro.
+ */
+#define MAP_PAIRS(op,sep,...) \
+  IF(HAS_ARGS(__VA_ARGS__))(EVAL(MAP_PAIRS_INNER(op,sep,__VA_ARGS__)))
+#define MAP_PAIRS_INNER(op,sep,cur_val_1, cur_val_2, ...) \
+  op(cur_val_1,cur_val_2) \
+  IF(HAS_ARGS(__VA_ARGS__))( \
+    sep() DEFER2(_MAP_PAIRS_INNER)()(op, sep, __VA_ARGS__) \
+  )
+#define _MAP_PAIRS_INNER() MAP_PAIRS_INNER
+
+/**
+ * This is a variant of the MAP macro which iterates over a two-element sliding
+ * window.
+ *
+ * Usage:
+ *   MAP_SLIDE(op, last_op, sep, ...)
+ *
+ * Where op is a macro op(val_1, val_2) which takes the two list values
+ * currently in the window. last_op is a macro taking a single value which is
+ * called for the last argument.
+ *
+ * Example:
+ *
+ *   #define SIMON_SAYS_OP(simon, next) IF(NOT(simon()))(next)
+ *   #define SIMON_SAYS_LAST_OP(val) last_but_not_least_##val
+ *   #define SIMON_SAYS() 0
+ *
+ *   MAP_SLIDE(SIMON_SAYS_OP, SIMON_SAYS_LAST_OP, EMPTY, wiggle, SIMON_SAYS, dance, move, SIMON_SAYS, boogie, stop)
+ *
+ * Which expands to:
+ *
+ *   dance boogie last_but_not_least_stop
+ *
+ * The mechanism is analogous to the MAP macro.
+ */
+#define MAP_SLIDE(op,last_op,sep,...) \
+  IF(HAS_ARGS(__VA_ARGS__))(EVAL(MAP_SLIDE_INNER(op,last_op,sep,__VA_ARGS__)))
+#define MAP_SLIDE_INNER(op,last_op,sep,cur_val, ...) \
+  IF(HAS_ARGS(__VA_ARGS__))(op(cur_val,FIRST(__VA_ARGS__))) \
+  IF(NOT(HAS_ARGS(__VA_ARGS__)))(last_op(cur_val)) \
+  IF(HAS_ARGS(__VA_ARGS__))( \
+    sep() DEFER2(_MAP_SLIDE_INNER)()(op, last_op, sep, __VA_ARGS__) \
+  )
+#define _MAP_SLIDE_INNER() MAP_SLIDE_INNER
+
+
+/**
+ * Strip any excess commas from a set of arguments.
+ */
+#define REMOVE_TRAILING_COMMAS(...) \
+	MAP(PASS, COMMA, __VA_ARGS__)
+
+
+#endif
diff --git a/fficxx-runtime.cabal b/fficxx-runtime.cabal
--- a/fficxx-runtime.cabal
+++ b/fficxx-runtime.cabal
@@ -1,5 +1,5 @@
 Name:		fficxx-runtime
-Version:	0.3
+Version:	0.5
 Synopsis:	Runtime for fficxx-generated library
 Description: 	Runtime for fficxx-generated library
 License:        BSD3
@@ -9,7 +9,7 @@
 Build-Type: 	Simple
 Category:       FFI Tools
 Cabal-Version:  >= 1.8
-Data-files: 
+Data-files:
 
 Source-repository head
   type: git
@@ -19,15 +19,19 @@
   hs-source-dirs: lib
   ghc-options: 	-Wall -funbox-strict-fields -fno-warn-unused-do-bind
   ghc-prof-options: -caf-all -auto-all
-  Build-Depends: 
+  Build-Depends:
                  base == 4.*,
                  bytestring,
                  template-haskell
 
-  Exposed-Modules: 
+  Exposed-Modules:
                    FFICXX.Runtime.Cast
                    FFICXX.Runtime.TH
+                   FFICXX.Runtime.Function.Template
+                   FFICXX.Runtime.Function.TH
 
-                   
+
   Include-dirs:    csrc
   Install-includes: MacroPatternMatch.h
+                    Function.h
+                    cpp_magic.h
diff --git a/lib/FFICXX/Runtime/Function/TH.hs b/lib/FFICXX/Runtime/Function/TH.hs
new file mode 100644
--- /dev/null
+++ b/lib/FFICXX/Runtime/Function/TH.hs
@@ -0,0 +1,55 @@
+{-# LANGUAGE TemplateHaskell #-}
+module FFICXX.Runtime.Function.TH where
+import Data.Char
+import Data.Monoid
+import Foreign.C.Types
+import Foreign.Ptr
+import Language.Haskell.TH
+import Language.Haskell.TH.Syntax
+import FFICXX.Runtime.TH
+import FFICXX.Runtime.Function.Template
+
+
+mkWrapper :: (Type,String) -> Q Dec
+mkWrapper (typ,suffix)
+  = do let fn = "wrap_" <> suffix
+       n <- newName fn
+       d <- forImpD CCall safe "wrapper" n [t| $(pure typ) -> IO (FunPtr ($(pure typ))) |]
+       addTopDecls [d]
+       pure $
+         FunD (mkNameS "wrapFunPtr") [ Clause [] (NormalB (VarE n)) [] ]
+
+
+t_newFunction :: Type -> String -> ExpQ
+t_newFunction typ suffix
+  = mkTFunc (typ, suffix, \ n -> "Function_new_" <> n, tyf)
+  where tyf n =
+          let t = pure typ
+          in [t| FunPtr $( t ) -> IO (Function $( t )) |]
+
+t_call :: Type -> String -> ExpQ
+t_call typ suffix
+  = mkTFunc (typ, suffix, \ n -> "Function_call_" <> n, tyf)
+  where tyf n =
+          let t = pure typ
+          in [t| Function $( t ) -> $( t ) |]
+
+t_deleteFunction :: Type -> String -> ExpQ
+t_deleteFunction typ suffix
+  = mkTFunc (typ, suffix, \ n -> "Function_delete_" <> n, tyf)
+  where tyf n =
+          let t = pure typ
+          in [t| Function $( t ) -> IO () |]
+
+
+genFunctionInstanceFor :: Q Type -> String -> Q [Dec]
+genFunctionInstanceFor qtyp suffix
+  = do typ <- qtyp
+       f1 <- mkNew "newFunction" t_newFunction typ suffix
+       f2 <- mkMember "call" t_call typ suffix
+       f3 <- mkMember "deleteFunction" t_deleteFunction typ suffix
+       wrap <- mkWrapper (typ,suffix)
+       let lst = [f1,f2,f3]
+       return [ mkInstance [] (AppT (con "IFunction") typ) lst
+              , mkInstance [] (AppT (con "FunPtrWrapper") typ) [wrap]
+              ]
diff --git a/lib/FFICXX/Runtime/Function/Template.hs b/lib/FFICXX/Runtime/Function/Template.hs
new file mode 100644
--- /dev/null
+++ b/lib/FFICXX/Runtime/Function/Template.hs
@@ -0,0 +1,33 @@
+{-# LANGUAGE EmptyDataDecls, FlexibleInstances,
+  MultiParamTypeClasses, TypeFamilies #-}
+module FFICXX.Runtime.Function.Template where
+import Foreign.C.Types
+import Foreign.Ptr
+import FFICXX.Runtime.Cast
+
+data RawFunction t
+
+newtype Function t = Function (Ptr (RawFunction t))
+
+class () => IFunction t where
+  newFunction :: FunPtr t -> IO (Function t)
+  call :: Function t -> t
+  deleteFunction :: Function t -> IO ()
+
+instance () => FPtr (Function t) where
+        type Raw (Function t) = RawFunction t
+        get_fptr (Function ptr) = ptr
+        cast_fptr_to_obj = Function
+
+instance () => Castable (Function t) (Ptr (RawFunction t)) where
+        cast x f = f (castPtr (get_fptr x))
+        uncast x f = f (cast_fptr_to_obj (castPtr x))
+
+
+instance () => Castable (FunPtr t) (FunPtr t) where
+  cast x f = f x
+  uncast x f = f x
+
+
+class () => FunPtrWrapper t where
+  wrapFunPtr :: t -> IO (FunPtr t)
diff --git a/lib/FFICXX/Runtime/TH.hs b/lib/FFICXX/Runtime/TH.hs
--- a/lib/FFICXX/Runtime/TH.hs
+++ b/lib/FFICXX/Runtime/TH.hs
@@ -23,33 +23,36 @@
 con :: String -> Type
 con = ConT . mkNameS
 
+
 mkInstance :: Cxt -> Type -> [Dec] -> Dec
 mkInstance = InstanceD Nothing
 
-mkTFunc :: (Name, String, String -> String, Name -> Q Type) -> ExpQ
-mkTFunc (nty, ncty, nf, tyf)
-  = do let fn = nf ncty
+
+mkTFunc :: (Type, String, String -> String, Type -> Q Type) -> Q Exp
+mkTFunc (typ, suffix, nf, tyf)
+  = do let fn = nf suffix
        let fn' = "c_" <> fn
        n <- newName fn'
-       d <- forImpD CCall unsafe fn n (tyf nty)
+       d <- forImpD CCall safe fn n (tyf typ)
        addTopDecls [d]
        [| $( varE n ) |]
 
 
-
-mkMember :: String -> (Name -> String -> Q Exp) -> Name -> String -> Q Dec
-mkMember fname f n ctyp = do
+mkMember :: String -> (Type -> String -> Q Exp) -> Type -> String -> Q Dec
+mkMember fname f typ suffix = do
   let x = mkNameS "x"
-  e <- f n ctyp
-  return $
+  e <- f typ suffix
+  pure $
     FunD (mkNameS fname) [ Clause [VarP x] (NormalB (AppE e (VarE x))) [] ]
 
-mkNew :: String -> (Name -> String -> Q Exp) -> Name -> String -> Q Dec
-mkNew fname f n ctyp = do
-  e <- f n ctyp
-  return $
+
+mkNew :: String -> (Type -> String -> Q Exp) -> Type -> String -> Q Dec
+mkNew fname f typ suffix = do
+  e <- f typ suffix
+  pure $
     FunD (mkNameS fname)
       [ Clause [] (NormalB e) [] ]
 
-mkDelete :: String -> (Name -> String -> Q Exp) -> Name -> String -> Q Dec
+
+mkDelete :: String -> (Type -> String -> Q Exp) -> Type -> String -> Q Dec
 mkDelete = mkMember