Maybe factor out transaction id to a value?   (add TODO)?