Upgrade the face thing to a class to help clarity