about to pull new version of the ode solver branch