Trying to get the transactions to work
Fixed merge conflicts
Got transactions working