-Move stuff in Analytic Plan up to Data Collection