All tests pass but there are some warnings from the XS code to fix still