Cleaned up twostep integrator class; bootstrap directly on S3