wip - adding context to links