Incorporating eigenfaces/PCA as well as Darrel's changes