Allow clustering to be toggled

Currently turned off by default.