Modified Task classes to be instansaited instead of being static