#27 inject context everywhere, part 2