Change task IDs to generate nicer looking reports.

Also adding a TODO.