more notes on soa, transactions
merged cnflicts