Transaction auto complete WIP