Broke agg and plot_agg into extra step.