More work on tasks system