Add arg for n timesteps and adjust naming.