More WIP integrator changes