Complete re-vamp for cluster analysis.