OOP, self and tasks updated