wip: use a message wrapper for trace context

! work in progress - not all tests pass