Checkin for task creation template.

This checkin contains some of the re-arrangements necessary for task
creation.