wip update to work with native webcomponents support