Merging with updated task template

Hopefully I've got this in the right direction.