Support multiple means of task completion

Completed