We should re-implement the tracker such that it is independent of the integrator in order to avoid duplicated code. Adding new integrators is then also simplified.