Can you make this a separate R1 ticket? I'll have to touch code in quite a few places.