Begun templating and properly set up swig