More work on Faceplus integration.