If not doing now, we should probably add a task to the follow-up story.  (Looked like some stuff was moved off to that.)