updates for vnext

Cleaned up Highlight usages
Added prelim test project from @rojepp