More swig stuff. Not finished