WIP #2 tx work