Simpler transactions

Don't remember why this was created. MErging