Feature/312 reapp facetview

I've eyeball-tested this only; I'm not sure how to write a good unit test for this work.