WIP: Add index task