cleanup
starting to add 'Transactions' code