Clustering hooked back up

Cluster styles not currently working, but the clustering itself is.