Work on converting to Jax 3.0, refactor Models