Todos in setters in Task class
merge