Add clustering

Comment?