Work in progress on explicit transaction wrapping in ui