Clustertest

Clustering added and tested.