Added task selection (not yet working)