Added some work on the complete integrator