Add redesigned Transaction based on design discussion
Merge remote-tracking branch 'origin/master'