Feature/transaction

:-1: hmm. What's is this line trying to do?