Work on Jax refactor