nearly complete with rebuild of facet template