Re-implemented modified fire in a cleaner way, got rid of the integrator c++ classes