Halfway to cython compatability