Filling out most of the clustering section