WIP on improving tasks section