Add context for all calls
Extract wrap
TESTs failed.