Minor update to strategy, we ust Task throughout, not Activity