refactoring of tasks components WIP