Done half of the transactions
Fixed last commit
Resolved merge