added clustering
prepared to add cluster toggling