Transaction updates

**Don't merge yet**

Leaving request open for discussion on transactionmanager updates