Add integrator and some testing functions