More changes to task list

Nearing completion