Rewrite transaction code, to make it easier to move to client

Rewrite transaction code, to make it easier to move to client #608