New tasks, updated scaffold