> how about I do it in the second PR for this card and merge the code we've got as is?

Deal.