Attempt to use move some code to html imports