Better Transaction Design

Restructured, not tested