Yeah, I'm okay doing it on a later merge.  Maybe I could put a JIRA ticket in the backlog?