Moving to new scheme, leapfrog, euler are complete