Started to bring in more of the facets work and its corresponding tests.