Slight refactors & first run @ task batches