Re #431 Initial version of contextual entity display.