Faces now stored in a tree.  Needs cleaning up.