WIP almost finished tx redo