remove txobj from this! #merge WIP
remove txobj from this! #merge WIP
merge working!