WIP
WIP
WIP
WIP - fixing broken txn restart
WIP
WIP