Done up to time integrator.. time integrator needs to be done