More work on transactions..