Portal Highlighter - Infrastructure

Issue #435