Added rough new face detection and restructured