Prep for merge with rk4-test