Dept and Breadth facets work. Did some refactoring and code cleanup in prep for others.