Updated to support reporting of contextual infor.

This is a little primitive right now, but it demonstrates the thing
working.