Many changes and new things including the swig