Though it's not likely to wind up in a user story as it's a technical concern, so we need to take the initiative on doing it.  Doesn't have to be in this PR though.