That's the right question to ask. One honest caveat: The interface seam currently forces the pin at the intermediate. Want me to implement or address the other item first?

Honest take. Implementing first would break the seams, our work here is done. This is a great place to stop.-